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.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
… …
323 /* We basically go through the stack of objects, and if there is 317 /* We basically go through the stack of objects, and if there is
324 * some other object that has NO_PASS or FLAG_ALIVE set, return 318 * some other object that has NO_PASS or FLAG_ALIVE set, return
325 * true. If we get through the entire stack, that must mean 319 * true. If we get through the entire stack, that must mean
326 * ob is blocking it, so return 0. 320 * ob is blocking it, so return 0.
327 */ 321 */
328 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) 322 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
329 { 323 {
330 324
331 /* This must be before the checks below. Code for inventory checkers. */ 325 /* This must be before the checks below. Code for inventory checkers. */
332 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 326 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
333 { 327 {
… …
397 * 391 *
398 * Note this used to be arch_blocked, but with new movement 392 * Note this used to be arch_blocked, but with new movement
399 * code, we need to have actual object to check its move_type 393 * code, we need to have actual object to check its move_type
400 * against the move_block values. 394 * against the move_block values.
401 */ 395 */
402
403int 396int
404ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 397ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
405{ 398{
406 archetype *tmp; 399 archetype *tmp;
407 int flag; 400 int flag;
… …
413 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 406 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
414 if (flag & P_OUT_OF_MAP) 407 if (flag & P_OUT_OF_MAP)
415 return P_OUT_OF_MAP; 408 return P_OUT_OF_MAP;
416 409
417 /* 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 */
418 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 411 return m1->at (sx, sy).move_block;
419 } 412 }
420 413
421 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 414 for (tmp = ob->arch; tmp; tmp = tmp->more)
422 { 415 {
423 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);
424 417
425 if (flag & P_OUT_OF_MAP) 418 if (flag & P_OUT_OF_MAP)
426 return P_OUT_OF_MAP; 419 return P_OUT_OF_MAP;
427 if (flag & P_IS_ALIVE) 420 if (flag & P_IS_ALIVE)
428 return P_IS_ALIVE; 421 return P_IS_ALIVE;
429 422
423 mapspace &ms = m1->at (sx, sy);
424
425
430 /* find_first_free_spot() calls this function. However, often 426 /* find_first_free_spot() calls this function. However, often
431 * 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)
432 * 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.
433 */ 429 */
434 430
435 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)
436 continue; 432 continue;
437 433
438 /* 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
439 * head of the object should correspond for the entire object. 435 * head of the object should correspond for the entire object.
440 */ 436 */
441 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 437 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
442 return AB_NO_PASS; 438 return P_NO_PASS;
443
444 } 439 }
440
445 return 0; 441 return 0;
446} 442}
447 443
448/* When the map is loaded, load_object does not actually insert objects 444/* When the map is loaded, load_object does not actually insert objects
449 * into inventory, but just links them. What this does is go through 445 * into inventory, but just links them. What this does is go through
… …
476 * 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
477 * 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
478 * 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
479 * the more sections and not re-add sections for them. 475 * the more sections and not re-add sections for them.
480 */ 476 */
481
482static void 477static void
483link_multipart_objects (maptile *m) 478link_multipart_objects (maptile *m)
484{ 479{
485 int x, y; 480 int x, y;
486 object *tmp, *op, *last, *above; 481 object *tmp, *op, *last, *above;
487 archetype *at; 482 archetype *at;
488 483
489 for (x = 0; x < MAP_WIDTH (m); x++) 484 for (x = 0; x < m->width; x++)
490 for (y = 0; y < MAP_HEIGHT (m); y++) 485 for (y = 0; y < m->height; y++)
491 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)
492 { 487 {
493 above = tmp->above; 488 above = tmp->above;
494 489
495 /* already multipart - don't do anything more */ 490 /* already multipart - don't do anything more */
496 if (tmp->head || tmp->more) 491 if (tmp->head || tmp->more)
… …
546 { 541 {
547 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)");
548 continue; 543 continue;
549 } 544 }
550 545
551
552 switch (i) 546 switch (i)
553 { 547 {
554 case LL_NORMAL: 548 case LL_NORMAL:
555 /* 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 */
556 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)
… …
581 { 575 {
582 for (j = 0; j < m->height; j++) 576 for (j = 0; j < m->height; j++)
583 { 577 {
584 unique = 0; 578 unique = 0;
585 /* check for unique items, or unique squares */ 579 /* check for unique items, or unique squares */
586 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 580 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
587 { 581 {
588 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 582 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
589 unique = 1; 583 unique = 1;
590 584
591 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 585 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
… …
602 * 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,
603 * 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
604 * in order to do map tiling properly. 598 * in order to do map tiling properly.
605 */ 599 */
606void 600void
607save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) 601save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
608{ 602{
609 int i, j = 0, unique = 0; 603 int i, j = 0, unique = 0;
610 object *op; 604 object *op;
611 605
612 /* first pass - save one-part objects */ 606 /* first pass - save one-part objects */
613 for (i = 0; i < MAP_WIDTH (m); i++) 607 for (i = 0; i < m->width; i++)
614 for (j = 0; j < MAP_HEIGHT (m); j++) 608 for (j = 0; j < m->height; j++)
615 { 609 {
616 unique = 0; 610 unique = 0;
611
617 for (op = get_map_ob (m, i, j); op; op = op->above) 612 for (op = m->at (i, j).bot; op; op = op->above)
618 { 613 {
619 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 614 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
620 unique = 1; 615 unique = 1;
621 616
622 if (op->type == PLAYER) 617 if (op->type == PLAYER)
623 {
624 LOG (llevDebug, "Player on map that is being saved\n");
625 continue; 618 continue;
626 }
627 619
628 if (op->head || op->owner) 620 if (op->head || op->owner)
629 continue; 621 continue;
630 622
631 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 623 if (unique || op->flag [FLAG_UNIQUE])
632 save_object (fp2, op, 3); 624 save_object (fp2, op, 1);
633 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])))
634 save_object (fp, op, 3); 626 save_object (fp, op, 1);
635 627 }
636 } /* for this space */ 628 }
637 } /* for this j */
638} 629}
639 630
640maptile::maptile () 631maptile::maptile ()
641{ 632{
642 in_memory = MAP_SWAPPED; 633 in_memory = MAP_SWAPPED;
643 /* 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
644 * map archetype. Mimic that behaviour. 635 * map archetype. Mimic that behaviour.
645 */ 636 */
646 MAP_WIDTH (this) = 16; 637 width = 16;
647 MAP_HEIGHT (this) = 16; 638 height = 16;
648 MAP_RESET_TIMEOUT (this) = 0; 639 reset_timeout = 0;
649 MAP_TIMEOUT (this) = 300; 640 timeout = 300;
650 MAP_ENTER_X (this) = 0; 641 enter_x = 0;
651 MAP_ENTER_Y (this) = 0; 642 enter_y = 0;
652 /*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 */
653 MAP_WORLDPARTX (this) = -1; 644 worldpartx = -1;
654 MAP_WORLDPARTY (this) = -1; 645 worldparty = -1;
655} 646}
656 647
657/* 648/*
658 * Allocates, initialises, and returns a pointer to a maptile. 649 * Allocates, initialises, and returns a pointer to a maptile.
659 * 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
660 * used anyways. MSW 2001-07-01 651 * used anyways. MSW 2001-07-01
661 */ 652 */
662maptile * 653maptile *
663get_linked_map (void) 654get_linked_map (void)
664{ 655{
665 maptile *mp, *map = new maptile; 656 maptile *map = new maptile;
666 657
667 for (mp = first_map; mp && mp->next; mp = mp->next); 658 map->next = first_map;
668
669 if (mp == NULL)
670 first_map = map; 659 first_map = map;
671 else
672 mp->next = map;
673 660
674 return map; 661 return map;
675} 662}
676 663
677/* 664/*
… …
689 * that is their poor assumption. 676 * that is their poor assumption.
690 */ 677 */
691 if (spaces) 678 if (spaces)
692 { 679 {
693 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);
694 free (spaces); 681 sfree (spaces, size ());
695 } 682 }
696 683
697 spaces = (MapSpace *) 684 spaces = salloc0<mapspace> (size ());
698 calloc (1, width * height * sizeof (MapSpace));
699
700 if (!spaces)
701 fatal (OUT_OF_MEMORY);
702} 685}
703 686
704/* Create and returns a map of the specific size. Used 687/* Create and returns a map of the specific size. Used
705 * in random map code and the editor. 688 * in random map code and the editor.
706 */ 689 */
… …
1129 strcpy (m->path, filename); 1112 strcpy (m->path, filename);
1130 if (load_map_header (thawer, m)) 1113 if (load_map_header (thawer, m))
1131 { 1114 {
1132 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);
1133 delete_map (m); 1116 delete_map (m);
1134 return NULL; 1117 return 0;
1135 } 1118 }
1136 1119
1137 m->allocate (); 1120 m->allocate ();
1138 1121
1139 m->in_memory = MAP_LOADING; 1122 m->in_memory = MAP_LOADING;
1140 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1123 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1141 1124
1142 m->in_memory = MAP_IN_MEMORY; 1125 m->in_memory = MAP_IN_MEMORY;
1143 if (!MAP_DIFFICULTY (m)) 1126 if (!m->difficulty)
1144 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1127 m->difficulty = calculate_difficulty (m);
1145 set_map_reset_time (m); 1128 set_map_reset_time (m);
1146 m->instantiate (); 1129 m->instantiate ();
1147 return (m); 1130 return (m);
1148} 1131}
1149 1132
… …
1222 if (load_map_header (thawer, m)) 1205 if (load_map_header (thawer, m))
1223 { 1206 {
1224 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);
1225 delete_map (m); 1208 delete_map (m);
1226 m = load_original_map (m->path, 0); 1209 m = load_original_map (m->path, 0);
1227 return NULL; 1210 return 0;
1228 } 1211 }
1229 /*m->allocate ();*/ 1212 /*m->allocate ();*/
1230 1213
1231 m->in_memory = MAP_LOADING; 1214 m->in_memory = MAP_LOADING;
1232 load_objects (m, thawer, MAP_OVERLAY); 1215 load_objects (m, thawer, MAP_OVERLAY);
… …
1244delete_unique_items (maptile *m) 1227delete_unique_items (maptile *m)
1245{ 1228{
1246 int i, j, unique; 1229 int i, j, unique;
1247 object *op, *next; 1230 object *op, *next;
1248 1231
1249 for (i = 0; i < MAP_WIDTH (m); i++) 1232 for (i = 0; i < m->width; i++)
1250 for (j = 0; j < MAP_HEIGHT (m); j++) 1233 for (j = 0; j < m->height; j++)
1251 { 1234 {
1252 unique = 0; 1235 unique = 0;
1253 1236
1254 for (op = get_map_ob (m, i, j); op; op = next) 1237 for (op = GET_MAP_OB (m, i, j); op; op = next)
1255 { 1238 {
1256 next = op->above; 1239 next = op->above;
1257 1240
1258 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))
1259 unique = 1; 1242 unique = 1;
1260 1243
1261 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1244 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1262 { 1245 {
1263 clean_object (op); 1246 op->destroy_inv (false);
1264
1265 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1266 remove_button_link (op);
1267
1268 op->destroy (); 1247 op->destroy ();
1269 } 1248 }
1270 } 1249 }
1271 } 1250 }
1272} 1251}
1273 1252
1274
1275/* 1253/*
1276 * 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
1277 * m is the map to load unique items into. 1255 * m is the map to load unique items into.
1278 */ 1256 */
1279static void 1257static void
… …
1298 return; 1276 return;
1299 1277
1300 m->in_memory = MAP_LOADING; 1278 m->in_memory = MAP_LOADING;
1301 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1279 if (m->tmpname == NULL) /* if we have loaded unique items from */
1302 delete_unique_items (m); /* original map before, don't duplicate them */ 1280 delete_unique_items (m); /* original map before, don't duplicate them */
1281
1303 load_objects (m, thawer, 0); 1282 load_objects (m, thawer, 0);
1304 1283
1305 m->in_memory = MAP_IN_MEMORY; 1284 m->in_memory = MAP_IN_MEMORY;
1306} 1285}
1307
1308 1286
1309/* 1287/*
1310 * 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
1311 * file it was (originally) loaded from. Otherwise a temporary 1289 * file it was (originally) loaded from. Otherwise a temporary
1312 * filename will be genarated, and the file will be stored there. 1290 * filename will be genarated, and the file will be stored there.
1313 * The temporary filename will be stored in the maptileure. 1291 * The temporary filename will be stored in the maptileure.
1314 * 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
1315 * (this should have been updated when first loaded) 1293 * (this should have been updated when first loaded)
1316 */ 1294 */
1317
1318int 1295int
1319new_save_map (maptile *m, int flag) 1296new_save_map (maptile *m, int flag)
1320{ 1297{
1321 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1298 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1322 int i; 1299 int i;
… …
1454 freezer.save (filename); 1431 freezer.save (filename);
1455 1432
1456 return 0; 1433 return 0;
1457} 1434}
1458 1435
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/* 1436/*
1483 * Remove and free all objects in the given map. 1437 * Remove and free all objects in the given map.
1484 */ 1438 */
1485
1486void 1439void
1487free_all_objects (maptile *m) 1440free_all_objects (maptile *m)
1488{ 1441{
1489 int i, j; 1442 if (!m->spaces)
1490 object *op; 1443 return;
1491 1444
1492 for (i = 0; i < MAP_WIDTH (m); i++) 1445 for (int i = 0; i < m->width; i++)
1493 for (j = 0; j < MAP_HEIGHT (m); j++) 1446 for (int j = 0; j < m->height; j++)
1494 { 1447 {
1495 object *previous_obj = NULL; 1448 mapspace &ms = m->at (i, j);
1496 1449
1497 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1450 while (object *op = ms.bot)
1498 { 1451 {
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) 1452 if (op->head)
1508 op = op->head; 1453 op = op->head;
1509 1454
1510 /* If the map isn't in memory, free_object will remove and 1455 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 (); 1456 op->destroy ();
1517 } 1457 }
1518 } 1458 }
1519} 1459}
1520 1460
1521/* 1461/*
1522 * Frees everything allocated by the given maptileure. 1462 * Frees everything allocated by the given maptileure.
1523 * don't free tmpname - our caller is left to do that 1463 * don't free tmpname - our caller is left to do that
1524 */ 1464 */
1525
1526void 1465void
1527free_map (maptile *m, int flag) 1466free_map (maptile *m, int flag)
1528{ 1467{
1529 int i; 1468 if (!m->in_memory) //TODO: makes no sense to me?
1530
1531 if (!m->in_memory)
1532 {
1533 LOG (llevError, "Trying to free freed map.\n");
1534 return; 1469 return;
1535 } 1470
1471 m->in_memory = MAP_SAVING;
1536 1472
1537 // TODO: use new/delete 1473 // TODO: use new/delete
1538#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1539 1474
1540 if (flag && m->spaces) 1475 if (flag && m->spaces)
1541 free_all_objects (m); 1476 free_all_objects (m);
1542 if (m->name)
1543 FREE_AND_CLEAR (m->name);
1544 if (m->spaces)
1545 FREE_AND_CLEAR (m->spaces);
1546 if (m->msg)
1547 FREE_AND_CLEAR (m->msg);
1548 if (m->maplore)
1549 FREE_AND_CLEAR (m->maplore);
1550 1477
1551 delete [] m->shopitems; 1478 sfree (m->spaces, m->size ()), m->spaces = 0;
1552 m->shopitems = 0;
1553 1479
1554 if (m->shoprace) 1480 free (m->name), m->name = 0;
1555 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;
1556 1485
1557 if (m->buttons) 1486 if (m->buttons)
1558 free_objectlinkpt (m->buttons); 1487 free_objectlinkpt (m->buttons), m->buttons = 0;
1559 1488
1560 m->buttons = NULL;
1561
1562 for (i = 0; i < 4; i++) 1489 for (int i = 0; i < 4; i++)
1563 { 1490 free (m->tile_path[i]), m->tile_path[i] = 0;
1564 if (m->tile_path[i])
1565 FREE_AND_CLEAR (m->tile_path[i]);
1566 m->tile_map[i] = NULL;
1567 }
1568 1491
1569 m->in_memory = MAP_SWAPPED; 1492 m->in_memory = MAP_SWAPPED;
1570
1571#undef FREE_AND_CLEAR
1572
1573} 1493}
1574 1494
1575/* 1495maptile::~maptile ()
1576 * function: vanish maptile 1496{
1577 * m : pointer to maptile, if NULL no action 1497 assert (destroyed ());
1578 * this deletes all the data on the map (freeing pointers) 1498}
1579 * 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.
1580 */ 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;
1581 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
1582void 1531void
1583delete_map (maptile *m) 1532delete_map (maptile *m)
1584{ 1533{
1585 maptile *tmp, *last;
1586 int i;
1587
1588 if (!m) 1534 if (m)
1589 return; 1535 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} 1536}
1642 1537
1643/* 1538/*
1644 * Makes sure the given map is loaded and swapped in. 1539 * Makes sure the given map is loaded and swapped in.
1645 * name is path name of the map. 1540 * name is path name of the map.
… …
1652 * Returns a pointer to the given map. 1547 * Returns a pointer to the given map.
1653 */ 1548 */
1654maptile * 1549maptile *
1655ready_map_name (const char *name, int flags) 1550ready_map_name (const char *name, int flags)
1656{ 1551{
1657 maptile *m;
1658
1659 if (!name) 1552 if (!name)
1660 return (NULL); 1553 return 0;
1661 1554
1662 /* Have we been at this level before? */ 1555 /* Have we been at this level before? */
1663 m = has_been_loaded (name); 1556 maptile *m = has_been_loaded (name);
1664 1557
1665 /* Map is good to go, so just return it */ 1558 /* Map is good to go, so just return it */
1666 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))
1667 {
1668 return m; 1560 return m;
1669 }
1670 1561
1671 /* unique maps always get loaded from their original location, and never 1562 /* 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 1563 * 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 - 1564 * 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 1565 * 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 1567 * 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. 1568 * resets in any case - if they really care, they should use the 'maps command.
1678 */ 1569 */
1679 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1570 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1680 { 1571 {
1681
1682 /* first visit or time to reset */ 1572 /* first visit or time to reset */
1683 if (m) 1573 if (m)
1684 { 1574 {
1685 clean_tmp_map (m); /* Doesn't make much difference */ 1575 clean_tmp_map (m); /* Doesn't make much difference */
1686 delete_map (m); 1576 delete_map (m);
… …
1773 int x, y, i; 1663 int x, y, i;
1774 long monster_cnt = 0; 1664 long monster_cnt = 0;
1775 double avgexp = 0; 1665 double avgexp = 0;
1776 sint64 total_exp = 0; 1666 sint64 total_exp = 0;
1777 1667
1778 if (MAP_DIFFICULTY (m)) 1668 if (m->difficulty)
1779 { 1669 {
1780 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1670 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1781 return MAP_DIFFICULTY (m); 1671 return m->difficulty;
1782 } 1672 }
1783 1673
1784 for (x = 0; x < MAP_WIDTH (m); x++) 1674 for (x = 0; x < m->width; x++)
1785 for (y = 0; y < MAP_HEIGHT (m); y++) 1675 for (y = 0; y < m->height; y++)
1786 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)
1787 { 1677 {
1788 if (QUERY_FLAG (op, FLAG_MONSTER)) 1678 if (QUERY_FLAG (op, FLAG_MONSTER))
1789 { 1679 {
1790 total_exp += op->stats.exp; 1680 total_exp += op->stats.exp;
1791 monster_cnt++; 1681 monster_cnt++;
… …
1839 if (first_map->in_memory == MAP_SAVING) 1729 if (first_map->in_memory == MAP_SAVING)
1840 first_map->in_memory = MAP_IN_MEMORY; 1730 first_map->in_memory = MAP_IN_MEMORY;
1841 delete_map (first_map); 1731 delete_map (first_map);
1842 real_maps++; 1732 real_maps++;
1843 } 1733 }
1734
1844 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); 1735 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1845} 1736}
1846 1737
1847/* change_map_light() - used to change map light level (darkness) 1738/* change_map_light() - used to change map light level (darkness)
1848 * up or down. Returns true if successful. It should now be 1739 * up or down. Returns true if successful. It should now be
… …
1884 /* All clients need to get re-updated for the change */ 1775 /* All clients need to get re-updated for the change */
1885 update_all_map_los (m); 1776 update_all_map_los (m);
1886 return 1; 1777 return 1;
1887} 1778}
1888 1779
1889
1890/* 1780/*
1891 * This function updates various attributes about a specific space 1781 * This function updates various attributes about a specific space
1892 * on the map (what it looks like, whether it blocks magic, 1782 * on the map (what it looks like, whether it blocks magic,
1893 * has a living creatures, prevents people from passing 1783 * has a living creatures, prevents people from passing
1894 * through, etc) 1784 * through, etc)
1895 */ 1785 */
1896void 1786void
1897update_position (maptile *m, int x, int y) 1787mapspace::update_ ()
1898{ 1788{
1899 object *tmp, *last = NULL; 1789 object *tmp, *last = 0;
1900 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1790 uint8 flags = 0, light = 0, anywhere = 0;
1901 New_Face *top, *floor, *middle; 1791 New_Face *top, *floor, *middle;
1902 object *top_obj, *floor_obj, *middle_obj; 1792 object *top_obj, *floor_obj, *middle_obj;
1903 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;
1904 1794
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; 1795 middle = blank_face;
1913 top = blank_face; 1796 top = blank_face;
1914 floor = blank_face; 1797 floor = blank_face;
1915 1798
1916 middle_obj = NULL; 1799 middle_obj = 0;
1917 top_obj = NULL; 1800 top_obj = 0;
1918 floor_obj = NULL; 1801 floor_obj = 0;
1919 1802
1920 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1803 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1921 { 1804 {
1922
1923 /* This could be made additive I guess (two lights better than 1805 /* This could be made additive I guess (two lights better than
1924 * 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
1925 * light bulbs do not illuminate twice as far as once since 1807 * light bulbs do not illuminate twice as far as once since
1926 * it is a disapation factor that is squared (or is it cubed?) 1808 * it is a dissapation factor that is cubed.
1927 */ 1809 */
1928 if (tmp->glow_radius > light) 1810 if (tmp->glow_radius > light)
1929 light = tmp->glow_radius; 1811 light = tmp->glow_radius;
1930 1812
1931 /* This call is needed in order to update objects the player 1813 /* This call is needed in order to update objects the player
… …
1969 { 1851 {
1970 middle = tmp->face; 1852 middle = tmp->face;
1971 middle_obj = tmp; 1853 middle_obj = tmp;
1972 } 1854 }
1973 } 1855 }
1856
1974 if (tmp == tmp->above) 1857 if (tmp == tmp->above)
1975 { 1858 {
1976 LOG (llevError, "Error in structure of map\n"); 1859 LOG (llevError, "Error in structure of map\n");
1977 exit (-1); 1860 exit (-1);
1978 } 1861 }
1979 1862
1980 move_slow |= tmp->move_slow; 1863 move_slow |= tmp->move_slow;
1981 move_block |= tmp->move_block; 1864 move_block |= tmp->move_block;
1982 move_on |= tmp->move_on; 1865 move_on |= tmp->move_on;
1983 move_off |= tmp->move_off; 1866 move_off |= tmp->move_off;
1984 move_allow |= tmp->move_allow; 1867 move_allow |= tmp->move_allow;
1985 1868
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)) 1869 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
1996 flags |= P_BLOCKSVIEW; 1870 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
1997 } /* for stack of objects */ 1871 if (tmp->type == PLAYER) flags |= P_PLAYER;
1998 1872 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1999 /* we don't want to rely on this function to have accurate flags, but 1873 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2000 * since we're already doing the work, we calculate them here. 1874 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 { 1875 }
2005 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1876
2006 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1877 this->light = light;
2007 } 1878 this->flags_ = flags;
2008 SET_MAP_FLAGS (m, x, y, flags); 1879 this->move_block = move_block & ~move_allow;
2009 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1880 this->move_on = move_on;
2010 SET_MAP_MOVE_ON (m, x, y, move_on); 1881 this->move_off = move_off;
2011 SET_MAP_MOVE_OFF (m, x, y, move_off); 1882 this->move_slow = move_slow;
2012 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2013 1883
2014 /* 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),
2015 * 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
2016 * this point. 1886 * this point.
2017 * middle contains the highest visibility face. 1887 * middle contains the highest visibility face.
… …
2071 break; 1941 break;
2072 } 1942 }
2073 } 1943 }
2074 } 1944 }
2075 } 1945 }
1946
2076 if (middle == floor) 1947 if (middle == floor)
2077 middle = blank_face; 1948 middle = blank_face;
1949
2078 if (top == middle) 1950 if (top == middle)
2079 middle = blank_face; 1951 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 1952
1953 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1954 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1955 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1956}
2098 1957
2099void 1958void
2100set_map_reset_time (maptile *map) 1959set_map_reset_time (maptile *map)
2101{ 1960{
2102 int timeout; 1961 int timeout;
2103 1962
2104 timeout = MAP_RESET_TIMEOUT (map); 1963 timeout = map->reset_timeout;
2105 if (timeout <= 0) 1964 if (timeout <= 0)
2106 timeout = MAP_DEFAULTRESET; 1965 timeout = MAP_DEFAULTRESET;
2107 if (timeout >= MAP_MAXRESET) 1966 if (timeout >= MAP_MAXRESET)
2108 timeout = MAP_MAXRESET; 1967 timeout = MAP_MAXRESET;
2109 MAP_WHEN_RESET (map) = time (0) + timeout; 1968 map->reset_time = time (0) + timeout;
2110} 1969}
2111 1970
2112/* 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
2113 * 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
2114 * 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
… …
2142 * 2001 *
2143 */ 2002 */
2144int 2003int
2145out_of_map (maptile *m, int x, int y) 2004out_of_map (maptile *m, int x, int y)
2146{ 2005{
2147
2148 /* If we get passed a null map, this is obviously the 2006 /* If we get passed a null map, this is obviously the
2149 * case. This generally shouldn't happen, but if the 2007 * case. This generally shouldn't happen, but if the
2150 * map loads fail below, it could happen. 2008 * map loads fail below, it could happen.
2151 */ 2009 */
2152 if (!m) 2010 if (!m)
… …
2154 2012
2155 if (x < 0) 2013 if (x < 0)
2156 { 2014 {
2157 if (!m->tile_path[3]) 2015 if (!m->tile_path[3])
2158 return 1; 2016 return 1;
2017
2159 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)
2160 {
2161 load_and_link_tiled_map (m, 3); 2019 load_and_link_tiled_map (m, 3);
2162 } 2020
2163 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));
2164 } 2022 }
2165 if (x >= MAP_WIDTH (m)) 2023
2024 if (x >= m->width)
2166 { 2025 {
2167 if (!m->tile_path[1]) 2026 if (!m->tile_path[1])
2168 return 1; 2027 return 1;
2028
2169 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)
2170 {
2171 load_and_link_tiled_map (m, 1); 2030 load_and_link_tiled_map (m, 1);
2172 } 2031
2173 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));
2174 } 2033 }
2034
2175 if (y < 0) 2035 if (y < 0)
2176 { 2036 {
2177 if (!m->tile_path[0]) 2037 if (!m->tile_path[0])
2178 return 1; 2038 return 1;
2039
2179 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)
2180 {
2181 load_and_link_tiled_map (m, 0); 2041 load_and_link_tiled_map (m, 0);
2182 } 2042
2183 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));
2184 } 2044 }
2185 if (y >= MAP_HEIGHT (m)) 2045
2046 if (y >= m->height)
2186 { 2047 {
2187 if (!m->tile_path[2]) 2048 if (!m->tile_path[2])
2188 return 1; 2049 return 1;
2050
2189 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)
2190 {
2191 load_and_link_tiled_map (m, 2); 2052 load_and_link_tiled_map (m, 2);
2192 } 2053
2193 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));
2194 } 2055 }
2195 2056
2196 /* Simple case - coordinates are within this local 2057 /* Simple case - coordinates are within this local
2197 * map. 2058 * map.
2198 */ 2059 */
… …
2212{ 2073{
2213 2074
2214 if (*x < 0) 2075 if (*x < 0)
2215 { 2076 {
2216 if (!m->tile_path[3]) 2077 if (!m->tile_path[3])
2217 return NULL; 2078 return 0;
2218 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)
2219 load_and_link_tiled_map (m, 3); 2080 load_and_link_tiled_map (m, 3);
2220 2081
2221 *x += MAP_WIDTH (m->tile_map[3]); 2082 *x += m->tile_map[3]->width;
2222 return (get_map_from_coord (m->tile_map[3], x, y)); 2083 return (get_map_from_coord (m->tile_map[3], x, y));
2223 } 2084 }
2224 if (*x >= MAP_WIDTH (m)) 2085
2086 if (*x >= m->width)
2225 { 2087 {
2226 if (!m->tile_path[1]) 2088 if (!m->tile_path[1])
2227 return NULL; 2089 return 0;
2090
2228 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)
2229 load_and_link_tiled_map (m, 1); 2092 load_and_link_tiled_map (m, 1);
2230 2093
2231 *x -= MAP_WIDTH (m); 2094 *x -= m->width;
2232 return (get_map_from_coord (m->tile_map[1], x, y)); 2095 return (get_map_from_coord (m->tile_map[1], x, y));
2233 } 2096 }
2097
2234 if (*y < 0) 2098 if (*y < 0)
2235 { 2099 {
2236 if (!m->tile_path[0]) 2100 if (!m->tile_path[0])
2237 return NULL; 2101 return 0;
2102
2238 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)
2239 load_and_link_tiled_map (m, 0); 2104 load_and_link_tiled_map (m, 0);
2240 2105
2241 *y += MAP_HEIGHT (m->tile_map[0]); 2106 *y += m->tile_map[0]->height;
2242 return (get_map_from_coord (m->tile_map[0], x, y)); 2107 return (get_map_from_coord (m->tile_map[0], x, y));
2243 } 2108 }
2244 if (*y >= MAP_HEIGHT (m)) 2109
2110 if (*y >= m->height)
2245 { 2111 {
2246 if (!m->tile_path[2]) 2112 if (!m->tile_path[2])
2247 return NULL; 2113 return 0;
2114
2248 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)
2249 load_and_link_tiled_map (m, 2); 2116 load_and_link_tiled_map (m, 2);
2250 2117
2251 *y -= MAP_HEIGHT (m); 2118 *y -= m->height;
2252 return (get_map_from_coord (m->tile_map[2], x, y)); 2119 return (get_map_from_coord (m->tile_map[2], x, y));
2253 } 2120 }
2254 2121
2255 /* Simple case - coordinates are within this local 2122 /* Simple case - coordinates are within this local
2256 * map. 2123 * map.
… …
2276 2143
2277 } 2144 }
2278 else if (map1->tile_map[0] == map2) 2145 else if (map1->tile_map[0] == map2)
2279 { /* up */ 2146 { /* up */
2280 *dx = 0; 2147 *dx = 0;
2281 *dy = -MAP_HEIGHT (map2); 2148 *dy = -map2->height;
2282 } 2149 }
2283 else if (map1->tile_map[1] == map2) 2150 else if (map1->tile_map[1] == map2)
2284 { /* right */ 2151 { /* right */
2285 *dx = MAP_WIDTH (map1); 2152 *dx = map1->width;
2286 *dy = 0; 2153 *dy = 0;
2287 } 2154 }
2288 else if (map1->tile_map[2] == map2) 2155 else if (map1->tile_map[2] == map2)
2289 { /* down */ 2156 { /* down */
2290 *dx = 0; 2157 *dx = 0;
2291 *dy = MAP_HEIGHT (map1); 2158 *dy = map1->height;
2292 } 2159 }
2293 else if (map1->tile_map[3] == map2) 2160 else if (map1->tile_map[3] == map2)
2294 { /* left */ 2161 { /* left */
2295 *dx = -MAP_WIDTH (map2); 2162 *dx = -map2->width;
2296 *dy = 0; 2163 *dy = 0;
2297 2164
2298 } 2165 }
2299 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)
2300 { /* up right */ 2167 { /* up right */
2301 *dx = MAP_WIDTH (map1->tile_map[0]); 2168 *dx = map1->tile_map[0]->width;
2302 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2169 *dy = -map1->tile_map[0]->height;
2303 } 2170 }
2304 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)
2305 { /* up left */ 2172 { /* up left */
2306 *dx = -MAP_WIDTH (map2); 2173 *dx = -map2->width;
2307 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2174 *dy = -map1->tile_map[0]->height;
2308 } 2175 }
2309 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)
2310 { /* right up */ 2177 { /* right up */
2311 *dx = MAP_WIDTH (map1); 2178 *dx = map1->width;
2312 *dy = -MAP_HEIGHT (map2); 2179 *dy = -map2->height;
2313 } 2180 }
2314 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)
2315 { /* right down */ 2182 { /* right down */
2316 *dx = MAP_WIDTH (map1); 2183 *dx = map1->width;
2317 *dy = MAP_HEIGHT (map1->tile_map[1]); 2184 *dy = map1->tile_map[1]->height;
2318 } 2185 }
2319 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)
2320 { /* down right */ 2187 { /* down right */
2321 *dx = MAP_WIDTH (map1->tile_map[2]); 2188 *dx = map1->tile_map[2]->width;
2322 *dy = MAP_HEIGHT (map1); 2189 *dy = map1->height;
2323 } 2190 }
2324 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)
2325 { /* down left */ 2192 { /* down left */
2326 *dx = -MAP_WIDTH (map2); 2193 *dx = -map2->width;
2327 *dy = MAP_HEIGHT (map1); 2194 *dy = map1->height;
2328 } 2195 }
2329 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)
2330 { /* left up */ 2197 { /* left up */
2331 *dx = -MAP_WIDTH (map1->tile_map[3]); 2198 *dx = -map1->tile_map[3]->width;
2332 *dy = -MAP_HEIGHT (map2); 2199 *dy = -map2->height;
2333 } 2200 }
2334 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)
2335 { /* left down */ 2202 { /* left down */
2336 *dx = -MAP_WIDTH (map1->tile_map[3]); 2203 *dx = -map1->tile_map[3]->width;
2337 *dy = MAP_HEIGHT (map1->tile_map[3]); 2204 *dy = map1->tile_map[3]->height;
2338 2205
2339 } 2206 }
2340 else 2207 else
2341 { /* not "adjacent" enough */ 2208 { /* not "adjacent" enough */
2342 return 0; 2209 return 0;
… …
2467{ 2334{
2468 int dx, dy; 2335 int dx, dy;
2469 2336
2470 return adjacent_map (op1->map, op2->map, &dx, &dy); 2337 return adjacent_map (op1->map, op2->map, &dx, &dy);
2471} 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