| … | |
… | |
| 207 | } |
207 | } |
| 208 | else |
208 | else |
| 209 | { |
209 | { |
| 210 | if (op->env) |
210 | if (op->env) |
| 211 | { |
211 | { |
| 212 | object *tmp = is_player_inv (op->env); |
212 | object *tmp = op->in_player (); |
| 213 | |
213 | |
| 214 | if (tmp) |
214 | if (tmp) |
| 215 | esrv_del_item (tmp->contr, op->count); |
215 | esrv_del_item (tmp->contr, op->count); |
| 216 | } |
216 | } |
| 217 | |
217 | |
| … | |
… | |
| 334 | shuffle_attack (op, 1); /*1 flag tells it to change the face */ |
334 | shuffle_attack (op, 1); /*1 flag tells it to change the face */ |
| 335 | update_object (op, UP_OBJ_FACE); |
335 | update_object (op, UP_OBJ_FACE); |
| 336 | type &= ~AT_CHAOS; |
336 | type &= ~AT_CHAOS; |
| 337 | } |
337 | } |
| 338 | |
338 | |
| 339 | next = get_map_ob (map, x, y); |
339 | next = GET_MAP_OB (map, x, y); |
| 340 | |
340 | |
| 341 | while (next) |
341 | while (next) |
| 342 | { |
342 | { |
| 343 | if (next->destroyed ()) |
343 | if (next->destroyed ()) |
| 344 | { |
344 | { |
| … | |
… | |
| 662 | { |
662 | { |
| 663 | i = 4; |
663 | i = 4; |
| 664 | map = hitter->map; |
664 | map = hitter->map; |
| 665 | if (out_of_map (map, hitter->x, hitter->y)) |
665 | if (out_of_map (map, hitter->x, hitter->y)) |
| 666 | return; |
666 | return; |
| 667 | next = get_map_ob (map, hitter->x, hitter->y); |
667 | next = GET_MAP_OB (map, hitter->x, hitter->y); |
| 668 | if (next) |
668 | if (next) |
| 669 | while (next) |
669 | while (next) |
| 670 | { |
670 | { |
| 671 | if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) |
671 | if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) |
| 672 | i *= 3; |
672 | i *= 3; |
