| … | |
… | |
| 232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
| 233 | return 0; |
233 | return 0; |
| 234 | |
234 | |
| 235 | if ((ob1->flag ^ ob2->flag) |
235 | if ((ob1->flag ^ ob2->flag) |
| 236 | .reset (FLAG_INV_LOCKED) |
236 | .reset (FLAG_INV_LOCKED) |
| 237 | .reset (FLAG_CLIENT_SENT) |
|
|
| 238 | .reset (FLAG_REMOVED) |
237 | .reset (FLAG_REMOVED) |
| 239 | .any ()) |
238 | .any ()) |
| 240 | return 0; |
239 | return 0; |
| 241 | |
240 | |
| 242 | /* This is really a spellbook check - we should in general |
241 | /* This is really a spellbook check - we should in general |
| … | |
… | |
| 637 | } |
636 | } |
| 638 | |
637 | |
| 639 | if (speed < 0) |
638 | if (speed < 0) |
| 640 | dst->speed_left -= rndm (); |
639 | dst->speed_left -= rndm (); |
| 641 | |
640 | |
| 642 | dst->set_speed (dst->speed); |
641 | dst->activate (); |
| 643 | } |
642 | } |
| 644 | |
643 | |
| 645 | void |
644 | void |
| 646 | object::instantiate () |
645 | object::instantiate () |
| 647 | { |
646 | { |
| … | |
… | |
| 830 | object::activate () |
829 | object::activate () |
| 831 | { |
830 | { |
| 832 | /* If already on active list, don't do anything */ |
831 | /* If already on active list, don't do anything */ |
| 833 | if (active) |
832 | if (active) |
| 834 | return; |
833 | return; |
|
|
834 | |
|
|
835 | if (has_active_speed () && flag [FLAG_FREED ]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
| 835 | |
836 | |
| 836 | if (has_active_speed ()) |
837 | if (has_active_speed ()) |
| 837 | actives.insert (this); |
838 | actives.insert (this); |
| 838 | } |
839 | } |
| 839 | |
840 | |
