ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/button.C
(Generate patch)

Comparing deliantra/server/common/button.C (file contents):
Revision 1.61 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.62 by root, Sat Nov 7 18:30:05 2009 UTC

460int 460int
461check_trigger (object *op, object *cause, object *originator) 461check_trigger (object *op, object *cause, object *originator)
462{ 462{
463 object *tmp; 463 object *tmp;
464 int push = 0, tot = 0; 464 int push = 0, tot = 0;
465 int in_movement = op->stats.wc || op->speed; 465 int in_movement = op->stats.wc || op->has_active_speed ();
466 466
467 switch (op->type) 467 switch (op->type)
468 { 468 {
469 case TRIGGER_BUTTON: 469 case TRIGGER_BUTTON:
470 if (op->weight > 0) 470 if (op->weight > 0)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines