| … | |
… | |
| 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 | |
| … | |
… | |
| 332 | if (object *op = object::read (f, this)) |
317 | if (object *op = object::read (f, this)) |
| 333 | { |
318 | { |
| 334 | if (op->inv) |
319 | if (op->inv) |
| 335 | sum_weight (op); |
320 | sum_weight (op); |
| 336 | |
321 | |
| 337 | insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
322 | if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) |
|
|
323 | { |
|
|
324 | // we insert manually because |
|
|
325 | // a) its way faster |
|
|
326 | // b) we remove manually, too, and there are good reasons for that |
|
|
327 | // c) its correct |
|
|
328 | mapspace &ms = at (op->x, op->y); |
|
|
329 | |
|
|
330 | op->flag [FLAG_REMOVED] = false; |
|
|
331 | |
|
|
332 | op->above = 0; |
|
|
333 | op->below = ms.top; |
|
|
334 | |
|
|
335 | if (ms.top) |
|
|
336 | ms.top->above = op; |
|
|
337 | else |
|
|
338 | ms.bot = op; |
|
|
339 | |
|
|
340 | ms.top = op; |
|
|
341 | ms.flags_ = 0; |
|
|
342 | } |
|
|
343 | else |
|
|
344 | { |
|
|
345 | f.parse_warn (format ("object %s out of range", op->debug_desc ())); |
|
|
346 | op->destroy (); |
|
|
347 | } |
| 338 | } |
348 | } |
| 339 | |
349 | |
| 340 | continue; |
350 | continue; |
| 341 | |
351 | |
| 342 | case KW_EOF: |
352 | case KW_EOF: |
| … | |
… | |
| 789 | if (ms->bot = op->above) |
799 | if (ms->bot = op->above) |
| 790 | ms->bot->below = 0; |
800 | ms->bot->below = 0; |
| 791 | |
801 | |
| 792 | op->flag [FLAG_REMOVED] = true; |
802 | op->flag [FLAG_REMOVED] = true; |
| 793 | |
803 | |
|
|
804 | object *head = op->head_ (); |
| 794 | if (op == op->head_ ()) |
805 | if (op == head) |
| 795 | { |
806 | { |
| 796 | op->destroy_inv (false); |
807 | op->destroy_inv (false); |
| 797 | op->destroy (); |
808 | op->destroy (); |
|
|
809 | } |
|
|
810 | else if (head->map != op->map) |
|
|
811 | { |
|
|
812 | LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); |
|
|
813 | head->destroy (); |
| 798 | } |
814 | } |
| 799 | } |
815 | } |
| 800 | |
816 | |
| 801 | sfree (spaces, size ()), spaces = 0; |
817 | sfree (spaces, size ()), spaces = 0; |
| 802 | } |
818 | } |
