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.44 by root, Mon Dec 18 04:07:30 2006 UTC vs.
Revision 1.48 by root, Mon Dec 25 14:43:22 2006 UTC

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

Diff Legend

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