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.45 by root, Wed Dec 20 09:14:21 2006 UTC vs.
Revision 1.53 by root, Wed Dec 27 09:28:01 2006 UTC

… …
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
38maptile * 37maptile *
39has_been_loaded (const char *name) 38has_been_loaded (const char *name)
40{ 39{
41 maptile *map;
42
43 if (!name || !*name) 40 if (!name || !*name)
44 return 0; 41 return 0;
45 for (map = first_map; map; map = map->next) 42
43 for_all_maps (map)
46 if (!strcmp (name, map->path)) 44 if (!strcmp (name, map->path))
47 break;
48 return (map); 45 return map;
46
47 return 0;
49} 48}
50 49
51/* 50/*
52 * This makes a path absolute outside the world of Crossfire. 51 * This makes a path absolute outside the world of Crossfire.
53 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 52 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
… …
196 195
197void 196void
198dump_map (const maptile *m) 197dump_map (const maptile *m)
199{ 198{
200 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);
201 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);
202 201
203 if (m->msg != NULL) 202 if (m->msg != NULL)
204 LOG (llevError, "Message:\n%s", m->msg); 203 LOG (llevError, "Message:\n%s", m->msg);
205 204
206 if (m->maplore != NULL) 205 if (m->maplore != NULL)
… …
220 */ 219 */
221 220
222void 221void
223dump_all_maps (void) 222dump_all_maps (void)
224{ 223{
225 maptile *m; 224 for_all_maps (m)
226
227 for (m = first_map; m != NULL; m = m->next)
228 {
229 dump_map (m); 225 dump_map (m);
230 }
231} 226}
232 227
233/* This rolls up wall, blocks_magic, blocks_view, etc, all into 228/* This rolls up wall, blocks_magic, blocks_view, etc, all into
234 * one function that just returns a P_.. value (see map.h) 229 * one function that just returns a P_.. value (see map.h)
235 * it will also do map translation for tiled maps, returning 230 * it will also do map translation for tiled maps, returning
… …
239 * 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
240 * checking for the existence of something on those spaces, but 235 * checking for the existence of something on those spaces, but
241 * don't expect to insert/remove anything from those spaces. 236 * don't expect to insert/remove anything from those spaces.
242 */ 237 */
243int 238int
244get_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)
245{ 240{
246 sint16 newx, newy; 241 sint16 newx, newy;
247 int retval = 0; 242 int retval = 0;
248 maptile *mp; 243 maptile *mp;
249 244
250 if (out_of_map (oldmap, x, y))
251 return P_OUT_OF_MAP;
252 newx = x; 245 newx = x;
253 newy = y; 246 newy = y;
247
254 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
255 if (mp != oldmap) 253 if (mp != oldmap)
256 retval |= P_NEW_MAP; 254 retval |= P_NEW_MAP;
257 if (newmap)
258 *newmap = mp;
259 if (nx)
260 *nx = newx;
261 if (ny)
262 *ny = newy;
263 255
264 retval |= mp->spaces[newx + mp->width * newy].flags; 256 if (newmap) *newmap = mp;
257 if (nx) *nx = newx;
258 if (ny) *ny = newy;
265 259
266 return retval; 260 return retval | mp->at (newx, newy).flags ();
267} 261}
268 262
269/* 263/*
270 * Returns true if the given coordinate is blocked except by the 264 * Returns true if the given coordinate is blocked except by the
271 * object passed is not blocking. This is used with 265 * object passed is not blocking. This is used with
… …
294 } 288 }
295 289
296 /* 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
297 * directly. 291 * directly.
298 */ 292 */
299 mflags = m->spaces[sx + m->width * sy].flags; 293 mflags = m->at (sx, sy).flags ();
300 294
301 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 295 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
302 296
303 /* If space is currently not blocked by anything, no need to 297 /* If space is currently not blocked by anything, no need to
304 * go further. Not true for players - all sorts of special 298 * go further. Not true for players - all sorts of special
… …
412 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 406 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
413 if (flag & P_OUT_OF_MAP) 407 if (flag & P_OUT_OF_MAP)
414 return P_OUT_OF_MAP; 408 return P_OUT_OF_MAP;
415 409
416 /* 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 */
417 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 411 return m1->at (sx, sy).move_block;
418 } 412 }
419 413
420 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 414 for (tmp = ob->arch; tmp; tmp = tmp->more)
421 { 415 {
422 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);
423 417
424 if (flag & P_OUT_OF_MAP) 418 if (flag & P_OUT_OF_MAP)
425 return P_OUT_OF_MAP; 419 return P_OUT_OF_MAP;
426 if (flag & P_IS_ALIVE) 420 if (flag & P_IS_ALIVE)
427 return P_IS_ALIVE; 421 return P_IS_ALIVE;
428 422
423 mapspace &ms = m1->at (sx, sy);
424
425
429 /* find_first_free_spot() calls this function. However, often 426 /* find_first_free_spot() calls this function. However, often
430 * 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)
431 * 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.
432 */ 429 */
433 430
434 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)
435 continue; 432 continue;
436 433
437 /* 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
438 * head of the object should correspond for the entire object. 435 * head of the object should correspond for the entire object.
439 */ 436 */
440 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 437 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
441 return P_NO_PASS; 438 return P_NO_PASS;
442 } 439 }
443 440
444 return 0; 441 return 0;
445} 442}
… …
475 * 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
476 * 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
477 * 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
478 * the more sections and not re-add sections for them. 475 * the more sections and not re-add sections for them.
479 */ 476 */
480
481static void 477static void
482link_multipart_objects (maptile *m) 478link_multipart_objects (maptile *m)
483{ 479{
484 int x, y; 480 int x, y;
485 object *tmp, *op, *last, *above; 481 object *tmp, *op, *last, *above;
486 archetype *at; 482 archetype *at;
487 483
488 for (x = 0; x < MAP_WIDTH (m); x++) 484 for (x = 0; x < m->width; x++)
489 for (y = 0; y < MAP_HEIGHT (m); y++) 485 for (y = 0; y < m->height; y++)
490 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)
491 { 487 {
492 above = tmp->above; 488 above = tmp->above;
493 489
494 /* already multipart - don't do anything more */ 490 /* already multipart - don't do anything more */
… …
545 { 541 {
546 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)");
547 continue; 543 continue;
548 } 544 }
549 545
550
551 switch (i) 546 switch (i)
552 { 547 {
553 case LL_NORMAL: 548 case LL_NORMAL:
554 /* 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 */
555 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)
… …
601 * 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,
602 * 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
603 * in order to do map tiling properly. 598 * in order to do map tiling properly.
604 */ 599 */
605void 600void
606save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) 601save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
607{ 602{
608 int i, j = 0, unique = 0; 603 int i, j = 0, unique = 0;
609 object *op; 604 object *op;
610 605
611 /* first pass - save one-part objects */ 606 /* first pass - save one-part objects */
612 for (i = 0; i < MAP_WIDTH (m); i++) 607 for (i = 0; i < m->width; i++)
613 for (j = 0; j < MAP_HEIGHT (m); j++) 608 for (j = 0; j < m->height; j++)
614 { 609 {
615 unique = 0; 610 unique = 0;
611
616 for (op = GET_MAP_OB (m, i, j); op; op = op->above) 612 for (op = m->at (i, j).bot; op; op = op->above)
617 { 613 {
618 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 614 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
619 unique = 1; 615 unique = 1;
620 616
621 if (op->type == PLAYER) 617 if (op->type == PLAYER)
622 continue; 618 continue;
623 619
624 if (op->head || op->owner) 620 if (op->head || op->owner)
625 continue; 621 continue;
626 622
627 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 623 if (unique || op->flag [FLAG_UNIQUE])
628 save_object (fp2, op, 3); 624 save_object (fp2, op, 1);
629 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])))
630 save_object (fp, op, 3); 626 save_object (fp, op, 1);
631 } 627 }
632 } 628 }
633} 629}
634 630
635maptile::maptile () 631maptile::maptile ()
636{ 632{
637 in_memory = MAP_SWAPPED; 633 in_memory = MAP_SWAPPED;
638 /* 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
639 * map archetype. Mimic that behaviour. 635 * map archetype. Mimic that behaviour.
640 */ 636 */
641 MAP_WIDTH (this) = 16; 637 width = 16;
642 MAP_HEIGHT (this) = 16; 638 height = 16;
643 MAP_RESET_TIMEOUT (this) = 0; 639 reset_timeout = 0;
644 MAP_TIMEOUT (this) = 300; 640 timeout = 300;
645 MAP_ENTER_X (this) = 0; 641 enter_x = 0;
646 MAP_ENTER_Y (this) = 0; 642 enter_y = 0;
647 /*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 */
648 MAP_WORLDPARTX (this) = -1; 644 worldpartx = -1;
649 MAP_WORLDPARTY (this) = -1; 645 worldparty = -1;
650} 646}
651 647
652/* 648/*
653 * Allocates, initialises, and returns a pointer to a maptile. 649 * Allocates, initialises, and returns a pointer to a maptile.
654 * 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
655 * used anyways. MSW 2001-07-01 651 * used anyways. MSW 2001-07-01
656 */ 652 */
657maptile * 653maptile *
658get_linked_map (void) 654get_linked_map (void)
659{ 655{
660 maptile *mp, *map = new maptile; 656 maptile *map = new maptile;
661 657
662 for (mp = first_map; mp && mp->next; mp = mp->next); 658 map->next = first_map;
663
664 if (mp == NULL)
665 first_map = map; 659 first_map = map;
666 else
667 mp->next = map;
668 660
669 return map; 661 return map;
670} 662}
671 663
672/* 664/*
… …
684 * that is their poor assumption. 676 * that is their poor assumption.
685 */ 677 */
686 if (spaces) 678 if (spaces)
687 { 679 {
688 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);
689 free (spaces); 681 sfree (spaces, size ());
690 } 682 }
691 683
692 spaces = (mapspace *) 684 spaces = salloc0<mapspace> (size ());
693 calloc (1, width * height * sizeof (mapspace));
694
695 if (!spaces)
696 fatal (OUT_OF_MEMORY);
697} 685}
698 686
699/* Create and returns a map of the specific size. Used 687/* Create and returns a map of the specific size. Used
700 * in random map code and the editor. 688 * in random map code and the editor.
701 */ 689 */
… …
1124 strcpy (m->path, filename); 1112 strcpy (m->path, filename);
1125 if (load_map_header (thawer, m)) 1113 if (load_map_header (thawer, m))
1126 { 1114 {
1127 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);
1128 delete_map (m); 1116 delete_map (m);
1129 return NULL; 1117 return 0;
1130 } 1118 }
1131 1119
1132 m->allocate (); 1120 m->allocate ();
1133 1121
1134 m->in_memory = MAP_LOADING; 1122 m->in_memory = MAP_LOADING;
1135 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1123 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1136 1124
1137 m->in_memory = MAP_IN_MEMORY; 1125 m->in_memory = MAP_IN_MEMORY;
1138 if (!MAP_DIFFICULTY (m)) 1126 if (!m->difficulty)
1139 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1127 m->difficulty = calculate_difficulty (m);
1140 set_map_reset_time (m); 1128 set_map_reset_time (m);
1141 m->instantiate (); 1129 m->instantiate ();
1142 return (m); 1130 return (m);
1143} 1131}
1144 1132
… …
1217 if (load_map_header (thawer, m)) 1205 if (load_map_header (thawer, m))
1218 { 1206 {
1219 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);
1220 delete_map (m); 1208 delete_map (m);
1221 m = load_original_map (m->path, 0); 1209 m = load_original_map (m->path, 0);
1222 return NULL; 1210 return 0;
1223 } 1211 }
1224 /*m->allocate ();*/ 1212 /*m->allocate ();*/
1225 1213
1226 m->in_memory = MAP_LOADING; 1214 m->in_memory = MAP_LOADING;
1227 load_objects (m, thawer, MAP_OVERLAY); 1215 load_objects (m, thawer, MAP_OVERLAY);
… …
1239delete_unique_items (maptile *m) 1227delete_unique_items (maptile *m)
1240{ 1228{
1241 int i, j, unique; 1229 int i, j, unique;
1242 object *op, *next; 1230 object *op, *next;
1243 1231
1244 for (i = 0; i < MAP_WIDTH (m); i++) 1232 for (i = 0; i < m->width; i++)
1245 for (j = 0; j < MAP_HEIGHT (m); j++) 1233 for (j = 0; j < m->height; j++)
1246 { 1234 {
1247 unique = 0; 1235 unique = 0;
1248 1236
1249 for (op = GET_MAP_OB (m, i, j); op; op = next) 1237 for (op = GET_MAP_OB (m, i, j); op; op = next)
1250 { 1238 {
… …
1253 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))
1254 unique = 1; 1242 unique = 1;
1255 1243
1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1244 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1257 { 1245 {
1258 clean_object (op); 1246 op->destroy_inv (false);
1259
1260 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1261 remove_button_link (op);
1262
1263 op->destroy (); 1247 op->destroy ();
1264 } 1248 }
1265 } 1249 }
1266 } 1250 }
1267} 1251}
1268 1252
1269
1270/* 1253/*
1271 * 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
1272 * m is the map to load unique items into. 1255 * m is the map to load unique items into.
1273 */ 1256 */
1274static void 1257static void
… …
1293 return; 1276 return;
1294 1277
1295 m->in_memory = MAP_LOADING; 1278 m->in_memory = MAP_LOADING;
1296 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1279 if (m->tmpname == NULL) /* if we have loaded unique items from */
1297 delete_unique_items (m); /* original map before, don't duplicate them */ 1280 delete_unique_items (m); /* original map before, don't duplicate them */
1281
1298 load_objects (m, thawer, 0); 1282 load_objects (m, thawer, 0);
1299 1283
1300 m->in_memory = MAP_IN_MEMORY; 1284 m->in_memory = MAP_IN_MEMORY;
1301} 1285}
1302
1303 1286
1304/* 1287/*
1305 * 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
1306 * file it was (originally) loaded from. Otherwise a temporary 1289 * file it was (originally) loaded from. Otherwise a temporary
1307 * filename will be genarated, and the file will be stored there. 1290 * filename will be genarated, and the file will be stored there.
1308 * The temporary filename will be stored in the maptileure. 1291 * The temporary filename will be stored in the maptileure.
1309 * 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
1310 * (this should have been updated when first loaded) 1293 * (this should have been updated when first loaded)
1311 */ 1294 */
1312
1313int 1295int
1314new_save_map (maptile *m, int flag) 1296new_save_map (maptile *m, int flag)
1315{ 1297{
1316 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1298 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1317 int i; 1299 int i;
… …
1449 freezer.save (filename); 1431 freezer.save (filename);
1450 1432
1451 return 0; 1433 return 0;
1452} 1434}
1453 1435
1454
1455/*
1456 * Remove and free all objects in the inventory of the given object.
1457 * object.c ?
1458 */
1459
1460void
1461clean_object (object *op)
1462{
1463 object *tmp, *next;
1464
1465 for (tmp = op->inv; tmp; tmp = next)
1466 {
1467 next = tmp->below;
1468
1469 clean_object (tmp);
1470 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1471 remove_button_link (tmp);
1472
1473 tmp->destroy ();
1474 }
1475}
1476
1477/* 1436/*
1478 * Remove and free all objects in the given map. 1437 * Remove and free all objects in the given map.
1479 */ 1438 */
1480
1481void 1439void
1482free_all_objects (maptile *m) 1440free_all_objects (maptile *m)
1483{ 1441{
1484 int i, j; 1442 if (!m->spaces)
1485 object *op; 1443 return;
1486 1444
1487 for (i = 0; i < MAP_WIDTH (m); i++) 1445 for (int i = 0; i < m->width; i++)
1488 for (j = 0; j < MAP_HEIGHT (m); j++) 1446 for (int j = 0; j < m->height; j++)
1489 { 1447 {
1490 object *previous_obj = NULL; 1448 mapspace &ms = m->at (i, j);
1491 1449
1492 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1450 while (object *op = ms.bot)
1493 { 1451 {
1494 if (op == previous_obj)
1495 {
1496 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1497 break;
1498 }
1499
1500 previous_obj = op;
1501
1502 if (op->head != NULL) 1452 if (op->head)
1503 op = op->head; 1453 op = op->head;
1504 1454
1505 /* If the map isn't in memory, free_object will remove and 1455 op->destroy_inv (false);
1506 * free objects in op's inventory. So let it do the job.
1507 */
1508 if (m->in_memory == MAP_IN_MEMORY)
1509 clean_object (op);
1510
1511 op->destroy (); 1456 op->destroy ();
1512 } 1457 }
1513 } 1458 }
1514} 1459}
1515 1460
1516/* 1461/*
1517 * Frees everything allocated by the given maptileure. 1462 * Frees everything allocated by the given maptileure.
1518 * don't free tmpname - our caller is left to do that 1463 * don't free tmpname - our caller is left to do that
1519 */ 1464 */
1520
1521void 1465void
1522free_map (maptile *m, int flag) 1466free_map (maptile *m, int flag)
1523{ 1467{
1524 int i; 1468 if (!m->in_memory) //TODO: makes no sense to me?
1525
1526 if (!m->in_memory)
1527 {
1528 LOG (llevError, "Trying to free freed map.\n");
1529 return; 1469 return;
1530 } 1470
1471 m->in_memory = MAP_SAVING;
1531 1472
1532 // TODO: use new/delete 1473 // TODO: use new/delete
1533#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1534 1474
1535 if (flag && m->spaces) 1475 if (flag && m->spaces)
1536 free_all_objects (m); 1476 free_all_objects (m);
1537 if (m->name)
1538 FREE_AND_CLEAR (m->name);
1539 if (m->spaces)
1540 FREE_AND_CLEAR (m->spaces);
1541 if (m->msg)
1542 FREE_AND_CLEAR (m->msg);
1543 if (m->maplore)
1544 FREE_AND_CLEAR (m->maplore);
1545 1477
1546 delete [] m->shopitems; 1478 sfree (m->spaces, m->size ()), m->spaces = 0;
1547 m->shopitems = 0;
1548 1479
1549 if (m->shoprace) 1480 free (m->name), m->name = 0;
1550 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;
1551 1485
1552 if (m->buttons) 1486 if (m->buttons)
1553 free_objectlinkpt (m->buttons); 1487 free_objectlinkpt (m->buttons), m->buttons = 0;
1554 1488
1555 m->buttons = NULL;
1556
1557 for (i = 0; i < 4; i++) 1489 for (int i = 0; i < 4; i++)
1558 { 1490 free (m->tile_path[i]), m->tile_path[i] = 0;
1559 if (m->tile_path[i])
1560 FREE_AND_CLEAR (m->tile_path[i]);
1561 m->tile_map[i] = NULL;
1562 }
1563 1491
1564 m->in_memory = MAP_SWAPPED; 1492 m->in_memory = MAP_SWAPPED;
1565
1566#undef FREE_AND_CLEAR
1567
1568} 1493}
1569 1494
1570/* 1495maptile::~maptile ()
1571 * function: vanish maptile 1496{
1572 * m : pointer to maptile, if NULL no action 1497 assert (destroyed ());
1573 * this deletes all the data on the map (freeing pointers) 1498}
1574 * 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.
1575 */ 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;
1576 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
1577void 1531void
1578delete_map (maptile *m) 1532delete_map (maptile *m)
1579{ 1533{
1580 maptile *tmp, *last;
1581 int i;
1582
1583 if (!m) 1534 if (m)
1584 return; 1535 m->destroy ();
1585
1586 m->clear ();
1587
1588 if (m->in_memory == MAP_IN_MEMORY)
1589 {
1590 /* change to MAP_SAVING, even though we are not,
1591 * so that remove_ob doesn't do as much work.
1592 */
1593 m->in_memory = MAP_SAVING;
1594 free_map (m, 1);
1595 }
1596 /* move this out of free_map, since tmpname can still be needed if
1597 * the map is swapped out.
1598 */
1599 if (m->tmpname)
1600 {
1601 free (m->tmpname);
1602 m->tmpname = NULL;
1603 }
1604 last = NULL;
1605 /* We need to look through all the maps and see if any maps
1606 * are pointing at this one for tiling information. Since
1607 * tiling can be assymetric, we just can not look to see which
1608 * maps this map tiles with and clears those.
1609 */
1610 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1611 {
1612 if (tmp->next == m)
1613 last = tmp;
1614
1615 /* This should hopefully get unrolled on a decent compiler */
1616 for (i = 0; i < 4; i++)
1617 if (tmp->tile_map[i] == m)
1618 tmp->tile_map[i] = NULL;
1619 }
1620
1621 /* If last is null, then this should be the first map in the list */
1622 if (!last)
1623 {
1624 if (m == first_map)
1625 first_map = m->next;
1626 else
1627 /* m->path is a static char, so should hopefully still have
1628 * some useful data in it.
1629 */
1630 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1631 }
1632 else
1633 last->next = m->next;
1634
1635 delete m;
1636} 1536}
1637 1537
1638/* 1538/*
1639 * Makes sure the given map is loaded and swapped in. 1539 * Makes sure the given map is loaded and swapped in.
1640 * name is path name of the map. 1540 * name is path name of the map.
… …
1647 * Returns a pointer to the given map. 1547 * Returns a pointer to the given map.
1648 */ 1548 */
1649maptile * 1549maptile *
1650ready_map_name (const char *name, int flags) 1550ready_map_name (const char *name, int flags)
1651{ 1551{
1652 maptile *m;
1653
1654 if (!name) 1552 if (!name)
1655 return (NULL); 1553 return 0;
1656 1554
1657 /* Have we been at this level before? */ 1555 /* Have we been at this level before? */
1658 m = has_been_loaded (name); 1556 maptile *m = has_been_loaded (name);
1659 1557
1660 /* Map is good to go, so just return it */ 1558 /* Map is good to go, so just return it */
1661 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))
1662 {
1663 return m; 1560 return m;
1664 }
1665 1561
1666 /* unique maps always get loaded from their original location, and never 1562 /* unique maps always get loaded from their original location, and never
1667 * 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
1668 * 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 -
1669 * 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
… …
1671 * 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
1672 * 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.
1673 */ 1569 */
1674 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1570 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1675 { 1571 {
1676
1677 /* first visit or time to reset */ 1572 /* first visit or time to reset */
1678 if (m) 1573 if (m)
1679 { 1574 {
1680 clean_tmp_map (m); /* Doesn't make much difference */ 1575 clean_tmp_map (m); /* Doesn't make much difference */
1681 delete_map (m); 1576 delete_map (m);
… …
1768 int x, y, i; 1663 int x, y, i;
1769 long monster_cnt = 0; 1664 long monster_cnt = 0;
1770 double avgexp = 0; 1665 double avgexp = 0;
1771 sint64 total_exp = 0; 1666 sint64 total_exp = 0;
1772 1667
1773 if (MAP_DIFFICULTY (m)) 1668 if (m->difficulty)
1774 { 1669 {
1775 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1670 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1776 return MAP_DIFFICULTY (m); 1671 return m->difficulty;
1777 } 1672 }
1778 1673
1779 for (x = 0; x < MAP_WIDTH (m); x++) 1674 for (x = 0; x < m->width; x++)
1780 for (y = 0; y < MAP_HEIGHT (m); y++) 1675 for (y = 0; y < m->height; y++)
1781 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)
1782 { 1677 {
1783 if (QUERY_FLAG (op, FLAG_MONSTER)) 1678 if (QUERY_FLAG (op, FLAG_MONSTER))
1784 { 1679 {
1785 total_exp += op->stats.exp; 1680 total_exp += op->stats.exp;
… …
1834 if (first_map->in_memory == MAP_SAVING) 1729 if (first_map->in_memory == MAP_SAVING)
1835 first_map->in_memory = MAP_IN_MEMORY; 1730 first_map->in_memory = MAP_IN_MEMORY;
1836 delete_map (first_map); 1731 delete_map (first_map);
1837 real_maps++; 1732 real_maps++;
1838 } 1733 }
1734
1839 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); 1735 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1840} 1736}
1841 1737
1842/* change_map_light() - used to change map light level (darkness) 1738/* change_map_light() - used to change map light level (darkness)
1843 * up or down. Returns true if successful. It should now be 1739 * up or down. Returns true if successful. It should now be
… …
1886 * on the map (what it looks like, whether it blocks magic, 1782 * on the map (what it looks like, whether it blocks magic,
1887 * has a living creatures, prevents people from passing 1783 * has a living creatures, prevents people from passing
1888 * through, etc) 1784 * through, etc)
1889 */ 1785 */
1890void 1786void
1891update_position (maptile *m, int x, int y) 1787mapspace::update_ ()
1892{ 1788{
1893 object *tmp, *last = 0; 1789 object *tmp, *last = 0;
1894 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1790 uint8 flags = 0, light = 0, anywhere = 0;
1895 New_Face *top, *floor, *middle; 1791 New_Face *top, *floor, *middle;
1896 object *top_obj, *floor_obj, *middle_obj; 1792 object *top_obj, *floor_obj, *middle_obj;
1897 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;
1898 1794
1899 oldflags = GET_MAP_FLAGS (m, x, y);
1900 if (!(oldflags & P_NEED_UPDATE))
1901 {
1902 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1903 return;
1904 }
1905
1906 middle = blank_face; 1795 middle = blank_face;
1907 top = blank_face; 1796 top = blank_face;
1908 floor = blank_face; 1797 floor = blank_face;
1909 1798
1910 middle_obj = 0; 1799 middle_obj = 0;
1911 top_obj = 0; 1800 top_obj = 0;
1912 floor_obj = 0; 1801 floor_obj = 0;
1913 1802
1914 for (tmp = GET_MAP_OB (m, x, y); tmp; last = tmp, tmp = tmp->above) 1803 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1915 { 1804 {
1916 /* This could be made additive I guess (two lights better than 1805 /* This could be made additive I guess (two lights better than
1917 * 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
1918 * light bulbs do not illuminate twice as far as once since 1807 * light bulbs do not illuminate twice as far as once since
1919 * it is a dissapation factor that is cubed. 1808 * it is a dissapation factor that is cubed.
… …
1983 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1872 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1984 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1873 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1985 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1874 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1986 } 1875 }
1987 1876
1988 /* we don't want to rely on this function to have accurate flags, but 1877 this->light = light;
1989 * since we're already doing the work, we calculate them here.
1990 * if they don't match, logic is broken someplace.
1991 */
1992 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
1993 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",
1994 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags);
1995
1996 mapspace &s = m->at (x, y);
1997
1998 s.flags = flags; 1878 this->flags_ = flags;
1999 s.move_block = move_block & ~move_allow; 1879 this->move_block = move_block & ~move_allow;
2000 s.move_on = move_on; 1880 this->move_on = move_on;
2001 s.move_off = move_off; 1881 this->move_off = move_off;
2002 s.move_slow = move_slow; 1882 this->move_slow = move_slow;
2003 1883
2004 /* 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),
2005 * 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
2006 * this point. 1886 * this point.
2007 * middle contains the highest visibility face. 1887 * middle contains the highest visibility face.
… …
2068 middle = blank_face; 1948 middle = blank_face;
2069 1949
2070 if (top == middle) 1950 if (top == middle)
2071 middle = blank_face; 1951 middle = blank_face;
2072 1952
2073 SET_MAP_FACE (m, x, y, top, 0); 1953 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
2074 if (top != blank_face) 1954 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
2075 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0); 1955 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
2076 else
2077 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2078
2079 SET_MAP_FACE (m, x, y, middle, 1);
2080 if (middle != blank_face)
2081 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2082 else
2083 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2084
2085 SET_MAP_FACE (m, x, y, floor, 2);
2086 if (floor != blank_face)
2087 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2088 else
2089 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2090
2091 SET_MAP_LIGHT (m, x, y, light);
2092} 1956}
2093
2094 1957
2095void 1958void
2096set_map_reset_time (maptile *map) 1959set_map_reset_time (maptile *map)
2097{ 1960{
2098 int timeout; 1961 int timeout;
2099 1962
2100 timeout = MAP_RESET_TIMEOUT (map); 1963 timeout = map->reset_timeout;
2101 if (timeout <= 0) 1964 if (timeout <= 0)
2102 timeout = MAP_DEFAULTRESET; 1965 timeout = MAP_DEFAULTRESET;
2103 if (timeout >= MAP_MAXRESET) 1966 if (timeout >= MAP_MAXRESET)
2104 timeout = MAP_MAXRESET; 1967 timeout = MAP_MAXRESET;
2105 MAP_WHEN_RESET (map) = time (0) + timeout; 1968 map->reset_time = time (0) + timeout;
2106} 1969}
2107 1970
2108/* 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
2109 * 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
2110 * 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
… …
2138 * 2001 *
2139 */ 2002 */
2140int 2003int
2141out_of_map (maptile *m, int x, int y) 2004out_of_map (maptile *m, int x, int y)
2142{ 2005{
2143
2144 /* If we get passed a null map, this is obviously the 2006 /* If we get passed a null map, this is obviously the
2145 * case. This generally shouldn't happen, but if the 2007 * case. This generally shouldn't happen, but if the
2146 * map loads fail below, it could happen. 2008 * map loads fail below, it could happen.
2147 */ 2009 */
2148 if (!m) 2010 if (!m)
… …
2150 2012
2151 if (x < 0) 2013 if (x < 0)
2152 { 2014 {
2153 if (!m->tile_path[3]) 2015 if (!m->tile_path[3])
2154 return 1; 2016 return 1;
2017
2155 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)
2156 {
2157 load_and_link_tiled_map (m, 3); 2019 load_and_link_tiled_map (m, 3);
2158 } 2020
2159 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));
2160 } 2022 }
2161 if (x >= MAP_WIDTH (m)) 2023
2024 if (x >= m->width)
2162 { 2025 {
2163 if (!m->tile_path[1]) 2026 if (!m->tile_path[1])
2164 return 1; 2027 return 1;
2028
2165 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)
2166 {
2167 load_and_link_tiled_map (m, 1); 2030 load_and_link_tiled_map (m, 1);
2168 } 2031
2169 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));
2170 } 2033 }
2034
2171 if (y < 0) 2035 if (y < 0)
2172 { 2036 {
2173 if (!m->tile_path[0]) 2037 if (!m->tile_path[0])
2174 return 1; 2038 return 1;
2039
2175 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)
2176 {
2177 load_and_link_tiled_map (m, 0); 2041 load_and_link_tiled_map (m, 0);
2178 } 2042
2179 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));
2180 } 2044 }
2181 if (y >= MAP_HEIGHT (m)) 2045
2046 if (y >= m->height)
2182 { 2047 {
2183 if (!m->tile_path[2]) 2048 if (!m->tile_path[2])
2184 return 1; 2049 return 1;
2050
2185 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)
2186 {
2187 load_and_link_tiled_map (m, 2); 2052 load_and_link_tiled_map (m, 2);
2188 } 2053
2189 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));
2190 } 2055 }
2191 2056
2192 /* Simple case - coordinates are within this local 2057 /* Simple case - coordinates are within this local
2193 * map. 2058 * map.
2194 */ 2059 */
… …
2208{ 2073{
2209 2074
2210 if (*x < 0) 2075 if (*x < 0)
2211 { 2076 {
2212 if (!m->tile_path[3]) 2077 if (!m->tile_path[3])
2213 return NULL; 2078 return 0;
2214 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)
2215 load_and_link_tiled_map (m, 3); 2080 load_and_link_tiled_map (m, 3);
2216 2081
2217 *x += MAP_WIDTH (m->tile_map[3]); 2082 *x += m->tile_map[3]->width;
2218 return (get_map_from_coord (m->tile_map[3], x, y)); 2083 return (get_map_from_coord (m->tile_map[3], x, y));
2219 } 2084 }
2220 if (*x >= MAP_WIDTH (m)) 2085
2086 if (*x >= m->width)
2221 { 2087 {
2222 if (!m->tile_path[1]) 2088 if (!m->tile_path[1])
2223 return NULL; 2089 return 0;
2090
2224 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)
2225 load_and_link_tiled_map (m, 1); 2092 load_and_link_tiled_map (m, 1);
2226 2093
2227 *x -= MAP_WIDTH (m); 2094 *x -= m->width;
2228 return (get_map_from_coord (m->tile_map[1], x, y)); 2095 return (get_map_from_coord (m->tile_map[1], x, y));
2229 } 2096 }
2097
2230 if (*y < 0) 2098 if (*y < 0)
2231 { 2099 {
2232 if (!m->tile_path[0]) 2100 if (!m->tile_path[0])
2233 return NULL; 2101 return 0;
2102
2234 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)
2235 load_and_link_tiled_map (m, 0); 2104 load_and_link_tiled_map (m, 0);
2236 2105
2237 *y += MAP_HEIGHT (m->tile_map[0]); 2106 *y += m->tile_map[0]->height;
2238 return (get_map_from_coord (m->tile_map[0], x, y)); 2107 return (get_map_from_coord (m->tile_map[0], x, y));
2239 } 2108 }
2240 if (*y >= MAP_HEIGHT (m)) 2109
2110 if (*y >= m->height)
2241 { 2111 {
2242 if (!m->tile_path[2]) 2112 if (!m->tile_path[2])
2243 return NULL; 2113 return 0;
2114
2244 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)
2245 load_and_link_tiled_map (m, 2); 2116 load_and_link_tiled_map (m, 2);
2246 2117
2247 *y -= MAP_HEIGHT (m); 2118 *y -= m->height;
2248 return (get_map_from_coord (m->tile_map[2], x, y)); 2119 return (get_map_from_coord (m->tile_map[2], x, y));
2249 } 2120 }
2250 2121
2251 /* Simple case - coordinates are within this local 2122 /* Simple case - coordinates are within this local
2252 * map. 2123 * map.
… …
2272 2143
2273 } 2144 }
2274 else if (map1->tile_map[0] == map2) 2145 else if (map1->tile_map[0] == map2)
2275 { /* up */ 2146 { /* up */
2276 *dx = 0; 2147 *dx = 0;
2277 *dy = -MAP_HEIGHT (map2); 2148 *dy = -map2->height;
2278 } 2149 }
2279 else if (map1->tile_map[1] == map2) 2150 else if (map1->tile_map[1] == map2)
2280 { /* right */ 2151 { /* right */
2281 *dx = MAP_WIDTH (map1); 2152 *dx = map1->width;
2282 *dy = 0; 2153 *dy = 0;
2283 } 2154 }
2284 else if (map1->tile_map[2] == map2) 2155 else if (map1->tile_map[2] == map2)
2285 { /* down */ 2156 { /* down */
2286 *dx = 0; 2157 *dx = 0;
2287 *dy = MAP_HEIGHT (map1); 2158 *dy = map1->height;
2288 } 2159 }
2289 else if (map1->tile_map[3] == map2) 2160 else if (map1->tile_map[3] == map2)
2290 { /* left */ 2161 { /* left */
2291 *dx = -MAP_WIDTH (map2); 2162 *dx = -map2->width;
2292 *dy = 0; 2163 *dy = 0;
2293 2164
2294 } 2165 }
2295 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)
2296 { /* up right */ 2167 { /* up right */
2297 *dx = MAP_WIDTH (map1->tile_map[0]); 2168 *dx = map1->tile_map[0]->width;
2298 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2169 *dy = -map1->tile_map[0]->height;
2299 } 2170 }
2300 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)
2301 { /* up left */ 2172 { /* up left */
2302 *dx = -MAP_WIDTH (map2); 2173 *dx = -map2->width;
2303 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2174 *dy = -map1->tile_map[0]->height;
2304 } 2175 }
2305 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)
2306 { /* right up */ 2177 { /* right up */
2307 *dx = MAP_WIDTH (map1); 2178 *dx = map1->width;
2308 *dy = -MAP_HEIGHT (map2); 2179 *dy = -map2->height;
2309 } 2180 }
2310 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)
2311 { /* right down */ 2182 { /* right down */
2312 *dx = MAP_WIDTH (map1); 2183 *dx = map1->width;
2313 *dy = MAP_HEIGHT (map1->tile_map[1]); 2184 *dy = map1->tile_map[1]->height;
2314 } 2185 }
2315 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)
2316 { /* down right */ 2187 { /* down right */
2317 *dx = MAP_WIDTH (map1->tile_map[2]); 2188 *dx = map1->tile_map[2]->width;
2318 *dy = MAP_HEIGHT (map1); 2189 *dy = map1->height;
2319 } 2190 }
2320 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)
2321 { /* down left */ 2192 { /* down left */
2322 *dx = -MAP_WIDTH (map2); 2193 *dx = -map2->width;
2323 *dy = MAP_HEIGHT (map1); 2194 *dy = map1->height;
2324 } 2195 }
2325 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)
2326 { /* left up */ 2197 { /* left up */
2327 *dx = -MAP_WIDTH (map1->tile_map[3]); 2198 *dx = -map1->tile_map[3]->width;
2328 *dy = -MAP_HEIGHT (map2); 2199 *dy = -map2->height;
2329 } 2200 }
2330 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)
2331 { /* left down */ 2202 { /* left down */
2332 *dx = -MAP_WIDTH (map1->tile_map[3]); 2203 *dx = -map1->tile_map[3]->width;
2333 *dy = MAP_HEIGHT (map1->tile_map[3]); 2204 *dy = map1->tile_map[3]->height;
2334 2205
2335 } 2206 }
2336 else 2207 else
2337 { /* not "adjacent" enough */ 2208 { /* not "adjacent" enough */
2338 return 0; 2209 return 0;
… …
2463{ 2334{
2464 int dx, dy; 2335 int dx, dy;
2465 2336
2466 return adjacent_map (op1->map, op2->map, &dx, &dy); 2337 return adjacent_map (op1->map, op2->map, &dx, &dy);
2467} 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