| … | |
… | |
| 152 | { |
152 | { |
| 153 | if (!did_make_save_item (op, type, originator)) |
153 | if (!did_make_save_item (op, type, originator)) |
| 154 | { |
154 | { |
| 155 | object *env = op->env; |
155 | object *env = op->env; |
| 156 | int x = op->x, y = op->y; |
156 | int x = op->x, y = op->y; |
| 157 | mapstruct *m = op->map; |
157 | maptile *m = op->map; |
| 158 | |
158 | |
| 159 | op = stop_item (op); |
159 | op = stop_item (op); |
| 160 | if (op == NULL) |
160 | if (op == NULL) |
| 161 | return; |
161 | return; |
| 162 | |
162 | |
| … | |
… | |
| 282 | |
282 | |
| 283 | int |
283 | int |
| 284 | hit_map (object *op, int dir, int type, int full_hit) |
284 | hit_map (object *op, int dir, int type, int full_hit) |
| 285 | { |
285 | { |
| 286 | object *tmp, *next; |
286 | object *tmp, *next; |
| 287 | mapstruct *map; |
287 | maptile *map; |
| 288 | sint16 x, y; |
288 | sint16 x, y; |
| 289 | int retflag = 0; /* added this flag.. will return 1 if it hits a monster */ |
289 | int retflag = 0; /* added this flag.. will return 1 if it hits a monster */ |
| 290 | |
290 | |
| 291 | if (QUERY_FLAG (op, FLAG_FREED)) |
291 | if (QUERY_FLAG (op, FLAG_FREED)) |
| 292 | { |
292 | { |
| … | |
… | |
| 408 | void |
408 | void |
| 409 | attack_message (int dam, int type, object *op, object *hitter) |
409 | attack_message (int dam, int type, object *op, object *hitter) |
| 410 | { |
410 | { |
| 411 | char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF]; |
411 | char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF]; |
| 412 | int i, found = 0; |
412 | int i, found = 0; |
| 413 | mapstruct *map; |
413 | maptile *map; |
| 414 | object *next, *tmp; |
414 | object *next, *tmp; |
| 415 | |
415 | |
| 416 | /* put in a few special messages for some of the common attacktypes |
416 | /* put in a few special messages for some of the common attacktypes |
| 417 | * a player might have. For example, fire, electric, cold, etc |
417 | * a player might have. For example, fire, electric, cold, etc |
| 418 | * [garbled 20010919] |
418 | * [garbled 20010919] |
