| 1 | /* |
1 | /* |
| 2 | * CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game |
| 3 | * |
3 | * |
| 4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
| 5 | * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team |
| 6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
| 7 | * |
7 | * |
| … | |
… | |
| 174 | * let the player through (inventory checkers for example) |
174 | * let the player through (inventory checkers for example) |
| 175 | */ |
175 | */ |
| 176 | if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) |
176 | if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) |
| 177 | return 0; |
177 | return 0; |
| 178 | |
178 | |
| 179 | if (ob->head != NULL) |
|
|
| 180 | ob = ob->head; |
179 | ob = ob->head_ (); |
| 181 | |
180 | |
| 182 | /* We basically go through the stack of objects, and if there is |
181 | /* We basically go through the stack of objects, and if there is |
| 183 | * some other object that has NO_PASS or FLAG_ALIVE set, return |
182 | * some other object that has NO_PASS or FLAG_ALIVE set, return |
| 184 | * true. If we get through the entire stack, that must mean |
183 | * true. If we get through the entire stack, that must mean |
| 185 | * ob is blocking it, so return 0. |
184 | * ob is blocking it, so return 0. |
| … | |
… | |
| 215 | else |
214 | else |
| 216 | { |
215 | { |
| 217 | /* Broke apart a big nasty if into several here to make |
216 | /* Broke apart a big nasty if into several here to make |
| 218 | * this more readable. first check - if the space blocks |
217 | * this more readable. first check - if the space blocks |
| 219 | * movement, can't move here. |
218 | * movement, can't move here. |
| 220 | * second - if a monster, can't move there, unles it is a |
219 | * second - if a monster, can't move there, unless it is a |
| 221 | * hidden dm |
220 | * hidden dm |
| 222 | */ |
221 | */ |
| 223 | if (OB_MOVE_BLOCK (ob, tmp)) |
222 | if (OB_MOVE_BLOCK (ob, tmp)) |
| 224 | return 1; |
223 | return 1; |
| 225 | if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && |
224 | |
| 226 | tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) |
225 | if (QUERY_FLAG (tmp, FLAG_ALIVE) |
|
|
226 | && tmp->head_ () != ob |
|
|
227 | && tmp != ob |
|
|
228 | && tmp->type != DOOR |
|
|
229 | && !tmp->flag [FLAG_WIZ] |
|
|
230 | && tmp->contr->hidden) |
| 227 | return 1; |
231 | return 1; |
| 228 | } |
232 | } |
| 229 | |
233 | |
| 230 | } |
234 | } |
| 231 | return 0; |
235 | return 0; |
| … | |
… | |
| 356 | |
360 | |
| 357 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
361 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
| 358 | for (object *op = ms->bot; op; op = op->above) |
362 | for (object *op = ms->bot; op; op = op->above) |
| 359 | { |
363 | { |
| 360 | /* already multipart - don't do anything more */ |
364 | /* already multipart - don't do anything more */ |
| 361 | if (!op->head && !op->more && op->arch->more) |
365 | if (op->head_ () == op && !op->more && op->arch->more) |
| 362 | { |
366 | { |
| 363 | op->remove (); |
367 | op->remove (); |
| 364 | op->expand_tail (); |
368 | op->expand_tail (); |
| 365 | insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); |
369 | insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); |
| 366 | } |
370 | } |
| … | |
… | |
| 773 | object *above = op->above; |
777 | object *above = op->above; |
| 774 | |
778 | |
| 775 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
779 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
| 776 | unique = 1; |
780 | unique = 1; |
| 777 | |
781 | |
| 778 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
782 | if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
| 779 | { |
783 | { |
| 780 | op->destroy_inv (false); |
784 | op->destroy_inv (false); |
| 781 | op->destroy (); |
785 | op->destroy (); |
| 782 | } |
786 | } |
| 783 | |
787 | |
| … | |
… | |
| 866 | free (regionmap), regionmap = 0; |
870 | free (regionmap), regionmap = 0; |
| 867 | |
871 | |
| 868 | if (spaces) |
872 | if (spaces) |
| 869 | { |
873 | { |
| 870 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
874 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
| 871 | while (object *op = ms->bot) |
875 | while (object *op = ms->bot->head_ ()) |
| 872 | { |
876 | { |
| 873 | if (op->head) |
|
|
| 874 | op = op->head; |
|
|
| 875 | |
|
|
| 876 | op->destroy_inv (false); |
877 | op->destroy_inv (false); |
| 877 | op->destroy (); |
878 | op->destroy (); |
| 878 | } |
879 | } |
| 879 | |
880 | |
| 880 | sfree (spaces, size ()), spaces = 0; |
881 | sfree (spaces, size ()), spaces = 0; |
