ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.43 by root, Thu Dec 14 22:45:40 2006 UTC vs.
Revision 1.53 by root, Wed Dec 27 09:28:01 2006 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines