| … | |
… | |
| 277 | int |
277 | int |
| 278 | probe (object *op, object *caster, object *spell_ob, int dir) |
278 | probe (object *op, object *caster, object *spell_ob, int dir) |
| 279 | { |
279 | { |
| 280 | int r, mflags, maxrange; |
280 | int r, mflags, maxrange; |
| 281 | object *tmp; |
281 | object *tmp; |
| 282 | mapstruct *m; |
282 | maptile *m; |
| 283 | |
283 | |
| 284 | |
284 | |
| 285 | if (!dir) |
285 | if (!dir) |
| 286 | { |
286 | { |
| 287 | examine_monster (op, op); |
287 | examine_monster (op, op); |
| … | |
… | |
| 422 | cast_earth_to_dust (object *op, object *caster, object *spell_ob) |
422 | cast_earth_to_dust (object *op, object *caster, object *spell_ob) |
| 423 | { |
423 | { |
| 424 | object *tmp, *next; |
424 | object *tmp, *next; |
| 425 | int range, i, j, mflags; |
425 | int range, i, j, mflags; |
| 426 | sint16 sx, sy; |
426 | sint16 sx, sy; |
| 427 | mapstruct *m; |
427 | maptile *m; |
| 428 | |
428 | |
| 429 | if (op->type != PLAYER) |
429 | if (op->type != PLAYER) |
| 430 | return 0; |
430 | return 0; |
| 431 | |
431 | |
| 432 | range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); |
432 | range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); |
| … | |
… | |
| 641 | { |
641 | { |
| 642 | object *dummy, *force, *old_force, *tmp; |
642 | object *dummy, *force, *old_force, *tmp; |
| 643 | archetype *perm_portal; |
643 | archetype *perm_portal; |
| 644 | char portal_name[1024], portal_message[1024]; |
644 | char portal_name[1024], portal_message[1024]; |
| 645 | sint16 exitx, exity; |
645 | sint16 exitx, exity; |
| 646 | mapstruct *exitmap; |
646 | maptile *exitmap; |
| 647 | int op_level; |
647 | int op_level; |
| 648 | |
648 | |
| 649 | |
649 | |
| 650 | /* Check to see if the map the player is currently on is a per player unique |
650 | /* Check to see if the map the player is currently on is a per player unique |
| 651 | * map. This can be determined in that per player unique maps have the |
651 | * map. This can be determined in that per player unique maps have the |
| … | |
… | |
| 886 | magic_wall (object *op, object *caster, int dir, object *spell_ob) |
886 | magic_wall (object *op, object *caster, int dir, object *spell_ob) |
| 887 | { |
887 | { |
| 888 | object *tmp, *tmp2; |
888 | object *tmp, *tmp2; |
| 889 | int i, posblocked, negblocked, maxrange; |
889 | int i, posblocked, negblocked, maxrange; |
| 890 | sint16 x, y; |
890 | sint16 x, y; |
| 891 | mapstruct *m; |
891 | maptile *m; |
| 892 | const char *name; |
892 | const char *name; |
| 893 | archetype *at; |
893 | archetype *at; |
| 894 | |
894 | |
| 895 | if (!dir) |
895 | if (!dir) |
| 896 | { |
896 | { |
| … | |
… | |
| 1046 | int |
1046 | int |
| 1047 | dimension_door (object *op, object *caster, object *spob, int dir) |
1047 | dimension_door (object *op, object *caster, object *spob, int dir) |
| 1048 | { |
1048 | { |
| 1049 | uint32 dist, maxdist; |
1049 | uint32 dist, maxdist; |
| 1050 | int mflags; |
1050 | int mflags; |
| 1051 | mapstruct *m; |
1051 | maptile *m; |
| 1052 | sint16 sx, sy; |
1052 | sint16 sx, sy; |
| 1053 | |
1053 | |
| 1054 | if (op->type != PLAYER) |
1054 | if (op->type != PLAYER) |
| 1055 | return 0; |
1055 | return 0; |
| 1056 | |
1056 | |
| … | |
… | |
| 1627 | remove_ob (obj); |
1627 | remove_ob (obj); |
| 1628 | free_object (obj); |
1628 | free_object (obj); |
| 1629 | } |
1629 | } |
| 1630 | |
1630 | |
| 1631 | static void |
1631 | static void |
| 1632 | update_map (object *op, mapstruct *m, int small_nuggets, int large_nuggets, int x, int y) |
1632 | update_map (object *op, maptile *m, int small_nuggets, int large_nuggets, int x, int y) |
| 1633 | { |
1633 | { |
| 1634 | object *tmp; |
1634 | object *tmp; |
| 1635 | int flag = 0; |
1635 | int flag = 0; |
| 1636 | |
1636 | |
| 1637 | /* Put any nuggets below the player, but we can only pass this |
1637 | /* Put any nuggets below the player, but we can only pass this |
| … | |
… | |
| 1664 | alchemy (object *op, object *caster, object *spell_ob) |
1664 | alchemy (object *op, object *caster, object *spell_ob) |
| 1665 | { |
1665 | { |
| 1666 | int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags; |
1666 | int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags; |
| 1667 | sint16 nx, ny; |
1667 | sint16 nx, ny; |
| 1668 | object *next, *tmp; |
1668 | object *next, *tmp; |
| 1669 | mapstruct *mp; |
1669 | maptile *mp; |
| 1670 | |
1670 | |
| 1671 | if (op->type != PLAYER) |
1671 | if (op->type != PLAYER) |
| 1672 | return 0; |
1672 | return 0; |
| 1673 | |
1673 | |
| 1674 | /* Put a maximum weight of items that can be alchemied. Limits the power |
1674 | /* Put a maximum weight of items that can be alchemied. Limits the power |
| … | |
… | |
| 1873 | cast_detection (object *op, object *caster, object *spell, object *skill) |
1873 | cast_detection (object *op, object *caster, object *spell, object *skill) |
| 1874 | { |
1874 | { |
| 1875 | object *tmp, *last, *god, *detect; |
1875 | object *tmp, *last, *god, *detect; |
| 1876 | int done_one, range, mflags, floor, level; |
1876 | int done_one, range, mflags, floor, level; |
| 1877 | sint16 x, y, nx, ny; |
1877 | sint16 x, y, nx, ny; |
| 1878 | mapstruct *m; |
1878 | maptile *m; |
| 1879 | |
1879 | |
| 1880 | /* We precompute some values here so that we don't have to keep |
1880 | /* We precompute some values here so that we don't have to keep |
| 1881 | * doing it over and over again. |
1881 | * doing it over and over again. |
| 1882 | */ |
1882 | */ |
| 1883 | god = find_god (determine_god (op)); |
1883 | god = find_god (determine_god (op)); |
| … | |
… | |
| 2101 | int |
2101 | int |
| 2102 | cast_transfer (object *op, object *caster, object *spell, int dir) |
2102 | cast_transfer (object *op, object *caster, object *spell, int dir) |
| 2103 | { |
2103 | { |
| 2104 | object *plyr = NULL; |
2104 | object *plyr = NULL; |
| 2105 | sint16 x, y; |
2105 | sint16 x, y; |
| 2106 | mapstruct *m; |
2106 | maptile *m; |
| 2107 | int mflags; |
2107 | int mflags; |
| 2108 | |
2108 | |
| 2109 | m = op->map; |
2109 | m = op->map; |
| 2110 | x = op->x + freearr_x[dir]; |
2110 | x = op->x + freearr_x[dir]; |
| 2111 | y = op->y + freearr_y[dir]; |
2111 | y = op->y + freearr_y[dir]; |
| … | |
… | |
| 2177 | void |
2177 | void |
| 2178 | counterspell (object *op, int dir) |
2178 | counterspell (object *op, int dir) |
| 2179 | { |
2179 | { |
| 2180 | object *tmp, *head, *next; |
2180 | object *tmp, *head, *next; |
| 2181 | int mflags; |
2181 | int mflags; |
| 2182 | mapstruct *m; |
2182 | maptile *m; |
| 2183 | sint16 sx, sy; |
2183 | sint16 sx, sy; |
| 2184 | |
2184 | |
| 2185 | sx = op->x + freearr_x[dir]; |
2185 | sx = op->x + freearr_x[dir]; |
| 2186 | sy = op->y + freearr_y[dir]; |
2186 | sy = op->y + freearr_y[dir]; |
| 2187 | m = op->map; |
2187 | m = op->map; |
| … | |
… | |
| 2308 | { |
2308 | { |
| 2309 | object *weapon, *tmp; |
2309 | object *weapon, *tmp; |
| 2310 | char buf[MAX_BUF]; |
2310 | char buf[MAX_BUF]; |
| 2311 | int a, i; |
2311 | int a, i; |
| 2312 | sint16 x, y; |
2312 | sint16 x, y; |
| 2313 | mapstruct *m; |
2313 | maptile *m; |
| 2314 | materialtype_t *mt; |
2314 | materialtype_t *mt; |
| 2315 | |
2315 | |
| 2316 | if (!spell->other_arch) |
2316 | if (!spell->other_arch) |
| 2317 | { |
2317 | { |
| 2318 | new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); |
2318 | new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); |
| … | |
… | |
| 2580 | void |
2580 | void |
| 2581 | move_aura (object *aura) |
2581 | move_aura (object *aura) |
| 2582 | { |
2582 | { |
| 2583 | int i, mflags; |
2583 | int i, mflags; |
| 2584 | object *env; |
2584 | object *env; |
| 2585 | mapstruct *m; |
2585 | maptile *m; |
| 2586 | |
2586 | |
| 2587 | /* auras belong in inventories */ |
2587 | /* auras belong in inventories */ |
| 2588 | env = aura->env; |
2588 | env = aura->env; |
| 2589 | |
2589 | |
| 2590 | /* no matter what we've gotta remove the aura... |
2590 | /* no matter what we've gotta remove the aura... |
