| … | |
… | |
| 166 | } |
166 | } |
| 167 | return 0; |
167 | return 0; |
| 168 | } |
168 | } |
| 169 | |
169 | |
| 170 | /* |
170 | /* |
| 171 | * Returns true if the given object can't fit in the given spot. |
171 | * Returns qthe blocking object if the given object can't fit in the given |
| 172 | * This is meant for multi space objects - for single space objecs, |
172 | * spot. This is meant for multi space objects - for single space objecs, |
| 173 | * just calling get_map_blocked and checking that against movement type |
173 | * just calling get_map_blocked and checking that against movement type |
| 174 | * of object. This function goes through all the parts of the |
174 | * of object. This function goes through all the parts of the multipart |
| 175 | * multipart object and makes sure they can be inserted. |
175 | * object and makes sure they can be inserted. |
| 176 | * |
176 | * |
| 177 | * While this doesn't call out of map, the get_map_flags does. |
177 | * While this doesn't call out of map, the get_map_flags does. |
| 178 | * |
178 | * |
| 179 | * This function has been used to deprecate arch_out_of_map - |
179 | * This function has been used to deprecate arch_out_of_map - |
| 180 | * this function also does that check, and since in most cases, |
180 | * this function also does that check, and since in most cases, |
| … | |
… | |
| 191 | * |
191 | * |
| 192 | * Note this used to be arch_blocked, but with new movement |
192 | * Note this used to be arch_blocked, but with new movement |
| 193 | * code, we need to have actual object to check its move_type |
193 | * code, we need to have actual object to check its move_type |
| 194 | * against the move_block values. |
194 | * against the move_block values. |
| 195 | */ |
195 | */ |
| 196 | int |
196 | bool |
| 197 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
197 | object::blocked (maptile *m, int x, int y) const |
| 198 | { |
198 | { |
| 199 | archetype *tmp; |
199 | for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more) |
| 200 | int flag; |
|
|
| 201 | maptile *m1; |
|
|
| 202 | sint16 sx, sy; |
|
|
| 203 | |
|
|
| 204 | if (!ob) |
|
|
| 205 | { |
|
|
| 206 | flag = get_map_flags (m, &m1, x, y, &sx, &sy); |
|
|
| 207 | if (flag & P_OUT_OF_MAP) |
|
|
| 208 | return P_OUT_OF_MAP; |
|
|
| 209 | |
|
|
| 210 | /* don't have object, so don't know what types would block */ |
|
|
| 211 | return m1->at (sx, sy).move_block; |
|
|
| 212 | } |
200 | { |
|
|
201 | mapxy pos (m, x + tmp->x, y + tmp->y); |
| 213 | |
202 | |
| 214 | for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) |
203 | if (!pos.normalise ()) |
| 215 | { |
204 | return 1; |
| 216 | flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy); |
|
|
| 217 | |
205 | |
| 218 | if (flag & P_OUT_OF_MAP) |
206 | mapspace &ms = *pos; |
| 219 | return P_OUT_OF_MAP; |
207 | |
| 220 | if (flag & P_IS_ALIVE) |
208 | if (ms.flags () & P_IS_ALIVE) |
| 221 | return P_IS_ALIVE; |
209 | return 1; |
| 222 | |
210 | |
| 223 | mapspace &ms = m1->at (sx, sy); |
211 | /* However, often ob doesn't have any move type |
| 224 | |
212 | * (signifying non-moving objects) |
| 225 | /* find_first_free_spot() calls this function. However, often |
|
|
| 226 | * ob doesn't have any move type (when used to place exits) |
|
|
| 227 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
213 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
| 228 | */ |
214 | */ |
| 229 | |
|
|
| 230 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
215 | if (!move_type && ms.move_block != MOVE_ALL) |
| 231 | continue; |
216 | continue; |
| 232 | |
217 | |
| 233 | /* Note it is intentional that we check ob - the movement type of the |
218 | /* Note it is intentional that we check ob - the movement type of the |
| 234 | * head of the object should correspond for the entire object. |
219 | * head of the object should correspond for the entire object. |
| 235 | */ |
220 | */ |
| 236 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
221 | if (ms.blocks (move_type)) |
| 237 | return P_NO_PASS; |
222 | return 1; |
| 238 | } |
223 | } |
| 239 | |
224 | |
| 240 | return 0; |
225 | return 0; |
| 241 | } |
226 | } |
| 242 | |
227 | |
| … | |
… | |
| 778 | * Remove and free all objects in the given map. |
763 | * Remove and free all objects in the given map. |
| 779 | */ |
764 | */ |
| 780 | void |
765 | void |
| 781 | maptile::clear () |
766 | maptile::clear () |
| 782 | { |
767 | { |
| 783 | sfree (regions, size ()); regions = 0; |
|
|
| 784 | delete [] regionmap; regionmap = 0; |
|
|
| 785 | |
|
|
| 786 | if (spaces) |
768 | if (spaces) |
| 787 | { |
769 | { |
| 788 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
770 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
| 789 | while (object *op = ms->bot) |
771 | while (object *op = ms->bot) |
| 790 | { |
772 | { |
|
|
773 | // manually remove, as to not trigger anything |
|
|
774 | if (ms->bot = op->above) |
|
|
775 | ms->bot->below = 0; |
|
|
776 | |
|
|
777 | op->flag [FLAG_REMOVED] = true; |
|
|
778 | |
| 791 | op = op->head_ (); |
779 | object *head = op->head_ (); |
|
|
780 | if (op == head) |
|
|
781 | { |
| 792 | op->destroy_inv (false); |
782 | op->destroy_inv (false); |
| 793 | op->destroy (); |
783 | op->destroy (); |
|
|
784 | } |
|
|
785 | else if (head->map != op->map) |
|
|
786 | { |
|
|
787 | LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); |
|
|
788 | head->destroy (); |
|
|
789 | } |
| 794 | } |
790 | } |
| 795 | |
791 | |
| 796 | sfree (spaces, size ()), spaces = 0; |
792 | sfree (spaces, size ()), spaces = 0; |
| 797 | } |
793 | } |
| 798 | |
794 | |
| 799 | if (buttons) |
795 | if (buttons) |
| 800 | free_objectlinkpt (buttons), buttons = 0; |
796 | free_objectlinkpt (buttons), buttons = 0; |
|
|
797 | |
|
|
798 | sfree (regions, size ()); regions = 0; |
|
|
799 | delete [] regionmap; regionmap = 0; |
| 801 | } |
800 | } |
| 802 | |
801 | |
| 803 | void |
802 | void |
| 804 | maptile::clear_header () |
803 | maptile::clear_header () |
| 805 | { |
804 | { |
| … | |
… | |
| 1596 | { |
1595 | { |
| 1597 | if (!sound) |
1596 | if (!sound) |
| 1598 | return; |
1597 | return; |
| 1599 | |
1598 | |
| 1600 | for_all_players (pl) |
1599 | for_all_players (pl) |
| 1601 | if (pl->ob->map == this) |
1600 | if (pl->observe->map == this) |
| 1602 | if (client *ns = pl->ns) |
1601 | if (client *ns = pl->ns) |
| 1603 | { |
1602 | { |
| 1604 | int dx = x - pl->ob->x; |
1603 | int dx = x - pl->observe->x; |
| 1605 | int dy = y - pl->ob->y; |
1604 | int dy = y - pl->observe->y; |
| 1606 | |
1605 | |
| 1607 | int distance = idistance (dx, dy); |
1606 | int distance = idistance (dx, dy); |
| 1608 | |
1607 | |
| 1609 | if (distance <= MAX_SOUND_DISTANCE) |
1608 | if (distance <= MAX_SOUND_DISTANCE) |
| 1610 | ns->play_sound (sound, dx, dy); |
1609 | ns->play_sound (sound, dx, dy); |
