… | |
… | |
32 | |
32 | |
33 | /* |
33 | /* |
34 | * Returns the maptile which has a name matching the given argument. |
34 | * Returns the maptile which has a name matching the given argument. |
35 | * return NULL if no match is found. |
35 | * return NULL if no match is found. |
36 | */ |
36 | */ |
37 | |
|
|
38 | maptile * |
37 | maptile * |
39 | has_been_loaded (const char *name) |
38 | has_been_loaded (const char *name) |
40 | { |
39 | { |
41 | maptile *map; |
40 | maptile *map; |
42 | |
41 | |
43 | if (!name || !*name) |
42 | if (!name || !*name) |
44 | return 0; |
43 | return 0; |
|
|
44 | |
45 | for (map = first_map; map; map = map->next) |
45 | for (map = first_map; map; map = map->next) |
46 | if (!strcmp (name, map->path)) |
46 | if (!strcmp (name, map->path)) |
47 | break; |
47 | break; |
|
|
48 | |
48 | return (map); |
49 | return (map); |
49 | } |
50 | } |
50 | |
51 | |
51 | /* |
52 | /* |
52 | * This makes a path absolute outside the world of Crossfire. |
53 | * This makes a path absolute outside the world of Crossfire. |
… | |
… | |
196 | |
197 | |
197 | void |
198 | void |
198 | dump_map (const maptile *m) |
199 | dump_map (const maptile *m) |
199 | { |
200 | { |
200 | LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); |
201 | LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); |
201 | LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m)); |
202 | LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y); |
202 | |
203 | |
203 | if (m->msg != NULL) |
204 | if (m->msg != NULL) |
204 | LOG (llevError, "Message:\n%s", m->msg); |
205 | LOG (llevError, "Message:\n%s", m->msg); |
205 | |
206 | |
206 | if (m->maplore != NULL) |
207 | if (m->maplore != NULL) |
… | |
… | |
222 | void |
223 | void |
223 | dump_all_maps (void) |
224 | dump_all_maps (void) |
224 | { |
225 | { |
225 | maptile *m; |
226 | maptile *m; |
226 | |
227 | |
227 | for (m = first_map; m != NULL; m = m->next) |
228 | for (m = first_map; m; m = m->next) |
228 | { |
|
|
229 | dump_map (m); |
229 | dump_map (m); |
230 | } |
|
|
231 | } |
230 | } |
232 | |
231 | |
233 | /* This rolls up wall, blocks_magic, blocks_view, etc, all into |
232 | /* This rolls up wall, blocks_magic, blocks_view, etc, all into |
234 | * one function that just returns a P_.. value (see map.h) |
233 | * one function that just returns a P_.. value (see map.h) |
235 | * it will also do map translation for tiled maps, returning |
234 | * it will also do map translation for tiled maps, returning |
… | |
… | |
239 | * is needed. The case of not passing values is if we're just |
238 | * is needed. The case of not passing values is if we're just |
240 | * checking for the existence of something on those spaces, but |
239 | * checking for the existence of something on those spaces, but |
241 | * don't expect to insert/remove anything from those spaces. |
240 | * don't expect to insert/remove anything from those spaces. |
242 | */ |
241 | */ |
243 | int |
242 | int |
244 | get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) |
243 | get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) |
245 | { |
244 | { |
246 | sint16 newx, newy; |
245 | sint16 newx, newy; |
247 | int retval = 0; |
246 | int retval = 0; |
248 | maptile *mp; |
247 | maptile *mp; |
249 | |
248 | |
250 | if (out_of_map (oldmap, x, y)) |
|
|
251 | return P_OUT_OF_MAP; |
|
|
252 | newx = x; |
249 | newx = x; |
253 | newy = y; |
250 | newy = y; |
|
|
251 | |
254 | mp = get_map_from_coord (oldmap, &newx, &newy); |
252 | mp = get_map_from_coord (oldmap, &newx, &newy); |
|
|
253 | |
|
|
254 | if (!mp) |
|
|
255 | return P_OUT_OF_MAP; |
|
|
256 | |
255 | if (mp != oldmap) |
257 | if (mp != oldmap) |
256 | retval |= P_NEW_MAP; |
258 | retval |= P_NEW_MAP; |
257 | if (newmap) |
|
|
258 | *newmap = mp; |
|
|
259 | if (nx) |
|
|
260 | *nx = newx; |
|
|
261 | if (ny) |
|
|
262 | *ny = newy; |
|
|
263 | |
259 | |
264 | retval |= mp->spaces[newx + mp->width * newy].flags; |
260 | if (newmap) *newmap = mp; |
|
|
261 | if (nx) *nx = newx; |
|
|
262 | if (ny) *ny = newy; |
265 | |
263 | |
266 | return retval; |
264 | return retval | mp->at (newx, newy).flags (); |
267 | } |
265 | } |
268 | |
266 | |
269 | /* |
267 | /* |
270 | * Returns true if the given coordinate is blocked except by the |
268 | * Returns true if the given coordinate is blocked except by the |
271 | * object passed is not blocking. This is used with |
269 | * object passed is not blocking. This is used with |
… | |
… | |
294 | } |
292 | } |
295 | |
293 | |
296 | /* Save some cycles - instead of calling get_map_flags(), just get the value |
294 | /* Save some cycles - instead of calling get_map_flags(), just get the value |
297 | * directly. |
295 | * directly. |
298 | */ |
296 | */ |
299 | mflags = m->spaces[sx + m->width * sy].flags; |
297 | mflags = m->at (sx, sy).flags (); |
300 | |
298 | |
301 | blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); |
299 | blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); |
302 | |
300 | |
303 | /* If space is currently not blocked by anything, no need to |
301 | /* If space is currently not blocked by anything, no need to |
304 | * go further. Not true for players - all sorts of special |
302 | * go further. Not true for players - all sorts of special |
… | |
… | |
323 | /* We basically go through the stack of objects, and if there is |
321 | /* We basically go through the stack of objects, and if there is |
324 | * some other object that has NO_PASS or FLAG_ALIVE set, return |
322 | * some other object that has NO_PASS or FLAG_ALIVE set, return |
325 | * true. If we get through the entire stack, that must mean |
323 | * true. If we get through the entire stack, that must mean |
326 | * ob is blocking it, so return 0. |
324 | * ob is blocking it, so return 0. |
327 | */ |
325 | */ |
328 | for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) |
326 | for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) |
329 | { |
327 | { |
330 | |
328 | |
331 | /* This must be before the checks below. Code for inventory checkers. */ |
329 | /* This must be before the checks below. Code for inventory checkers. */ |
332 | if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) |
330 | if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) |
333 | { |
331 | { |
… | |
… | |
397 | * |
395 | * |
398 | * Note this used to be arch_blocked, but with new movement |
396 | * Note this used to be arch_blocked, but with new movement |
399 | * code, we need to have actual object to check its move_type |
397 | * code, we need to have actual object to check its move_type |
400 | * against the move_block values. |
398 | * against the move_block values. |
401 | */ |
399 | */ |
402 | |
|
|
403 | int |
400 | int |
404 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
401 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
405 | { |
402 | { |
406 | archetype *tmp; |
403 | archetype *tmp; |
407 | int flag; |
404 | int flag; |
… | |
… | |
413 | flag = get_map_flags (m, &m1, x, y, &sx, &sy); |
410 | flag = get_map_flags (m, &m1, x, y, &sx, &sy); |
414 | if (flag & P_OUT_OF_MAP) |
411 | if (flag & P_OUT_OF_MAP) |
415 | return P_OUT_OF_MAP; |
412 | return P_OUT_OF_MAP; |
416 | |
413 | |
417 | /* don't have object, so don't know what types would block */ |
414 | /* don't have object, so don't know what types would block */ |
418 | return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); |
415 | return m1->at (sx, sy).move_block; |
419 | } |
416 | } |
420 | |
417 | |
421 | for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) |
418 | for (tmp = ob->arch; tmp; tmp = tmp->more) |
422 | { |
419 | { |
423 | flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); |
420 | flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); |
424 | |
421 | |
425 | if (flag & P_OUT_OF_MAP) |
422 | if (flag & P_OUT_OF_MAP) |
426 | return P_OUT_OF_MAP; |
423 | return P_OUT_OF_MAP; |
427 | if (flag & P_IS_ALIVE) |
424 | if (flag & P_IS_ALIVE) |
428 | return P_IS_ALIVE; |
425 | return P_IS_ALIVE; |
429 | |
426 | |
|
|
427 | mapspace &ms = m1->at (sx, sy); |
|
|
428 | |
|
|
429 | |
430 | /* find_first_free_spot() calls this function. However, often |
430 | /* find_first_free_spot() calls this function. However, often |
431 | * ob doesn't have any move type (when used to place exits) |
431 | * ob doesn't have any move type (when used to place exits) |
432 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
432 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
433 | */ |
433 | */ |
434 | |
434 | |
435 | if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) |
435 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
436 | continue; |
436 | continue; |
437 | |
437 | |
438 | /* Note it is intentional that we check ob - the movement type of the |
438 | /* Note it is intentional that we check ob - the movement type of the |
439 | * head of the object should correspond for the entire object. |
439 | * head of the object should correspond for the entire object. |
440 | */ |
440 | */ |
441 | if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) |
441 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
442 | return AB_NO_PASS; |
442 | return P_NO_PASS; |
443 | |
|
|
444 | } |
443 | } |
|
|
444 | |
445 | return 0; |
445 | return 0; |
446 | } |
446 | } |
447 | |
447 | |
448 | /* When the map is loaded, load_object does not actually insert objects |
448 | /* When the map is loaded, load_object does not actually insert objects |
449 | * into inventory, but just links them. What this does is go through |
449 | * into inventory, but just links them. What this does is go through |
… | |
… | |
484 | { |
484 | { |
485 | int x, y; |
485 | int x, y; |
486 | object *tmp, *op, *last, *above; |
486 | object *tmp, *op, *last, *above; |
487 | archetype *at; |
487 | archetype *at; |
488 | |
488 | |
489 | for (x = 0; x < MAP_WIDTH (m); x++) |
489 | for (x = 0; x < m->width; x++) |
490 | for (y = 0; y < MAP_HEIGHT (m); y++) |
490 | for (y = 0; y < m->height; y++) |
491 | for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) |
491 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) |
492 | { |
492 | { |
493 | above = tmp->above; |
493 | above = tmp->above; |
494 | |
494 | |
495 | /* already multipart - don't do anything more */ |
495 | /* already multipart - don't do anything more */ |
496 | if (tmp->head || tmp->more) |
496 | if (tmp->head || tmp->more) |
… | |
… | |
546 | { |
546 | { |
547 | LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); |
547 | LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); |
548 | continue; |
548 | continue; |
549 | } |
549 | } |
550 | |
550 | |
551 | |
|
|
552 | switch (i) |
551 | switch (i) |
553 | { |
552 | { |
554 | case LL_NORMAL: |
553 | case LL_NORMAL: |
555 | /* if we are loading an overlay, put the floors on the bottom */ |
554 | /* if we are loading an overlay, put the floors on the bottom */ |
556 | if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) |
555 | if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) |
… | |
… | |
581 | { |
580 | { |
582 | for (j = 0; j < m->height; j++) |
581 | for (j = 0; j < m->height; j++) |
583 | { |
582 | { |
584 | unique = 0; |
583 | unique = 0; |
585 | /* check for unique items, or unique squares */ |
584 | /* check for unique items, or unique squares */ |
586 | for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) |
585 | for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above) |
587 | { |
586 | { |
588 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
587 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
589 | unique = 1; |
588 | unique = 1; |
590 | |
589 | |
591 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
590 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
… | |
… | |
608 | { |
607 | { |
609 | int i, j = 0, unique = 0; |
608 | int i, j = 0, unique = 0; |
610 | object *op; |
609 | object *op; |
611 | |
610 | |
612 | /* first pass - save one-part objects */ |
611 | /* first pass - save one-part objects */ |
613 | for (i = 0; i < MAP_WIDTH (m); i++) |
612 | for (i = 0; i < m->width; i++) |
614 | for (j = 0; j < MAP_HEIGHT (m); j++) |
613 | for (j = 0; j < m->height; j++) |
615 | { |
614 | { |
616 | unique = 0; |
615 | unique = 0; |
617 | for (op = get_map_ob (m, i, j); op; op = op->above) |
616 | for (op = m->at (i, j).bot; op; op = op->above) |
618 | { |
617 | { |
619 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
618 | if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE]) |
620 | unique = 1; |
619 | unique = 1; |
621 | |
620 | |
622 | if (op->type == PLAYER) |
621 | if (op->type == PLAYER) |
623 | { |
|
|
624 | LOG (llevDebug, "Player on map that is being saved\n"); |
|
|
625 | continue; |
622 | continue; |
626 | } |
|
|
627 | |
623 | |
628 | if (op->head || op->owner) |
624 | if (op->head || op->owner) |
629 | continue; |
625 | continue; |
630 | |
626 | |
631 | if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) |
627 | if (unique || op->flag [FLAG_UNIQUE]) |
632 | save_object (fp2, op, 3); |
628 | save_object (fp2, op, 3); |
633 | else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) |
629 | else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID]))) |
634 | save_object (fp, op, 3); |
630 | save_object (fp, op, 3); |
635 | |
631 | } |
636 | } /* for this space */ |
632 | } |
637 | } /* for this j */ |
|
|
638 | } |
633 | } |
639 | |
634 | |
640 | maptile::maptile () |
635 | maptile::maptile () |
641 | { |
636 | { |
642 | in_memory = MAP_SWAPPED; |
637 | in_memory = MAP_SWAPPED; |
643 | /* The maps used to pick up default x and y values from the |
638 | /* The maps used to pick up default x and y values from the |
644 | * map archetype. Mimic that behaviour. |
639 | * map archetype. Mimic that behaviour. |
645 | */ |
640 | */ |
646 | MAP_WIDTH (this) = 16; |
641 | this->width = 16; |
647 | MAP_HEIGHT (this) = 16; |
642 | this->height = 16; |
648 | MAP_RESET_TIMEOUT (this) = 0; |
643 | this->reset_timeout = 0; |
649 | MAP_TIMEOUT (this) = 300; |
644 | this->timeout = 300; |
650 | MAP_ENTER_X (this) = 0; |
645 | this->enter_x = 0; |
651 | MAP_ENTER_Y (this) = 0; |
646 | this->enter_y = 0; |
652 | /*set part to -1 indicating conversion to weather map not yet done */ |
647 | /*set part to -1 indicating conversion to weather map not yet done */ |
653 | MAP_WORLDPARTX (this) = -1; |
648 | this->worldpartx = -1; |
654 | MAP_WORLDPARTY (this) = -1; |
649 | this->worldparty = -1; |
655 | } |
650 | } |
656 | |
651 | |
657 | /* |
652 | /* |
658 | * Allocates, initialises, and returns a pointer to a maptile. |
653 | * Allocates, initialises, and returns a pointer to a maptile. |
659 | * Modified to no longer take a path option which was not being |
654 | * Modified to no longer take a path option which was not being |
… | |
… | |
692 | { |
687 | { |
693 | LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); |
688 | LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); |
694 | free (spaces); |
689 | free (spaces); |
695 | } |
690 | } |
696 | |
691 | |
697 | spaces = (MapSpace *) |
692 | spaces = (mapspace *) |
698 | calloc (1, width * height * sizeof (MapSpace)); |
693 | calloc (1, width * height * sizeof (mapspace)); |
699 | |
694 | |
700 | if (!spaces) |
695 | if (!spaces) |
701 | fatal (OUT_OF_MEMORY); |
696 | fatal (OUT_OF_MEMORY); |
702 | } |
697 | } |
703 | |
698 | |
… | |
… | |
1129 | strcpy (m->path, filename); |
1124 | strcpy (m->path, filename); |
1130 | if (load_map_header (thawer, m)) |
1125 | if (load_map_header (thawer, m)) |
1131 | { |
1126 | { |
1132 | LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); |
1127 | LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); |
1133 | delete_map (m); |
1128 | delete_map (m); |
1134 | return NULL; |
1129 | return 0; |
1135 | } |
1130 | } |
1136 | |
1131 | |
1137 | m->allocate (); |
1132 | m->allocate (); |
1138 | |
1133 | |
1139 | m->in_memory = MAP_LOADING; |
1134 | m->in_memory = MAP_LOADING; |
1140 | load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); |
1135 | load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); |
1141 | |
1136 | |
1142 | m->in_memory = MAP_IN_MEMORY; |
1137 | m->in_memory = MAP_IN_MEMORY; |
1143 | if (!MAP_DIFFICULTY (m)) |
1138 | if (!m->difficulty) |
1144 | MAP_DIFFICULTY (m) = calculate_difficulty (m); |
1139 | m->difficulty = calculate_difficulty (m); |
1145 | set_map_reset_time (m); |
1140 | set_map_reset_time (m); |
1146 | m->instantiate (); |
1141 | m->instantiate (); |
1147 | return (m); |
1142 | return (m); |
1148 | } |
1143 | } |
1149 | |
1144 | |
… | |
… | |
1222 | if (load_map_header (thawer, m)) |
1217 | if (load_map_header (thawer, m)) |
1223 | { |
1218 | { |
1224 | LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); |
1219 | LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); |
1225 | delete_map (m); |
1220 | delete_map (m); |
1226 | m = load_original_map (m->path, 0); |
1221 | m = load_original_map (m->path, 0); |
1227 | return NULL; |
1222 | return 0; |
1228 | } |
1223 | } |
1229 | /*m->allocate ();*/ |
1224 | /*m->allocate ();*/ |
1230 | |
1225 | |
1231 | m->in_memory = MAP_LOADING; |
1226 | m->in_memory = MAP_LOADING; |
1232 | load_objects (m, thawer, MAP_OVERLAY); |
1227 | load_objects (m, thawer, MAP_OVERLAY); |
… | |
… | |
1244 | delete_unique_items (maptile *m) |
1239 | delete_unique_items (maptile *m) |
1245 | { |
1240 | { |
1246 | int i, j, unique; |
1241 | int i, j, unique; |
1247 | object *op, *next; |
1242 | object *op, *next; |
1248 | |
1243 | |
1249 | for (i = 0; i < MAP_WIDTH (m); i++) |
1244 | for (i = 0; i < m->width; i++) |
1250 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1245 | for (j = 0; j < m->height; j++) |
1251 | { |
1246 | { |
1252 | unique = 0; |
1247 | unique = 0; |
1253 | |
1248 | |
1254 | for (op = get_map_ob (m, i, j); op; op = next) |
1249 | for (op = GET_MAP_OB (m, i, j); op; op = next) |
1255 | { |
1250 | { |
1256 | next = op->above; |
1251 | next = op->above; |
1257 | |
1252 | |
1258 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
1253 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
1259 | unique = 1; |
1254 | unique = 1; |
1260 | |
1255 | |
1261 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1256 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1262 | { |
1257 | { |
1263 | clean_object (op); |
1258 | op->destroy_inv (false); |
1264 | |
|
|
1265 | if (QUERY_FLAG (op, FLAG_IS_LINKED)) |
|
|
1266 | remove_button_link (op); |
|
|
1267 | |
|
|
1268 | op->destroy (); |
1259 | op->destroy (); |
1269 | } |
1260 | } |
1270 | } |
1261 | } |
1271 | } |
1262 | } |
1272 | } |
1263 | } |
… | |
… | |
1298 | return; |
1289 | return; |
1299 | |
1290 | |
1300 | m->in_memory = MAP_LOADING; |
1291 | m->in_memory = MAP_LOADING; |
1301 | if (m->tmpname == NULL) /* if we have loaded unique items from */ |
1292 | if (m->tmpname == NULL) /* if we have loaded unique items from */ |
1302 | delete_unique_items (m); /* original map before, don't duplicate them */ |
1293 | delete_unique_items (m); /* original map before, don't duplicate them */ |
|
|
1294 | |
1303 | load_objects (m, thawer, 0); |
1295 | load_objects (m, thawer, 0); |
1304 | |
1296 | |
1305 | m->in_memory = MAP_IN_MEMORY; |
1297 | m->in_memory = MAP_IN_MEMORY; |
1306 | } |
1298 | } |
1307 | |
|
|
1308 | |
1299 | |
1309 | /* |
1300 | /* |
1310 | * Saves a map to file. If flag is set, it is saved into the same |
1301 | * Saves a map to file. If flag is set, it is saved into the same |
1311 | * file it was (originally) loaded from. Otherwise a temporary |
1302 | * file it was (originally) loaded from. Otherwise a temporary |
1312 | * filename will be genarated, and the file will be stored there. |
1303 | * filename will be genarated, and the file will be stored there. |
1313 | * The temporary filename will be stored in the maptileure. |
1304 | * The temporary filename will be stored in the maptileure. |
1314 | * If the map is unique, we also save to the filename in the map |
1305 | * If the map is unique, we also save to the filename in the map |
1315 | * (this should have been updated when first loaded) |
1306 | * (this should have been updated when first loaded) |
1316 | */ |
1307 | */ |
1317 | |
|
|
1318 | int |
1308 | int |
1319 | new_save_map (maptile *m, int flag) |
1309 | new_save_map (maptile *m, int flag) |
1320 | { |
1310 | { |
1321 | char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; |
1311 | char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; |
1322 | int i; |
1312 | int i; |
… | |
… | |
1454 | freezer.save (filename); |
1444 | freezer.save (filename); |
1455 | |
1445 | |
1456 | return 0; |
1446 | return 0; |
1457 | } |
1447 | } |
1458 | |
1448 | |
1459 | |
|
|
1460 | /* |
|
|
1461 | * Remove and free all objects in the inventory of the given object. |
|
|
1462 | * object.c ? |
|
|
1463 | */ |
|
|
1464 | |
|
|
1465 | void |
|
|
1466 | clean_object (object *op) |
|
|
1467 | { |
|
|
1468 | object *tmp, *next; |
|
|
1469 | |
|
|
1470 | for (tmp = op->inv; tmp; tmp = next) |
|
|
1471 | { |
|
|
1472 | next = tmp->below; |
|
|
1473 | |
|
|
1474 | clean_object (tmp); |
|
|
1475 | if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) |
|
|
1476 | remove_button_link (tmp); |
|
|
1477 | |
|
|
1478 | tmp->destroy (); |
|
|
1479 | } |
|
|
1480 | } |
|
|
1481 | |
|
|
1482 | /* |
1449 | /* |
1483 | * Remove and free all objects in the given map. |
1450 | * Remove and free all objects in the given map. |
1484 | */ |
1451 | */ |
1485 | |
|
|
1486 | void |
1452 | void |
1487 | free_all_objects (maptile *m) |
1453 | free_all_objects (maptile *m) |
1488 | { |
1454 | { |
1489 | int i, j; |
1455 | if (!m->spaces) |
1490 | object *op; |
1456 | return; |
1491 | |
1457 | |
1492 | for (i = 0; i < MAP_WIDTH (m); i++) |
1458 | for (int i = 0; i < m->width; i++) |
1493 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1459 | for (int j = 0; j < m->height; j++) |
1494 | { |
1460 | { |
1495 | object *previous_obj = NULL; |
1461 | mapspace &ms = m->at (i, j); |
1496 | |
1462 | |
1497 | while ((op = GET_MAP_OB (m, i, j)) != NULL) |
1463 | while (object *op = ms.bot) |
1498 | { |
1464 | { |
1499 | if (op == previous_obj) |
|
|
1500 | { |
|
|
1501 | LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); |
|
|
1502 | break; |
|
|
1503 | } |
|
|
1504 | |
|
|
1505 | previous_obj = op; |
|
|
1506 | |
|
|
1507 | if (op->head != NULL) |
1465 | if (op->head) |
1508 | op = op->head; |
1466 | op = op->head; |
1509 | |
1467 | |
1510 | /* If the map isn't in memory, free_object will remove and |
1468 | op->destroy_inv (false); |
1511 | * free objects in op's inventory. So let it do the job. |
|
|
1512 | */ |
|
|
1513 | if (m->in_memory == MAP_IN_MEMORY) |
|
|
1514 | clean_object (op); |
|
|
1515 | |
|
|
1516 | op->destroy (); |
1469 | op->destroy (); |
1517 | } |
1470 | } |
1518 | } |
1471 | } |
1519 | } |
1472 | } |
1520 | |
1473 | |
1521 | /* |
1474 | /* |
1522 | * Frees everything allocated by the given maptileure. |
1475 | * Frees everything allocated by the given maptileure. |
1523 | * don't free tmpname - our caller is left to do that |
1476 | * don't free tmpname - our caller is left to do that |
1524 | */ |
1477 | */ |
1525 | |
|
|
1526 | void |
1478 | void |
1527 | free_map (maptile *m, int flag) |
1479 | free_map (maptile *m, int flag) |
1528 | { |
1480 | { |
1529 | int i; |
1481 | if (!m->in_memory) //TODO: makes no sense to me? |
1530 | |
|
|
1531 | if (!m->in_memory) |
|
|
1532 | { |
|
|
1533 | LOG (llevError, "Trying to free freed map.\n"); |
|
|
1534 | return; |
1482 | return; |
1535 | } |
1483 | |
|
|
1484 | m->in_memory = MAP_SAVING; |
1536 | |
1485 | |
1537 | // TODO: use new/delete |
1486 | // TODO: use new/delete |
1538 | #define FREE_AND_CLEAR(p) { free (p); p = NULL; } |
|
|
1539 | |
1487 | |
1540 | if (flag && m->spaces) |
1488 | if (flag && m->spaces) |
1541 | free_all_objects (m); |
1489 | free_all_objects (m); |
1542 | if (m->name) |
|
|
1543 | FREE_AND_CLEAR (m->name); |
|
|
1544 | if (m->spaces) |
|
|
1545 | FREE_AND_CLEAR (m->spaces); |
|
|
1546 | if (m->msg) |
|
|
1547 | FREE_AND_CLEAR (m->msg); |
|
|
1548 | if (m->maplore) |
|
|
1549 | FREE_AND_CLEAR (m->maplore); |
|
|
1550 | |
1490 | |
1551 | delete [] m->shopitems; |
1491 | free (m->name), m->name = 0; |
1552 | m->shopitems = 0; |
1492 | free (m->spaces), m->spaces = 0; |
1553 | |
1493 | free (m->msg), m->msg = 0; |
1554 | if (m->shoprace) |
1494 | free (m->maplore), m->maplore = 0; |
1555 | FREE_AND_CLEAR (m->shoprace); |
1495 | free (m->shoprace), m->shoprace = 0; |
|
|
1496 | delete [] m->shopitems, m->shopitems = 0; |
1556 | |
1497 | |
1557 | if (m->buttons) |
1498 | if (m->buttons) |
1558 | free_objectlinkpt (m->buttons); |
1499 | free_objectlinkpt (m->buttons), m->buttons = 0; |
1559 | |
1500 | |
1560 | m->buttons = NULL; |
|
|
1561 | |
|
|
1562 | for (i = 0; i < 4; i++) |
1501 | for (int i = 0; i < 4; i++) |
1563 | { |
1502 | { |
1564 | if (m->tile_path[i]) |
1503 | if (m->tile_path[i]) |
1565 | FREE_AND_CLEAR (m->tile_path[i]); |
1504 | free (m->tile_path[i]), m->tile_path[i] = 0; |
|
|
1505 | |
1566 | m->tile_map[i] = NULL; |
1506 | m->tile_map[i] = 0; |
1567 | } |
1507 | } |
1568 | |
1508 | |
1569 | m->in_memory = MAP_SWAPPED; |
1509 | m->in_memory = MAP_SWAPPED; |
1570 | |
|
|
1571 | #undef FREE_AND_CLEAR |
|
|
1572 | |
|
|
1573 | } |
1510 | } |
1574 | |
1511 | |
1575 | /* |
1512 | maptile::~maptile () |
1576 | * function: vanish maptile |
1513 | { |
1577 | * m : pointer to maptile, if NULL no action |
1514 | free_map (this, 1); |
1578 | * this deletes all the data on the map (freeing pointers) |
1515 | free (tmpname); |
1579 | * and then removes this map from the global linked list of maps. |
1516 | } |
|
|
1517 | |
|
|
1518 | void |
|
|
1519 | maptile::do_destroy () |
|
|
1520 | { |
|
|
1521 | attachable::do_destroy (); |
|
|
1522 | |
|
|
1523 | free_all_objects (this); |
|
|
1524 | |
|
|
1525 | /* We need to look through all the maps and see if any maps |
|
|
1526 | * are pointing at this one for tiling information. Since |
|
|
1527 | * tiling can be asymetric, we just can not look to see which |
|
|
1528 | * maps this map tiles with and clears those. |
1580 | */ |
1529 | */ |
|
|
1530 | //TODO: non-euclidean-tiling MUST GO |
|
|
1531 | for (maptile *m = first_map; m; m = m->next) |
|
|
1532 | for (int i = 0; i < 4; i++) |
|
|
1533 | if (m->tile_map[i] == this) |
|
|
1534 | m->tile_map[i] = 0; |
1581 | |
1535 | |
|
|
1536 | if (first_map == this) |
|
|
1537 | first_map = next; |
|
|
1538 | else |
|
|
1539 | for (maptile *m = first_map; m; m = m->next) |
|
|
1540 | if (m->next = this) |
|
|
1541 | { |
|
|
1542 | m->next = next; |
|
|
1543 | break; |
|
|
1544 | } |
|
|
1545 | } |
|
|
1546 | |
|
|
1547 | //TODO: must go |
1582 | void |
1548 | void |
1583 | delete_map (maptile *m) |
1549 | delete_map (maptile *m) |
1584 | { |
1550 | { |
1585 | maptile *tmp, *last; |
|
|
1586 | int i; |
|
|
1587 | |
|
|
1588 | if (!m) |
1551 | if (m) |
1589 | return; |
1552 | m->destroy (); |
1590 | |
|
|
1591 | m->clear (); |
|
|
1592 | |
|
|
1593 | if (m->in_memory == MAP_IN_MEMORY) |
|
|
1594 | { |
|
|
1595 | /* change to MAP_SAVING, even though we are not, |
|
|
1596 | * so that remove_ob doesn't do as much work. |
|
|
1597 | */ |
|
|
1598 | m->in_memory = MAP_SAVING; |
|
|
1599 | free_map (m, 1); |
|
|
1600 | } |
|
|
1601 | /* move this out of free_map, since tmpname can still be needed if |
|
|
1602 | * the map is swapped out. |
|
|
1603 | */ |
|
|
1604 | if (m->tmpname) |
|
|
1605 | { |
|
|
1606 | free (m->tmpname); |
|
|
1607 | m->tmpname = NULL; |
|
|
1608 | } |
|
|
1609 | last = NULL; |
|
|
1610 | /* We need to look through all the maps and see if any maps |
|
|
1611 | * are pointing at this one for tiling information. Since |
|
|
1612 | * tiling can be assymetric, we just can not look to see which |
|
|
1613 | * maps this map tiles with and clears those. |
|
|
1614 | */ |
|
|
1615 | for (tmp = first_map; tmp != NULL; tmp = tmp->next) |
|
|
1616 | { |
|
|
1617 | if (tmp->next == m) |
|
|
1618 | last = tmp; |
|
|
1619 | |
|
|
1620 | /* This should hopefully get unrolled on a decent compiler */ |
|
|
1621 | for (i = 0; i < 4; i++) |
|
|
1622 | if (tmp->tile_map[i] == m) |
|
|
1623 | tmp->tile_map[i] = NULL; |
|
|
1624 | } |
|
|
1625 | |
|
|
1626 | /* If last is null, then this should be the first map in the list */ |
|
|
1627 | if (!last) |
|
|
1628 | { |
|
|
1629 | if (m == first_map) |
|
|
1630 | first_map = m->next; |
|
|
1631 | else |
|
|
1632 | /* m->path is a static char, so should hopefully still have |
|
|
1633 | * some useful data in it. |
|
|
1634 | */ |
|
|
1635 | LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path); |
|
|
1636 | } |
|
|
1637 | else |
|
|
1638 | last->next = m->next; |
|
|
1639 | |
|
|
1640 | delete m; |
|
|
1641 | } |
1553 | } |
1642 | |
1554 | |
1643 | /* |
1555 | /* |
1644 | * Makes sure the given map is loaded and swapped in. |
1556 | * Makes sure the given map is loaded and swapped in. |
1645 | * name is path name of the map. |
1557 | * name is path name of the map. |
… | |
… | |
1652 | * Returns a pointer to the given map. |
1564 | * Returns a pointer to the given map. |
1653 | */ |
1565 | */ |
1654 | maptile * |
1566 | maptile * |
1655 | ready_map_name (const char *name, int flags) |
1567 | ready_map_name (const char *name, int flags) |
1656 | { |
1568 | { |
1657 | maptile *m; |
|
|
1658 | |
|
|
1659 | if (!name) |
1569 | if (!name) |
1660 | return (NULL); |
1570 | return 0; |
1661 | |
1571 | |
1662 | /* Have we been at this level before? */ |
1572 | /* Have we been at this level before? */ |
1663 | m = has_been_loaded (name); |
1573 | maptile *m = has_been_loaded (name); |
1664 | |
1574 | |
1665 | /* Map is good to go, so just return it */ |
1575 | /* Map is good to go, so just return it */ |
1666 | if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) |
1576 | if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) |
1667 | { |
|
|
1668 | return m; |
1577 | return m; |
1669 | } |
|
|
1670 | |
1578 | |
1671 | /* unique maps always get loaded from their original location, and never |
1579 | /* unique maps always get loaded from their original location, and never |
1672 | * a temp location. Likewise, if map_flush is set, or we have never loaded |
1580 | * a temp location. Likewise, if map_flush is set, or we have never loaded |
1673 | * this map, load it now. I removed the reset checking from here - |
1581 | * this map, load it now. I removed the reset checking from here - |
1674 | * it seems the probability of a player trying to enter a map that should |
1582 | * it seems the probability of a player trying to enter a map that should |
… | |
… | |
1676 | * a bit cleaner (and players probably shouldn't rely on exact timing for |
1584 | * a bit cleaner (and players probably shouldn't rely on exact timing for |
1677 | * resets in any case - if they really care, they should use the 'maps command. |
1585 | * resets in any case - if they really care, they should use the 'maps command. |
1678 | */ |
1586 | */ |
1679 | if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) |
1587 | if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) |
1680 | { |
1588 | { |
1681 | |
|
|
1682 | /* first visit or time to reset */ |
1589 | /* first visit or time to reset */ |
1683 | if (m) |
1590 | if (m) |
1684 | { |
1591 | { |
1685 | clean_tmp_map (m); /* Doesn't make much difference */ |
1592 | clean_tmp_map (m); /* Doesn't make much difference */ |
1686 | delete_map (m); |
1593 | delete_map (m); |
… | |
… | |
1773 | int x, y, i; |
1680 | int x, y, i; |
1774 | long monster_cnt = 0; |
1681 | long monster_cnt = 0; |
1775 | double avgexp = 0; |
1682 | double avgexp = 0; |
1776 | sint64 total_exp = 0; |
1683 | sint64 total_exp = 0; |
1777 | |
1684 | |
1778 | if (MAP_DIFFICULTY (m)) |
1685 | if (m->difficulty) |
1779 | { |
1686 | { |
1780 | LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); |
1687 | LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty); |
1781 | return MAP_DIFFICULTY (m); |
1688 | return m->difficulty; |
1782 | } |
1689 | } |
1783 | |
1690 | |
1784 | for (x = 0; x < MAP_WIDTH (m); x++) |
1691 | for (x = 0; x < m->width; x++) |
1785 | for (y = 0; y < MAP_HEIGHT (m); y++) |
1692 | for (y = 0; y < m->height; y++) |
1786 | for (op = get_map_ob (m, x, y); op != NULL; op = op->above) |
1693 | for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) |
1787 | { |
1694 | { |
1788 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1695 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1789 | { |
1696 | { |
1790 | total_exp += op->stats.exp; |
1697 | total_exp += op->stats.exp; |
1791 | monster_cnt++; |
1698 | monster_cnt++; |
… | |
… | |
1884 | /* All clients need to get re-updated for the change */ |
1791 | /* All clients need to get re-updated for the change */ |
1885 | update_all_map_los (m); |
1792 | update_all_map_los (m); |
1886 | return 1; |
1793 | return 1; |
1887 | } |
1794 | } |
1888 | |
1795 | |
1889 | |
|
|
1890 | /* |
1796 | /* |
1891 | * This function updates various attributes about a specific space |
1797 | * This function updates various attributes about a specific space |
1892 | * on the map (what it looks like, whether it blocks magic, |
1798 | * on the map (what it looks like, whether it blocks magic, |
1893 | * has a living creatures, prevents people from passing |
1799 | * has a living creatures, prevents people from passing |
1894 | * through, etc) |
1800 | * through, etc) |
1895 | */ |
1801 | */ |
1896 | void |
1802 | void |
1897 | update_position (maptile *m, int x, int y) |
1803 | mapspace::update_ () |
1898 | { |
1804 | { |
1899 | object *tmp, *last = NULL; |
1805 | object *tmp, *last = 0; |
1900 | uint8 flags = 0, oldflags, light = 0, anywhere = 0; |
1806 | uint8 flags = 0, light = 0, anywhere = 0; |
1901 | New_Face *top, *floor, *middle; |
1807 | New_Face *top, *floor, *middle; |
1902 | object *top_obj, *floor_obj, *middle_obj; |
1808 | object *top_obj, *floor_obj, *middle_obj; |
1903 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1809 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1904 | |
1810 | |
1905 | oldflags = GET_MAP_FLAGS (m, x, y); |
|
|
1906 | if (!(oldflags & P_NEED_UPDATE)) |
|
|
1907 | { |
|
|
1908 | LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y); |
|
|
1909 | return; |
|
|
1910 | } |
|
|
1911 | |
|
|
1912 | middle = blank_face; |
1811 | middle = blank_face; |
1913 | top = blank_face; |
1812 | top = blank_face; |
1914 | floor = blank_face; |
1813 | floor = blank_face; |
1915 | |
1814 | |
1916 | middle_obj = NULL; |
1815 | middle_obj = 0; |
1917 | top_obj = NULL; |
1816 | top_obj = 0; |
1918 | floor_obj = NULL; |
1817 | floor_obj = 0; |
1919 | |
1818 | |
1920 | for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) |
1819 | for (tmp = bot; tmp; last = tmp, tmp = tmp->above) |
1921 | { |
1820 | { |
1922 | |
|
|
1923 | /* This could be made additive I guess (two lights better than |
1821 | /* This could be made additive I guess (two lights better than |
1924 | * one). But if so, it shouldn't be a simple additive - 2 |
1822 | * one). But if so, it shouldn't be a simple additive - 2 |
1925 | * light bulbs do not illuminate twice as far as once since |
1823 | * light bulbs do not illuminate twice as far as once since |
1926 | * it is a disapation factor that is squared (or is it cubed?) |
1824 | * it is a dissapation factor that is cubed. |
1927 | */ |
1825 | */ |
1928 | if (tmp->glow_radius > light) |
1826 | if (tmp->glow_radius > light) |
1929 | light = tmp->glow_radius; |
1827 | light = tmp->glow_radius; |
1930 | |
1828 | |
1931 | /* This call is needed in order to update objects the player |
1829 | /* This call is needed in order to update objects the player |
… | |
… | |
1969 | { |
1867 | { |
1970 | middle = tmp->face; |
1868 | middle = tmp->face; |
1971 | middle_obj = tmp; |
1869 | middle_obj = tmp; |
1972 | } |
1870 | } |
1973 | } |
1871 | } |
|
|
1872 | |
1974 | if (tmp == tmp->above) |
1873 | if (tmp == tmp->above) |
1975 | { |
1874 | { |
1976 | LOG (llevError, "Error in structure of map\n"); |
1875 | LOG (llevError, "Error in structure of map\n"); |
1977 | exit (-1); |
1876 | exit (-1); |
1978 | } |
1877 | } |
1979 | |
1878 | |
1980 | move_slow |= tmp->move_slow; |
1879 | move_slow |= tmp->move_slow; |
1981 | move_block |= tmp->move_block; |
1880 | move_block |= tmp->move_block; |
1982 | move_on |= tmp->move_on; |
1881 | move_on |= tmp->move_on; |
1983 | move_off |= tmp->move_off; |
1882 | move_off |= tmp->move_off; |
1984 | move_allow |= tmp->move_allow; |
1883 | move_allow |= tmp->move_allow; |
1985 | |
1884 | |
1986 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
|
|
1987 | flags |= P_IS_ALIVE; |
|
|
1988 | if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) |
|
|
1989 | flags |= P_NO_MAGIC; |
|
|
1990 | if (QUERY_FLAG (tmp, FLAG_DAMNED)) |
|
|
1991 | flags |= P_NO_CLERIC; |
|
|
1992 | if (tmp->type == SAFE_GROUND) |
|
|
1993 | flags |= P_SAFE; |
|
|
1994 | |
|
|
1995 | if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) |
1885 | if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; |
1996 | flags |= P_BLOCKSVIEW; |
1886 | if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; |
1997 | } /* for stack of objects */ |
1887 | if (tmp->type == PLAYER) flags |= P_PLAYER; |
1998 | |
1888 | if (tmp->type == SAFE_GROUND) flags |= P_SAFE; |
1999 | /* we don't want to rely on this function to have accurate flags, but |
1889 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; |
2000 | * since we're already doing the work, we calculate them here. |
1890 | if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; |
2001 | * if they don't match, logic is broken someplace. |
|
|
2002 | */ |
|
|
2003 | if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR))) |
|
|
2004 | { |
1891 | } |
2005 | LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", |
1892 | |
2006 | m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); |
1893 | this->light = light; |
2007 | } |
1894 | this->flags_ = flags; |
2008 | SET_MAP_FLAGS (m, x, y, flags); |
1895 | this->move_block = move_block & ~move_allow; |
2009 | SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); |
1896 | this->move_on = move_on; |
2010 | SET_MAP_MOVE_ON (m, x, y, move_on); |
1897 | this->move_off = move_off; |
2011 | SET_MAP_MOVE_OFF (m, x, y, move_off); |
1898 | this->move_slow = move_slow; |
2012 | SET_MAP_MOVE_SLOW (m, x, y, move_slow); |
|
|
2013 | |
1899 | |
2014 | /* At this point, we have a floor face (if there is a floor), |
1900 | /* At this point, we have a floor face (if there is a floor), |
2015 | * and the floor is set - we are not going to touch it at |
1901 | * and the floor is set - we are not going to touch it at |
2016 | * this point. |
1902 | * this point. |
2017 | * middle contains the highest visibility face. |
1903 | * middle contains the highest visibility face. |
… | |
… | |
2071 | break; |
1957 | break; |
2072 | } |
1958 | } |
2073 | } |
1959 | } |
2074 | } |
1960 | } |
2075 | } |
1961 | } |
|
|
1962 | |
2076 | if (middle == floor) |
1963 | if (middle == floor) |
2077 | middle = blank_face; |
1964 | middle = blank_face; |
|
|
1965 | |
2078 | if (top == middle) |
1966 | if (top == middle) |
2079 | middle = blank_face; |
1967 | middle = blank_face; |
2080 | SET_MAP_FACE (m, x, y, top, 0); |
|
|
2081 | if (top != blank_face) |
|
|
2082 | SET_MAP_FACE_OBJ (m, x, y, top_obj, 0); |
|
|
2083 | else |
|
|
2084 | SET_MAP_FACE_OBJ (m, x, y, NULL, 0); |
|
|
2085 | SET_MAP_FACE (m, x, y, middle, 1); |
|
|
2086 | if (middle != blank_face) |
|
|
2087 | SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1); |
|
|
2088 | else |
|
|
2089 | SET_MAP_FACE_OBJ (m, x, y, NULL, 1); |
|
|
2090 | SET_MAP_FACE (m, x, y, floor, 2); |
|
|
2091 | if (floor != blank_face) |
|
|
2092 | SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2); |
|
|
2093 | else |
|
|
2094 | SET_MAP_FACE_OBJ (m, x, y, NULL, 2); |
|
|
2095 | SET_MAP_LIGHT (m, x, y, light); |
|
|
2096 | } |
|
|
2097 | |
1968 | |
|
|
1969 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
|
|
1970 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
|
|
1971 | faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; |
|
|
1972 | } |
2098 | |
1973 | |
2099 | void |
1974 | void |
2100 | set_map_reset_time (maptile *map) |
1975 | set_map_reset_time (maptile *map) |
2101 | { |
1976 | { |
2102 | int timeout; |
1977 | int timeout; |
2103 | |
1978 | |
2104 | timeout = MAP_RESET_TIMEOUT (map); |
1979 | timeout = map->reset_timeout; |
2105 | if (timeout <= 0) |
1980 | if (timeout <= 0) |
2106 | timeout = MAP_DEFAULTRESET; |
1981 | timeout = MAP_DEFAULTRESET; |
2107 | if (timeout >= MAP_MAXRESET) |
1982 | if (timeout >= MAP_MAXRESET) |
2108 | timeout = MAP_MAXRESET; |
1983 | timeout = MAP_MAXRESET; |
2109 | MAP_WHEN_RESET (map) = time (0) + timeout; |
1984 | map->reset_time = time (0) + timeout; |
2110 | } |
1985 | } |
2111 | |
1986 | |
2112 | /* this updates the orig_map->tile_map[tile_num] value after loading |
1987 | /* this updates the orig_map->tile_map[tile_num] value after loading |
2113 | * the map. It also takes care of linking back the freshly loaded |
1988 | * the map. It also takes care of linking back the freshly loaded |
2114 | * maps tile_map values if it tiles back to this one. It returns |
1989 | * maps tile_map values if it tiles back to this one. It returns |
… | |
… | |
2142 | * |
2017 | * |
2143 | */ |
2018 | */ |
2144 | int |
2019 | int |
2145 | out_of_map (maptile *m, int x, int y) |
2020 | out_of_map (maptile *m, int x, int y) |
2146 | { |
2021 | { |
2147 | |
|
|
2148 | /* If we get passed a null map, this is obviously the |
2022 | /* If we get passed a null map, this is obviously the |
2149 | * case. This generally shouldn't happen, but if the |
2023 | * case. This generally shouldn't happen, but if the |
2150 | * map loads fail below, it could happen. |
2024 | * map loads fail below, it could happen. |
2151 | */ |
2025 | */ |
2152 | if (!m) |
2026 | if (!m) |
… | |
… | |
2154 | |
2028 | |
2155 | if (x < 0) |
2029 | if (x < 0) |
2156 | { |
2030 | { |
2157 | if (!m->tile_path[3]) |
2031 | if (!m->tile_path[3]) |
2158 | return 1; |
2032 | return 1; |
|
|
2033 | |
2159 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2034 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2160 | { |
|
|
2161 | load_and_link_tiled_map (m, 3); |
2035 | load_and_link_tiled_map (m, 3); |
2162 | } |
2036 | |
2163 | return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); |
2037 | return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y)); |
2164 | } |
2038 | } |
2165 | if (x >= MAP_WIDTH (m)) |
2039 | |
|
|
2040 | if (x >= m->width) |
2166 | { |
2041 | { |
2167 | if (!m->tile_path[1]) |
2042 | if (!m->tile_path[1]) |
2168 | return 1; |
2043 | return 1; |
|
|
2044 | |
2169 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2045 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2170 | { |
|
|
2171 | load_and_link_tiled_map (m, 1); |
2046 | load_and_link_tiled_map (m, 1); |
2172 | } |
2047 | |
2173 | return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); |
2048 | return (out_of_map (m->tile_map[1], x - m->width, y)); |
2174 | } |
2049 | } |
|
|
2050 | |
2175 | if (y < 0) |
2051 | if (y < 0) |
2176 | { |
2052 | { |
2177 | if (!m->tile_path[0]) |
2053 | if (!m->tile_path[0]) |
2178 | return 1; |
2054 | return 1; |
|
|
2055 | |
2179 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2056 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2180 | { |
|
|
2181 | load_and_link_tiled_map (m, 0); |
2057 | load_and_link_tiled_map (m, 0); |
2182 | } |
2058 | |
2183 | return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); |
2059 | return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height)); |
2184 | } |
2060 | } |
2185 | if (y >= MAP_HEIGHT (m)) |
2061 | |
|
|
2062 | if (y >= m->height) |
2186 | { |
2063 | { |
2187 | if (!m->tile_path[2]) |
2064 | if (!m->tile_path[2]) |
2188 | return 1; |
2065 | return 1; |
|
|
2066 | |
2189 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2067 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2190 | { |
|
|
2191 | load_and_link_tiled_map (m, 2); |
2068 | load_and_link_tiled_map (m, 2); |
2192 | } |
2069 | |
2193 | return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); |
2070 | return (out_of_map (m->tile_map[2], x, y - m->height)); |
2194 | } |
2071 | } |
2195 | |
2072 | |
2196 | /* Simple case - coordinates are within this local |
2073 | /* Simple case - coordinates are within this local |
2197 | * map. |
2074 | * map. |
2198 | */ |
2075 | */ |
… | |
… | |
2212 | { |
2089 | { |
2213 | |
2090 | |
2214 | if (*x < 0) |
2091 | if (*x < 0) |
2215 | { |
2092 | { |
2216 | if (!m->tile_path[3]) |
2093 | if (!m->tile_path[3]) |
2217 | return NULL; |
2094 | return 0; |
2218 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2095 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2219 | load_and_link_tiled_map (m, 3); |
2096 | load_and_link_tiled_map (m, 3); |
2220 | |
2097 | |
2221 | *x += MAP_WIDTH (m->tile_map[3]); |
2098 | *x += m->tile_map[3]->width; |
2222 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2099 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2223 | } |
2100 | } |
2224 | if (*x >= MAP_WIDTH (m)) |
2101 | |
|
|
2102 | if (*x >= m->width) |
2225 | { |
2103 | { |
2226 | if (!m->tile_path[1]) |
2104 | if (!m->tile_path[1]) |
2227 | return NULL; |
2105 | return 0; |
|
|
2106 | |
2228 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2107 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2229 | load_and_link_tiled_map (m, 1); |
2108 | load_and_link_tiled_map (m, 1); |
2230 | |
2109 | |
2231 | *x -= MAP_WIDTH (m); |
2110 | *x -= m->width; |
2232 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2111 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2233 | } |
2112 | } |
|
|
2113 | |
2234 | if (*y < 0) |
2114 | if (*y < 0) |
2235 | { |
2115 | { |
2236 | if (!m->tile_path[0]) |
2116 | if (!m->tile_path[0]) |
2237 | return NULL; |
2117 | return 0; |
|
|
2118 | |
2238 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2119 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2239 | load_and_link_tiled_map (m, 0); |
2120 | load_and_link_tiled_map (m, 0); |
2240 | |
2121 | |
2241 | *y += MAP_HEIGHT (m->tile_map[0]); |
2122 | *y += m->tile_map[0]->height; |
2242 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2123 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2243 | } |
2124 | } |
2244 | if (*y >= MAP_HEIGHT (m)) |
2125 | |
|
|
2126 | if (*y >= m->height) |
2245 | { |
2127 | { |
2246 | if (!m->tile_path[2]) |
2128 | if (!m->tile_path[2]) |
2247 | return NULL; |
2129 | return 0; |
|
|
2130 | |
2248 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2131 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2249 | load_and_link_tiled_map (m, 2); |
2132 | load_and_link_tiled_map (m, 2); |
2250 | |
2133 | |
2251 | *y -= MAP_HEIGHT (m); |
2134 | *y -= m->height; |
2252 | return (get_map_from_coord (m->tile_map[2], x, y)); |
2135 | return (get_map_from_coord (m->tile_map[2], x, y)); |
2253 | } |
2136 | } |
2254 | |
2137 | |
2255 | /* Simple case - coordinates are within this local |
2138 | /* Simple case - coordinates are within this local |
2256 | * map. |
2139 | * map. |
… | |
… | |
2276 | |
2159 | |
2277 | } |
2160 | } |
2278 | else if (map1->tile_map[0] == map2) |
2161 | else if (map1->tile_map[0] == map2) |
2279 | { /* up */ |
2162 | { /* up */ |
2280 | *dx = 0; |
2163 | *dx = 0; |
2281 | *dy = -MAP_HEIGHT (map2); |
2164 | *dy = -map2->height; |
2282 | } |
2165 | } |
2283 | else if (map1->tile_map[1] == map2) |
2166 | else if (map1->tile_map[1] == map2) |
2284 | { /* right */ |
2167 | { /* right */ |
2285 | *dx = MAP_WIDTH (map1); |
2168 | *dx = map1->width; |
2286 | *dy = 0; |
2169 | *dy = 0; |
2287 | } |
2170 | } |
2288 | else if (map1->tile_map[2] == map2) |
2171 | else if (map1->tile_map[2] == map2) |
2289 | { /* down */ |
2172 | { /* down */ |
2290 | *dx = 0; |
2173 | *dx = 0; |
2291 | *dy = MAP_HEIGHT (map1); |
2174 | *dy = map1->height; |
2292 | } |
2175 | } |
2293 | else if (map1->tile_map[3] == map2) |
2176 | else if (map1->tile_map[3] == map2) |
2294 | { /* left */ |
2177 | { /* left */ |
2295 | *dx = -MAP_WIDTH (map2); |
2178 | *dx = -map2->width; |
2296 | *dy = 0; |
2179 | *dy = 0; |
2297 | |
2180 | |
2298 | } |
2181 | } |
2299 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) |
2182 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) |
2300 | { /* up right */ |
2183 | { /* up right */ |
2301 | *dx = MAP_WIDTH (map1->tile_map[0]); |
2184 | *dx = map1->tile_map[0]->width; |
2302 | *dy = -MAP_HEIGHT (map1->tile_map[0]); |
2185 | *dy = -map1->tile_map[0]->height; |
2303 | } |
2186 | } |
2304 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) |
2187 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) |
2305 | { /* up left */ |
2188 | { /* up left */ |
2306 | *dx = -MAP_WIDTH (map2); |
2189 | *dx = -map2->width; |
2307 | *dy = -MAP_HEIGHT (map1->tile_map[0]); |
2190 | *dy = -map1->tile_map[0]->height; |
2308 | } |
2191 | } |
2309 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) |
2192 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) |
2310 | { /* right up */ |
2193 | { /* right up */ |
2311 | *dx = MAP_WIDTH (map1); |
2194 | *dx = map1->width; |
2312 | *dy = -MAP_HEIGHT (map2); |
2195 | *dy = -map2->height; |
2313 | } |
2196 | } |
2314 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) |
2197 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) |
2315 | { /* right down */ |
2198 | { /* right down */ |
2316 | *dx = MAP_WIDTH (map1); |
2199 | *dx = map1->width; |
2317 | *dy = MAP_HEIGHT (map1->tile_map[1]); |
2200 | *dy = map1->tile_map[1]->height; |
2318 | } |
2201 | } |
2319 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) |
2202 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) |
2320 | { /* down right */ |
2203 | { /* down right */ |
2321 | *dx = MAP_WIDTH (map1->tile_map[2]); |
2204 | *dx = map1->tile_map[2]->width; |
2322 | *dy = MAP_HEIGHT (map1); |
2205 | *dy = map1->height; |
2323 | } |
2206 | } |
2324 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) |
2207 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) |
2325 | { /* down left */ |
2208 | { /* down left */ |
2326 | *dx = -MAP_WIDTH (map2); |
2209 | *dx = -map2->width; |
2327 | *dy = MAP_HEIGHT (map1); |
2210 | *dy = map1->height; |
2328 | } |
2211 | } |
2329 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) |
2212 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) |
2330 | { /* left up */ |
2213 | { /* left up */ |
2331 | *dx = -MAP_WIDTH (map1->tile_map[3]); |
2214 | *dx = -map1->tile_map[3]->width; |
2332 | *dy = -MAP_HEIGHT (map2); |
2215 | *dy = -map2->height; |
2333 | } |
2216 | } |
2334 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) |
2217 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) |
2335 | { /* left down */ |
2218 | { /* left down */ |
2336 | *dx = -MAP_WIDTH (map1->tile_map[3]); |
2219 | *dx = -map1->tile_map[3]->width; |
2337 | *dy = MAP_HEIGHT (map1->tile_map[3]); |
2220 | *dy = map1->tile_map[3]->height; |
2338 | |
2221 | |
2339 | } |
2222 | } |
2340 | else |
2223 | else |
2341 | { /* not "adjacent" enough */ |
2224 | { /* not "adjacent" enough */ |
2342 | return 0; |
2225 | return 0; |