| … | |
… | |
| 267 | int |
267 | int |
| 268 | steal (object *op, int dir, object *skill) |
268 | steal (object *op, int dir, object *skill) |
| 269 | { |
269 | { |
| 270 | object *tmp, *next; |
270 | object *tmp, *next; |
| 271 | sint16 x, y; |
271 | sint16 x, y; |
| 272 | mapstruct *m; |
272 | maptile *m; |
| 273 | int mflags; |
273 | int mflags; |
| 274 | |
274 | |
| 275 | x = op->x + freearr_x[dir]; |
275 | x = op->x + freearr_x[dir]; |
| 276 | y = op->y + freearr_y[dir]; |
276 | y = op->y + freearr_y[dir]; |
| 277 | |
277 | |
| … | |
… | |
| 505 | attempt_jump (object *pl, int dir, int spaces, object *skill) |
505 | attempt_jump (object *pl, int dir, int spaces, object *skill) |
| 506 | { |
506 | { |
| 507 | object *tmp; |
507 | object *tmp; |
| 508 | int i, exp = 0, dx = freearr_x[dir], dy = freearr_y[dir], mflags; |
508 | int i, exp = 0, dx = freearr_x[dir], dy = freearr_y[dir], mflags; |
| 509 | sint16 x, y; |
509 | sint16 x, y; |
| 510 | mapstruct *m; |
510 | maptile *m; |
| 511 | |
511 | |
| 512 | /* Jump loop. Go through spaces opject wants to jump. Halt the |
512 | /* Jump loop. Go through spaces opject wants to jump. Halt the |
| 513 | * jump if a wall or creature is in the way. We set FLAG_FLYING |
513 | * jump if a wall or creature is in the way. We set FLAG_FLYING |
| 514 | * temporarily to allow player to aviod exits/archs that are not |
514 | * temporarily to allow player to aviod exits/archs that are not |
| 515 | * fly_on, fly_off. This will also prevent pickup of objects |
515 | * fly_on, fly_off. This will also prevent pickup of objects |
| … | |
… | |
| 821 | use_oratory (object *pl, int dir, object *skill) |
821 | use_oratory (object *pl, int dir, object *skill) |
| 822 | { |
822 | { |
| 823 | sint16 x = pl->x + freearr_x[dir], y = pl->y + freearr_y[dir]; |
823 | sint16 x = pl->x + freearr_x[dir], y = pl->y + freearr_y[dir]; |
| 824 | int mflags, chance; |
824 | int mflags, chance; |
| 825 | object *tmp; |
825 | object *tmp; |
| 826 | mapstruct *m; |
826 | maptile *m; |
| 827 | |
827 | |
| 828 | if (pl->type != PLAYER) |
828 | if (pl->type != PLAYER) |
| 829 | return 0; /* only players use this skill */ |
829 | return 0; /* only players use this skill */ |
| 830 | m = pl->map; |
830 | m = pl->map; |
| 831 | mflags = get_map_flags (m, &m, x, y, &x, &y); |
831 | mflags = get_map_flags (m, &m, x, y, &x, &y); |
| … | |
… | |
| 945 | int |
945 | int |
| 946 | singing (object *pl, int dir, object *skill) |
946 | singing (object *pl, int dir, object *skill) |
| 947 | { |
947 | { |
| 948 | int i, exp = 0, chance, mflags; |
948 | int i, exp = 0, chance, mflags; |
| 949 | object *tmp; |
949 | object *tmp; |
| 950 | mapstruct *m; |
950 | maptile *m; |
| 951 | sint16 x, y; |
951 | sint16 x, y; |
| 952 | |
952 | |
| 953 | if (pl->type != PLAYER) |
953 | if (pl->type != PLAYER) |
| 954 | return 0; /* only players use this skill */ |
954 | return 0; /* only players use this skill */ |
| 955 | |
955 | |
| … | |
… | |
| 1017 | find_traps (object *pl, object *skill) |
1017 | find_traps (object *pl, object *skill) |
| 1018 | { |
1018 | { |
| 1019 | object *tmp, *tmp2; |
1019 | object *tmp, *tmp2; |
| 1020 | int i, expsum = 0, mflags; |
1020 | int i, expsum = 0, mflags; |
| 1021 | sint16 x, y; |
1021 | sint16 x, y; |
| 1022 | mapstruct *m; |
1022 | maptile *m; |
| 1023 | |
1023 | |
| 1024 | /* First we search all around us for runes and traps, which are |
1024 | /* First we search all around us for runes and traps, which are |
| 1025 | * all type RUNE |
1025 | * all type RUNE |
| 1026 | */ |
1026 | */ |
| 1027 | |
1027 | |
| … | |
… | |
| 1083 | int |
1083 | int |
| 1084 | remove_trap (object *op, int dir, object *skill) |
1084 | remove_trap (object *op, int dir, object *skill) |
| 1085 | { |
1085 | { |
| 1086 | object *tmp, *tmp2; |
1086 | object *tmp, *tmp2; |
| 1087 | int i, success = 0, mflags; |
1087 | int i, success = 0, mflags; |
| 1088 | mapstruct *m; |
1088 | maptile *m; |
| 1089 | sint16 x, y; |
1089 | sint16 x, y; |
| 1090 | |
1090 | |
| 1091 | for (i = 0; i < 9; i++) |
1091 | for (i = 0; i < 9; i++) |
| 1092 | { |
1092 | { |
| 1093 | x = op->x + freearr_x[i]; |
1093 | x = op->x + freearr_x[i]; |
| … | |
… | |
| 1631 | { |
1631 | { |
| 1632 | object *throw_ob = toss_item, *left = NULL; |
1632 | object *throw_ob = toss_item, *left = NULL; |
| 1633 | int eff_str = 0, maxc, str = op->stats.Str, dam = 0; |
1633 | int eff_str = 0, maxc, str = op->stats.Str, dam = 0; |
| 1634 | int pause_f, weight_f = 0, mflags; |
1634 | int pause_f, weight_f = 0, mflags; |
| 1635 | float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0; |
1635 | float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0; |
| 1636 | mapstruct *m; |
1636 | maptile *m; |
| 1637 | sint16 sx, sy; |
1637 | sint16 sx, sy; |
| 1638 | |
1638 | |
| 1639 | if (throw_ob == NULL) |
1639 | if (throw_ob == NULL) |
| 1640 | { |
1640 | { |
| 1641 | if (op->type == PLAYER) |
1641 | if (op->type == PLAYER) |
