| … | |
… | |
| 615 | * Inserts item into the old map, or merges it if it already is on the map. |
615 | * Inserts item into the old map, or merges it if it already is on the map. |
| 616 | * |
616 | * |
| 617 | * 'map' must be the value of op->map before stop_item() was called. |
617 | * 'map' must be the value of op->map before stop_item() was called. |
| 618 | */ |
618 | */ |
| 619 | void |
619 | void |
| 620 | fix_stopped_item (object *op, mapstruct *map, object *originator) |
620 | fix_stopped_item (object *op, maptile *map, object *originator) |
| 621 | { |
621 | { |
| 622 | if (map == NULL) |
622 | if (map == NULL) |
| 623 | return; |
623 | return; |
| 624 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
624 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
| 625 | insert_ob_in_map (op, map, originator, 0); |
625 | insert_ob_in_map (op, map, originator, 0); |
| … | |
… | |
| 710 | move_arrow (object *op) |
710 | move_arrow (object *op) |
| 711 | { |
711 | { |
| 712 | object *tmp; |
712 | object *tmp; |
| 713 | sint16 new_x, new_y; |
713 | sint16 new_x, new_y; |
| 714 | int was_reflected, mflags; |
714 | int was_reflected, mflags; |
| 715 | mapstruct *m; |
715 | maptile *m; |
| 716 | |
716 | |
| 717 | if (op->map == NULL) |
717 | if (op->map == NULL) |
| 718 | { |
718 | { |
| 719 | LOG (llevError, "BUG: Arrow had no map.\n"); |
719 | LOG (llevError, "BUG: Arrow had no map.\n"); |
| 720 | remove_ob (op); |
720 | remove_ob (op); |
| … | |
… | |
| 843 | * that did the same thing. |
843 | * that did the same thing. |
| 844 | */ |
844 | */ |
| 845 | while (retry < 2) |
845 | while (retry < 2) |
| 846 | { |
846 | { |
| 847 | int left, right, mflags; |
847 | int left, right, mflags; |
| 848 | mapstruct *m1; |
848 | maptile *m1; |
| 849 | sint16 x1, y1; |
849 | sint16 x1, y1; |
| 850 | |
850 | |
| 851 | retry++; |
851 | retry++; |
| 852 | |
852 | |
| 853 | /* Need to check for P_OUT_OF_MAP: if the arrow is tavelling |
853 | /* Need to check for P_OUT_OF_MAP: if the arrow is tavelling |
| … | |
… | |
| 1116 | move_player_mover (object *op) |
1116 | move_player_mover (object *op) |
| 1117 | { |
1117 | { |
| 1118 | object *victim, *nextmover; |
1118 | object *victim, *nextmover; |
| 1119 | int dir = op->stats.sp; |
1119 | int dir = op->stats.sp; |
| 1120 | sint16 nx, ny; |
1120 | sint16 nx, ny; |
| 1121 | mapstruct *m; |
1121 | maptile *m; |
| 1122 | |
1122 | |
| 1123 | /* Determine direction now for random movers so we do the right thing */ |
1123 | /* Determine direction now for random movers so we do the right thing */ |
| 1124 | if (!dir) |
1124 | if (!dir) |
| 1125 | dir = rndm (1, 8); |
1125 | dir = rndm (1, 8); |
| 1126 | |
1126 | |
