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.48 by root, Mon Dec 25 14:43:22 2006 UTC

… …
27 27
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
33 32
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 */
… …
197 196
198void 197void
199dump_map (const maptile *m) 198dump_map (const maptile *m)
200{ 199{
201 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); 200 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)); 201 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, MAP_ENTER_X (m), MAP_ENTER_Y (m));
203 202
204 if (m->msg != NULL) 203 if (m->msg != NULL)
205 LOG (llevError, "Message:\n%s", m->msg); 204 LOG (llevError, "Message:\n%s", m->msg);
206 205
207 if (m->maplore != NULL) 206 if (m->maplore != NULL)
… …
223void 222void
224dump_all_maps (void) 223dump_all_maps (void)
225{ 224{
226 maptile *m; 225 maptile *m;
227 226
228 for (m = first_map; m != NULL; m = m->next) 227 for (m = first_map; m; m = m->next)
229 {
230 dump_map (m); 228 dump_map (m);
231 }
232} 229}
233 230
234/* This rolls up wall, blocks_magic, blocks_view, etc, all into 231/* This rolls up wall, blocks_magic, blocks_view, etc, all into
235 * one function that just returns a P_.. value (see map.h) 232 * one function that just returns a P_.. value (see map.h)
236 * it will also do map translation for tiled maps, returning 233 * it will also do map translation for tiled maps, returning
… …
240 * is needed. The case of not passing values is if we're just 237 * is needed. The case of not passing values is if we're just
241 * checking for the existence of something on those spaces, but 238 * checking for the existence of something on those spaces, but
242 * don't expect to insert/remove anything from those spaces. 239 * don't expect to insert/remove anything from those spaces.
243 */ 240 */
244int 241int
245get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) 242get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
246{ 243{
247 sint16 newx, newy; 244 sint16 newx, newy;
248 int retval = 0; 245 int retval = 0;
249 maptile *mp; 246 maptile *mp;
250 247
251 if (out_of_map (oldmap, x, y))
252 return P_OUT_OF_MAP;
253 newx = x; 248 newx = x;
254 newy = y; 249 newy = y;
250
255 mp = get_map_from_coord (oldmap, &newx, &newy); 251 mp = get_map_from_coord (oldmap, &newx, &newy);
252
253 if (!mp)
254 return P_OUT_OF_MAP;
255
256 if (mp != oldmap) 256 if (mp != oldmap)
257 retval |= P_NEW_MAP; 257 retval |= P_NEW_MAP;
258 if (newmap)
259 *newmap = mp;
260 if (nx)
261 *nx = newx;
262 if (ny)
263 *ny = newy;
264 258
265 retval |= mp->spaces[newx + mp->width * newy].flags; 259 if (newmap) *newmap = mp;
260 if (nx) *nx = newx;
261 if (ny) *ny = newy;
266 262
267 return retval; 263 return retval | mp->at (newx, newy).flags ();
268} 264}
269 265
270/* 266/*
271 * Returns true if the given coordinate is blocked except by the 267 * Returns true if the given coordinate is blocked except by the
272 * object passed is not blocking. This is used with 268 * object passed is not blocking. This is used with
… …
295 } 291 }
296 292
297 /* Save some cycles - instead of calling get_map_flags(), just get the value 293 /* Save some cycles - instead of calling get_map_flags(), just get the value
298 * directly. 294 * directly.
299 */ 295 */
300 mflags = m->spaces[sx + m->width * sy].flags; 296 mflags = m->at (sx, sy).flags ();
301 297
302 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 298 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
303 299
304 /* If space is currently not blocked by anything, no need to 300 /* If space is currently not blocked by anything, no need to
305 * go further. Not true for players - all sorts of special 301 * go further. Not true for players - all sorts of special
… …
324 /* We basically go through the stack of objects, and if there is 320 /* 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 321 * some other object that has NO_PASS or FLAG_ALIVE set, return
326 * true. If we get through the entire stack, that must mean 322 * true. If we get through the entire stack, that must mean
327 * ob is blocking it, so return 0. 323 * ob is blocking it, so return 0.
328 */ 324 */
329 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) 325 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
330 { 326 {
331 327
332 /* This must be before the checks below. Code for inventory checkers. */ 328 /* This must be before the checks below. Code for inventory checkers. */
333 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 329 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
334 { 330 {
… …
398 * 394 *
399 * Note this used to be arch_blocked, but with new movement 395 * Note this used to be arch_blocked, but with new movement
400 * code, we need to have actual object to check its move_type 396 * code, we need to have actual object to check its move_type
401 * against the move_block values. 397 * against the move_block values.
402 */ 398 */
403
404int 399int
405ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 400ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
406{ 401{
407 archetype *tmp; 402 archetype *tmp;
408 int flag; 403 int flag;
… …
414 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 409 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
415 if (flag & P_OUT_OF_MAP) 410 if (flag & P_OUT_OF_MAP)
416 return P_OUT_OF_MAP; 411 return P_OUT_OF_MAP;
417 412
418 /* don't have object, so don't know what types would block */ 413 /* don't have object, so don't know what types would block */
419 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 414 return m1->at (sx, sy).move_block;
420 } 415 }
421 416
422 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 417 for (tmp = ob->arch; tmp; tmp = tmp->more)
423 { 418 {
424 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 419 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
425 420
426 if (flag & P_OUT_OF_MAP) 421 if (flag & P_OUT_OF_MAP)
427 return P_OUT_OF_MAP; 422 return P_OUT_OF_MAP;
428 if (flag & P_IS_ALIVE) 423 if (flag & P_IS_ALIVE)
429 return P_IS_ALIVE; 424 return P_IS_ALIVE;
430 425
426 mapspace &ms = m1->at (sx, sy);
427
428
431 /* find_first_free_spot() calls this function. However, often 429 /* find_first_free_spot() calls this function. However, often
432 * ob doesn't have any move type (when used to place exits) 430 * 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. 431 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
434 */ 432 */
435 433
436 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) 434 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
437 continue; 435 continue;
438 436
439 /* Note it is intentional that we check ob - the movement type of the 437 /* Note it is intentional that we check ob - the movement type of the
440 * head of the object should correspond for the entire object. 438 * head of the object should correspond for the entire object.
441 */ 439 */
442 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 440 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
443 return AB_NO_PASS; 441 return P_NO_PASS;
444
445 } 442 }
443
446 return 0; 444 return 0;
447} 445}
448 446
449/* When the map is loaded, load_object does not actually insert objects 447/* 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 448 * into inventory, but just links them. What this does is go through
… …
485{ 483{
486 int x, y; 484 int x, y;
487 object *tmp, *op, *last, *above; 485 object *tmp, *op, *last, *above;
488 archetype *at; 486 archetype *at;
489 487
490 for (x = 0; x < MAP_WIDTH (m); x++) 488 for (x = 0; x < m->width; x++)
491 for (y = 0; y < MAP_HEIGHT (m); y++) 489 for (y = 0; y < m->height; y++)
492 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 490 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
493 { 491 {
494 above = tmp->above; 492 above = tmp->above;
495 493
496 /* already multipart - don't do anything more */ 494 /* already multipart - don't do anything more */
497 if (tmp->head || tmp->more) 495 if (tmp->head || tmp->more)
… …
547 { 545 {
548 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 546 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
549 continue; 547 continue;
550 } 548 }
551 549
552
553 switch (i) 550 switch (i)
554 { 551 {
555 case LL_NORMAL: 552 case LL_NORMAL:
556 /* if we are loading an overlay, put the floors on the bottom */ 553 /* 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) 554 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
… …
582 { 579 {
583 for (j = 0; j < m->height; j++) 580 for (j = 0; j < m->height; j++)
584 { 581 {
585 unique = 0; 582 unique = 0;
586 /* check for unique items, or unique squares */ 583 /* check for unique items, or unique squares */
587 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 584 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
588 { 585 {
589 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 586 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
590 unique = 1; 587 unique = 1;
591 588
592 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 589 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
… …
609{ 606{
610 int i, j = 0, unique = 0; 607 int i, j = 0, unique = 0;
611 object *op; 608 object *op;
612 609
613 /* first pass - save one-part objects */ 610 /* first pass - save one-part objects */
614 for (i = 0; i < MAP_WIDTH (m); i++) 611 for (i = 0; i < m->width; i++)
615 for (j = 0; j < MAP_HEIGHT (m); j++) 612 for (j = 0; j < m->height; j++)
616 { 613 {
617 unique = 0; 614 unique = 0;
618 for (op = get_map_ob (m, i, j); op; op = op->above) 615 for (op = m->at (i, j).bottom; op; op = op->above)
619 { 616 {
620 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 617 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
621 unique = 1; 618 unique = 1;
622 619
623 if (op->type == PLAYER) 620 if (op->type == PLAYER)
624 {
625 LOG (llevDebug, "Player on map that is being saved\n");
626 continue; 621 continue;
627 }
628 622
629 if (op->head || op->owner) 623 if (op->head || op->owner)
630 continue; 624 continue;
631 625
632 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 626 if (unique || op->flag [FLAG_UNIQUE])
633 save_object (fp2, op, 3); 627 save_object (fp2, op, 3);
634 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 628 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
635 save_object (fp, op, 3); 629 save_object (fp, op, 3);
636 630 }
637 } /* for this space */ 631 }
638 } /* for this j */
639} 632}
640 633
641maptile::maptile () 634maptile::maptile ()
642{ 635{
643 in_memory = MAP_SWAPPED; 636 in_memory = MAP_SWAPPED;
644 /* The maps used to pick up default x and y values from the 637 /* The maps used to pick up default x and y values from the
645 * map archetype. Mimic that behaviour. 638 * map archetype. Mimic that behaviour.
646 */ 639 */
647 MAP_WIDTH (this) = 16; 640 this->width = 16;
648 MAP_HEIGHT (this) = 16; 641 this->height = 16;
649 MAP_RESET_TIMEOUT (this) = 0; 642 MAP_RESET_TIMEOUT (this) = 0;
650 MAP_TIMEOUT (this) = 300; 643 MAP_TIMEOUT (this) = 300;
651 MAP_ENTER_X (this) = 0; 644 MAP_ENTER_X (this) = 0;
652 MAP_ENTER_Y (this) = 0; 645 MAP_ENTER_Y (this) = 0;
653 /*set part to -1 indicating conversion to weather map not yet done */ 646 /*set part to -1 indicating conversion to weather map not yet done */
… …
693 { 686 {
694 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); 687 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
695 free (spaces); 688 free (spaces);
696 } 689 }
697 690
698 spaces = (MapSpace *) 691 spaces = (mapspace *)
699 calloc (1, width * height * sizeof (MapSpace)); 692 calloc (1, width * height * sizeof (mapspace));
700 693
701 if (!spaces) 694 if (!spaces)
702 fatal (OUT_OF_MEMORY); 695 fatal (OUT_OF_MEMORY);
703} 696}
704 697
… …
1130 strcpy (m->path, filename); 1123 strcpy (m->path, filename);
1131 if (load_map_header (thawer, m)) 1124 if (load_map_header (thawer, m))
1132 { 1125 {
1133 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1126 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1134 delete_map (m); 1127 delete_map (m);
1135 return NULL; 1128 return 0;
1136 } 1129 }
1137 1130
1138 m->allocate (); 1131 m->allocate ();
1139 1132
1140 m->in_memory = MAP_LOADING; 1133 m->in_memory = MAP_LOADING;
… …
1223 if (load_map_header (thawer, m)) 1216 if (load_map_header (thawer, m))
1224 { 1217 {
1225 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1218 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1226 delete_map (m); 1219 delete_map (m);
1227 m = load_original_map (m->path, 0); 1220 m = load_original_map (m->path, 0);
1228 return NULL; 1221 return 0;
1229 } 1222 }
1230 /*m->allocate ();*/ 1223 /*m->allocate ();*/
1231 1224
1232 m->in_memory = MAP_LOADING; 1225 m->in_memory = MAP_LOADING;
1233 load_objects (m, thawer, MAP_OVERLAY); 1226 load_objects (m, thawer, MAP_OVERLAY);
… …
1245delete_unique_items (maptile *m) 1238delete_unique_items (maptile *m)
1246{ 1239{
1247 int i, j, unique; 1240 int i, j, unique;
1248 object *op, *next; 1241 object *op, *next;
1249 1242
1250 for (i = 0; i < MAP_WIDTH (m); i++) 1243 for (i = 0; i < m->width; i++)
1251 for (j = 0; j < MAP_HEIGHT (m); j++) 1244 for (j = 0; j < m->height; j++)
1252 { 1245 {
1253 unique = 0; 1246 unique = 0;
1254 1247
1255 for (op = get_map_ob (m, i, j); op; op = next) 1248 for (op = GET_MAP_OB (m, i, j); op; op = next)
1256 { 1249 {
1257 next = op->above; 1250 next = op->above;
1258 1251
1259 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1252 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1260 unique = 1; 1253 unique = 1;
1261 1254
1262 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1255 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1263 { 1256 {
1264 clean_object (op); 1257 op->destroy_inv (false);
1265
1266 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1267 remove_button_link (op);
1268
1269 op->destroy (); 1258 op->destroy ();
1270 } 1259 }
1271 } 1260 }
1272 } 1261 }
1273} 1262}
… …
1455 freezer.save (filename); 1444 freezer.save (filename);
1456 1445
1457 return 0; 1446 return 0;
1458} 1447}
1459 1448
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/* 1449/*
1484 * Remove and free all objects in the given map. 1450 * Remove and free all objects in the given map.
1485 */ 1451 */
1486
1487void 1452void
1488free_all_objects (maptile *m) 1453free_all_objects (maptile *m)
1489{ 1454{
1490 int i, j; 1455 if (!m->spaces)
1491 object *op; 1456 return;
1492 1457
1493 for (i = 0; i < MAP_WIDTH (m); i++) 1458 for (int i = 0; i < m->width; i++)
1494 for (j = 0; j < MAP_HEIGHT (m); j++) 1459 for (int j = 0; j < m->height; j++)
1495 { 1460 {
1496 object *previous_obj = NULL; 1461 mapspace &ms = m->at (i, j);
1497 1462
1498 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1463 while (object *op = ms.bottom)
1499 { 1464 {
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) 1465 if (op->head)
1509 op = op->head; 1466 op = op->head;
1510 1467
1511 /* If the map isn't in memory, free_object will remove and 1468 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 (); 1469 op->destroy ();
1518 } 1470 }
1519 } 1471 }
1520} 1472}
1521 1473
1522/* 1474/*
1523 * Frees everything allocated by the given maptileure. 1475 * Frees everything allocated by the given maptileure.
1524 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1525 */ 1477 */
1526
1527void 1478void
1528free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1529{ 1480{
1530 int i; 1481 if (m->in_memory != MAP_IN_MEMORY)
1531
1532 if (!m->in_memory)
1533 {
1534 LOG (llevError, "Trying to free freed map.\n");
1535 return; 1482 return;
1536 } 1483
1484 m->in_memory = MAP_SAVING;
1537 1485
1538 // TODO: use new/delete 1486 // TODO: use new/delete
1539#define FREE_AND_CLEAR(p) { free (p); p = NULL; } 1487#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1540 1488
1541 if (flag && m->spaces) 1489 if (flag && m->spaces)
… …
1558 if (m->buttons) 1506 if (m->buttons)
1559 free_objectlinkpt (m->buttons); 1507 free_objectlinkpt (m->buttons);
1560 1508
1561 m->buttons = NULL; 1509 m->buttons = NULL;
1562 1510
1563 for (i = 0; i < 4; i++) 1511 for (int i = 0; i < 4; i++)
1564 { 1512 {
1565 if (m->tile_path[i]) 1513 if (m->tile_path[i])
1566 FREE_AND_CLEAR (m->tile_path[i]); 1514 FREE_AND_CLEAR (m->tile_path[i]);
1515
1567 m->tile_map[i] = NULL; 1516 m->tile_map[i] = 0;
1568 } 1517 }
1569 1518
1570 m->in_memory = MAP_SWAPPED; 1519 m->in_memory = MAP_SWAPPED;
1571 1520
1572#undef FREE_AND_CLEAR 1521#undef FREE_AND_CLEAR
1573
1574} 1522}
1575 1523
1576/* 1524maptile::~maptile ()
1577 * function: vanish maptile 1525{
1578 * m : pointer to maptile, if NULL no action 1526 free_map (this, 1);
1579 * this deletes all the data on the map (freeing pointers) 1527 free (tmpname);
1580 * and then removes this map from the global linked list of maps. 1528}
1529
1530void
1531maptile::do_destroy ()
1532{
1533 attachable::do_destroy ();
1534
1535 free_all_objects (this);
1536
1537 /* We need to look through all the maps and see if any maps
1538 * are pointing at this one for tiling information. Since
1539 * tiling can be asymetric, we just can not look to see which
1540 * maps this map tiles with and clears those.
1581 */ 1541 */
1542 //TODO: non-euclidean-tiling MUST GO
1543 for (maptile *m = first_map; m; m = m->next)
1544 for (int i = 0; i < 4; i++)
1545 if (m->tile_map[i] == this)
1546 m->tile_map[i] = 0;
1582 1547
1548 if (first_map == this)
1549 first_map = next;
1550 else
1551 for (maptile *m = first_map; m; m = m->next)
1552 if (m->next = this)
1553 {
1554 m->next = next;
1555 break;
1556 }
1557}
1558
1559//TODO: must go
1583void 1560void
1584delete_map (maptile *m) 1561delete_map (maptile *m)
1585{ 1562{
1586 maptile *tmp, *last;
1587 int i;
1588
1589 if (!m) 1563 if (m)
1590 return; 1564 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} 1565}
1643
1644
1645 1566
1646/* 1567/*
1647 * Makes sure the given map is loaded and swapped in. 1568 * Makes sure the given map is loaded and swapped in.
1648 * name is path name of the map. 1569 * name is path name of the map.
1649 * flags meaning: 1570 * flags meaning:
… …
1652 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1573 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1653 * dont do any more name translation on it. 1574 * dont do any more name translation on it.
1654 * 1575 *
1655 * Returns a pointer to the given map. 1576 * Returns a pointer to the given map.
1656 */ 1577 */
1657
1658maptile * 1578maptile *
1659ready_map_name (const char *name, int flags) 1579ready_map_name (const char *name, int flags)
1660{ 1580{
1661 maptile *m;
1662
1663 if (!name) 1581 if (!name)
1664 return (NULL); 1582 return 0;
1665 1583
1666 /* Have we been at this level before? */ 1584 /* Have we been at this level before? */
1667 m = has_been_loaded (name); 1585 maptile *m = has_been_loaded (name);
1668 1586
1669 /* Map is good to go, so just return it */ 1587 /* Map is good to go, so just return it */
1670 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) 1588 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1671 {
1672 return m; 1589 return m;
1673 }
1674 1590
1675 /* unique maps always get loaded from their original location, and never 1591 /* 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 1592 * 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 - 1593 * 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 1594 * 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 1596 * 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. 1597 * resets in any case - if they really care, they should use the 'maps command.
1682 */ 1598 */
1683 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1599 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1684 { 1600 {
1685
1686 /* first visit or time to reset */ 1601 /* first visit or time to reset */
1687 if (m) 1602 if (m)
1688 { 1603 {
1689 clean_tmp_map (m); /* Doesn't make much difference */ 1604 clean_tmp_map (m); /* Doesn't make much difference */
1690 delete_map (m); 1605 delete_map (m);
… …
1783 { 1698 {
1784 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1699 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));
1785 return MAP_DIFFICULTY (m); 1700 return MAP_DIFFICULTY (m);
1786 } 1701 }
1787 1702
1788 for (x = 0; x < MAP_WIDTH (m); x++) 1703 for (x = 0; x < m->width; x++)
1789 for (y = 0; y < MAP_HEIGHT (m); y++) 1704 for (y = 0; y < m->height; y++)
1790 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 1705 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1791 { 1706 {
1792 if (QUERY_FLAG (op, FLAG_MONSTER)) 1707 if (QUERY_FLAG (op, FLAG_MONSTER))
1793 { 1708 {
1794 total_exp += op->stats.exp; 1709 total_exp += op->stats.exp;
1795 monster_cnt++; 1710 monster_cnt++;
… …
1888 /* All clients need to get re-updated for the change */ 1803 /* All clients need to get re-updated for the change */
1889 update_all_map_los (m); 1804 update_all_map_los (m);
1890 return 1; 1805 return 1;
1891} 1806}
1892 1807
1893
1894/* 1808/*
1895 * This function updates various attributes about a specific space 1809 * This function updates various attributes about a specific space
1896 * on the map (what it looks like, whether it blocks magic, 1810 * on the map (what it looks like, whether it blocks magic,
1897 * has a living creatures, prevents people from passing 1811 * has a living creatures, prevents people from passing
1898 * through, etc) 1812 * through, etc)
1899 */ 1813 */
1900void 1814void
1901update_position (maptile *m, int x, int y) 1815mapspace::update_ ()
1902{ 1816{
1903 object *tmp, *last = NULL; 1817 object *tmp, *last = 0;
1904 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1818 uint8 flags = 0, light = 0, anywhere = 0;
1905 New_Face *top, *floor, *middle; 1819 New_Face *top, *floor, *middle;
1906 object *top_obj, *floor_obj, *middle_obj; 1820 object *top_obj, *floor_obj, *middle_obj;
1907 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1821 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1908 1822
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; 1823 middle = blank_face;
1917 top = blank_face; 1824 top = blank_face;
1918 floor = blank_face; 1825 floor = blank_face;
1919 1826
1920 middle_obj = NULL; 1827 middle_obj = 0;
1921 top_obj = NULL; 1828 top_obj = 0;
1922 floor_obj = NULL; 1829 floor_obj = 0;
1923 1830
1924 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1831 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above)
1925 { 1832 {
1926
1927 /* This could be made additive I guess (two lights better than 1833 /* This could be made additive I guess (two lights better than
1928 * one). But if so, it shouldn't be a simple additive - 2 1834 * one). But if so, it shouldn't be a simple additive - 2
1929 * light bulbs do not illuminate twice as far as once since 1835 * light bulbs do not illuminate twice as far as once since
1930 * it is a disapation factor that is squared (or is it cubed?) 1836 * it is a dissapation factor that is cubed.
1931 */ 1837 */
1932 if (tmp->glow_radius > light) 1838 if (tmp->glow_radius > light)
1933 light = tmp->glow_radius; 1839 light = tmp->glow_radius;
1934 1840
1935 /* This call is needed in order to update objects the player 1841 /* This call is needed in order to update objects the player
… …
1973 { 1879 {
1974 middle = tmp->face; 1880 middle = tmp->face;
1975 middle_obj = tmp; 1881 middle_obj = tmp;
1976 } 1882 }
1977 } 1883 }
1884
1978 if (tmp == tmp->above) 1885 if (tmp == tmp->above)
1979 { 1886 {
1980 LOG (llevError, "Error in structure of map\n"); 1887 LOG (llevError, "Error in structure of map\n");
1981 exit (-1); 1888 exit (-1);
1982 } 1889 }
1983 1890
1984 move_slow |= tmp->move_slow; 1891 move_slow |= tmp->move_slow;
1985 move_block |= tmp->move_block; 1892 move_block |= tmp->move_block;
1986 move_on |= tmp->move_on; 1893 move_on |= tmp->move_on;
1987 move_off |= tmp->move_off; 1894 move_off |= tmp->move_off;
1988 move_allow |= tmp->move_allow; 1895 move_allow |= tmp->move_allow;
1989 1896
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)) 1897 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2000 flags |= P_BLOCKSVIEW; 1898 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2001 } /* for stack of objects */ 1899 if (tmp->type == PLAYER) flags |= P_PLAYER;
2002 1900 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2003 /* we don't want to rely on this function to have accurate flags, but 1901 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2004 * since we're already doing the work, we calculate them here. 1902 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 { 1903 }
2009 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1904
2010 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1905 this->light = light;
2011 } 1906 this->flags_ = flags;
2012 SET_MAP_FLAGS (m, x, y, flags); 1907 this->move_block = move_block & ~move_allow;
2013 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1908 this->move_on = move_on;
2014 SET_MAP_MOVE_ON (m, x, y, move_on); 1909 this->move_off = move_off;
2015 SET_MAP_MOVE_OFF (m, x, y, move_off); 1910 this->move_slow = move_slow;
2016 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2017 1911
2018 /* At this point, we have a floor face (if there is a floor), 1912 /* 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 1913 * and the floor is set - we are not going to touch it at
2020 * this point. 1914 * this point.
2021 * middle contains the highest visibility face. 1915 * middle contains the highest visibility face.
… …
2075 break; 1969 break;
2076 } 1970 }
2077 } 1971 }
2078 } 1972 }
2079 } 1973 }
1974
2080 if (middle == floor) 1975 if (middle == floor)
2081 middle = blank_face; 1976 middle = blank_face;
1977
2082 if (top == middle) 1978 if (top == middle)
2083 middle = blank_face; 1979 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 1980
1981 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1982 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1983 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1984}
2102 1985
2103void 1986void
2104set_map_reset_time (maptile *map) 1987set_map_reset_time (maptile *map)
2105{ 1988{
2106 int timeout; 1989 int timeout;
… …
2146 * 2029 *
2147 */ 2030 */
2148int 2031int
2149out_of_map (maptile *m, int x, int y) 2032out_of_map (maptile *m, int x, int y)
2150{ 2033{
2151
2152 /* If we get passed a null map, this is obviously the 2034 /* If we get passed a null map, this is obviously the
2153 * case. This generally shouldn't happen, but if the 2035 * case. This generally shouldn't happen, but if the
2154 * map loads fail below, it could happen. 2036 * map loads fail below, it could happen.
2155 */ 2037 */
2156 if (!m) 2038 if (!m)
… …
2158 2040
2159 if (x < 0) 2041 if (x < 0)
2160 { 2042 {
2161 if (!m->tile_path[3]) 2043 if (!m->tile_path[3])
2162 return 1; 2044 return 1;
2045
2163 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2046 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2164 {
2165 load_and_link_tiled_map (m, 3); 2047 load_and_link_tiled_map (m, 3);
2166 } 2048
2167 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2049 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2168 } 2050 }
2169 if (x >= MAP_WIDTH (m)) 2051
2052 if (x >= m->width)
2170 { 2053 {
2171 if (!m->tile_path[1]) 2054 if (!m->tile_path[1])
2172 return 1; 2055 return 1;
2056
2173 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2057 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2174 {
2175 load_and_link_tiled_map (m, 1); 2058 load_and_link_tiled_map (m, 1);
2176 } 2059
2177 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2060 return (out_of_map (m->tile_map[1], x - m->width, y));
2178 } 2061 }
2062
2179 if (y < 0) 2063 if (y < 0)
2180 { 2064 {
2181 if (!m->tile_path[0]) 2065 if (!m->tile_path[0])
2182 return 1; 2066 return 1;
2067
2183 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2068 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2184 {
2185 load_and_link_tiled_map (m, 0); 2069 load_and_link_tiled_map (m, 0);
2186 } 2070
2187 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2071 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2188 } 2072 }
2189 if (y >= MAP_HEIGHT (m)) 2073
2074 if (y >= m->height)
2190 { 2075 {
2191 if (!m->tile_path[2]) 2076 if (!m->tile_path[2])
2192 return 1; 2077 return 1;
2078
2193 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2079 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2194 {
2195 load_and_link_tiled_map (m, 2); 2080 load_and_link_tiled_map (m, 2);
2196 } 2081
2197 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2082 return (out_of_map (m->tile_map[2], x, y - m->height));
2198 } 2083 }
2199 2084
2200 /* Simple case - coordinates are within this local 2085 /* Simple case - coordinates are within this local
2201 * map. 2086 * map.
2202 */ 2087 */
… …
2216{ 2101{
2217 2102
2218 if (*x < 0) 2103 if (*x < 0)
2219 { 2104 {
2220 if (!m->tile_path[3]) 2105 if (!m->tile_path[3])
2221 return NULL; 2106 return 0;
2222 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2107 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2223 load_and_link_tiled_map (m, 3); 2108 load_and_link_tiled_map (m, 3);
2224 2109
2225 *x += MAP_WIDTH (m->tile_map[3]); 2110 *x += m->tile_map[3]->width;
2226 return (get_map_from_coord (m->tile_map[3], x, y)); 2111 return (get_map_from_coord (m->tile_map[3], x, y));
2227 } 2112 }
2228 if (*x >= MAP_WIDTH (m)) 2113
2114 if (*x >= m->width)
2229 { 2115 {
2230 if (!m->tile_path[1]) 2116 if (!m->tile_path[1])
2231 return NULL; 2117 return 0;
2118
2232 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2119 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2233 load_and_link_tiled_map (m, 1); 2120 load_and_link_tiled_map (m, 1);
2234 2121
2235 *x -= MAP_WIDTH (m); 2122 *x -= m->width;
2236 return (get_map_from_coord (m->tile_map[1], x, y)); 2123 return (get_map_from_coord (m->tile_map[1], x, y));
2237 } 2124 }
2125
2238 if (*y < 0) 2126 if (*y < 0)
2239 { 2127 {
2240 if (!m->tile_path[0]) 2128 if (!m->tile_path[0])
2241 return NULL; 2129 return 0;
2130
2242 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2131 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2243 load_and_link_tiled_map (m, 0); 2132 load_and_link_tiled_map (m, 0);
2244 2133
2245 *y += MAP_HEIGHT (m->tile_map[0]); 2134 *y += m->tile_map[0]->height;
2246 return (get_map_from_coord (m->tile_map[0], x, y)); 2135 return (get_map_from_coord (m->tile_map[0], x, y));
2247 } 2136 }
2248 if (*y >= MAP_HEIGHT (m)) 2137
2138 if (*y >= m->height)
2249 { 2139 {
2250 if (!m->tile_path[2]) 2140 if (!m->tile_path[2])
2251 return NULL; 2141 return 0;
2142
2252 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2143 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2253 load_and_link_tiled_map (m, 2); 2144 load_and_link_tiled_map (m, 2);
2254 2145
2255 *y -= MAP_HEIGHT (m); 2146 *y -= m->height;
2256 return (get_map_from_coord (m->tile_map[2], x, y)); 2147 return (get_map_from_coord (m->tile_map[2], x, y));
2257 } 2148 }
2258 2149
2259 /* Simple case - coordinates are within this local 2150 /* Simple case - coordinates are within this local
2260 * map. 2151 * map.
… …
2280 2171
2281 } 2172 }
2282 else if (map1->tile_map[0] == map2) 2173 else if (map1->tile_map[0] == map2)
2283 { /* up */ 2174 { /* up */
2284 *dx = 0; 2175 *dx = 0;
2285 *dy = -MAP_HEIGHT (map2); 2176 *dy = -map2->height;
2286 } 2177 }
2287 else if (map1->tile_map[1] == map2) 2178 else if (map1->tile_map[1] == map2)
2288 { /* right */ 2179 { /* right */
2289 *dx = MAP_WIDTH (map1); 2180 *dx = map1->width;
2290 *dy = 0; 2181 *dy = 0;
2291 } 2182 }
2292 else if (map1->tile_map[2] == map2) 2183 else if (map1->tile_map[2] == map2)
2293 { /* down */ 2184 { /* down */
2294 *dx = 0; 2185 *dx = 0;
2295 *dy = MAP_HEIGHT (map1); 2186 *dy = map1->height;
2296 } 2187 }
2297 else if (map1->tile_map[3] == map2) 2188 else if (map1->tile_map[3] == map2)
2298 { /* left */ 2189 { /* left */
2299 *dx = -MAP_WIDTH (map2); 2190 *dx = -map2->width;
2300 *dy = 0; 2191 *dy = 0;
2301 2192
2302 } 2193 }
2303 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2194 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2304 { /* up right */ 2195 { /* up right */
2305 *dx = MAP_WIDTH (map1->tile_map[0]); 2196 *dx = map1->tile_map[0]->width;
2306 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2197 *dy = -map1->tile_map[0]->height;
2307 } 2198 }
2308 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2199 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2309 { /* up left */ 2200 { /* up left */
2310 *dx = -MAP_WIDTH (map2); 2201 *dx = -map2->width;
2311 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2202 *dy = -map1->tile_map[0]->height;
2312 } 2203 }
2313 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2204 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2314 { /* right up */ 2205 { /* right up */
2315 *dx = MAP_WIDTH (map1); 2206 *dx = map1->width;
2316 *dy = -MAP_HEIGHT (map2); 2207 *dy = -map2->height;
2317 } 2208 }
2318 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2209 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2319 { /* right down */ 2210 { /* right down */
2320 *dx = MAP_WIDTH (map1); 2211 *dx = map1->width;
2321 *dy = MAP_HEIGHT (map1->tile_map[1]); 2212 *dy = map1->tile_map[1]->height;
2322 } 2213 }
2323 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2214 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2324 { /* down right */ 2215 { /* down right */
2325 *dx = MAP_WIDTH (map1->tile_map[2]); 2216 *dx = map1->tile_map[2]->width;
2326 *dy = MAP_HEIGHT (map1); 2217 *dy = map1->height;
2327 } 2218 }
2328 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2219 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2329 { /* down left */ 2220 { /* down left */
2330 *dx = -MAP_WIDTH (map2); 2221 *dx = -map2->width;
2331 *dy = MAP_HEIGHT (map1); 2222 *dy = map1->height;
2332 } 2223 }
2333 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2224 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2334 { /* left up */ 2225 { /* left up */
2335 *dx = -MAP_WIDTH (map1->tile_map[3]); 2226 *dx = -map1->tile_map[3]->width;
2336 *dy = -MAP_HEIGHT (map2); 2227 *dy = -map2->height;
2337 } 2228 }
2338 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2229 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2339 { /* left down */ 2230 { /* left down */
2340 *dx = -MAP_WIDTH (map1->tile_map[3]); 2231 *dx = -map1->tile_map[3]->width;
2341 *dy = MAP_HEIGHT (map1->tile_map[3]); 2232 *dy = map1->tile_map[3]->height;
2342 2233
2343 } 2234 }
2344 else 2235 else
2345 { /* not "adjacent" enough */ 2236 { /* not "adjacent" enough */
2346 return 0; 2237 return 0;

Diff Legend

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