| version 1.8 | | version 1.9 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_main_c = | | * static char *rcsid_main_c = |
| * "$Id: main.c,v 1.8 2000/05/21 21:41:45 jec Exp $"; | | * "$Id: main.c,v 1.9 2000/05/26 09:50:49 jec Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| } | | } |
| if(!op->contr->removed) { | | if(!op->contr->removed) { |
| SET_FLAG(op, FLAG_NO_APPLY); | | SET_FLAG(op, FLAG_NO_APPLY); |
| insert_ob_in_map(op,op->map); | | insert_ob_in_map(op,op->map,NULL); |
| CLEAR_FLAG(op, FLAG_NO_APPLY); | | CLEAR_FLAG(op, FLAG_NO_APPLY); |
| } | | } |
| op->enemy = NULL; | | op->enemy = NULL; |
| | |
| { | | { |
| object *op, *next; | | object *op, *next; |
| object marker; | | object marker; |
| | | tag_t tag; |
| | | |
| process_players1 (map); | | process_players1 (map); |
| | | |
| | |
| while (marker.active_next) | | while (marker.active_next) |
| { | | { |
| op = marker.active_next; | | op = marker.active_next; |
| | | tag = op->count; |
| | | |
| /* Move marker forward - swap op and marker */ | | /* Move marker forward - swap op and marker */ |
| op->active_prev = marker.active_prev; | | op->active_prev = marker.active_prev; |
| | |
| if (op->speed_left > 0) { | | if (op->speed_left > 0) { |
| --op->speed_left; | | --op->speed_left; |
| process_object (op); | | process_object (op); |
| | | if (was_destroyed (op, tag)) |
| | | continue; |
| } | | } |
| | | |
| #ifdef CASTING_TIME | | #ifdef CASTING_TIME |