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.30 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.46 by root, Wed Dec 20 11:36:38 2006 UTC

… …
24 24
25#include <global.h> 25#include <global.h>
26#include <funcpoint.h> 26#include <funcpoint.h>
27 27
28#include <loader.h> 28#include <loader.h>
29#ifndef WIN32 /* ---win32 exclude header */
30# include <unistd.h> 29#include <unistd.h>
31#endif /* win32 */
32 30
33#include "path.h" 31#include "path.h"
34 32
35
36extern int nrofallocobjects, nroffreeobjects;
37
38/* 33/*
39 * Returns the mapstruct which has a name matching the given argument. 34 * Returns the maptile which has a name matching the given argument.
40 * return NULL if no match is found. 35 * return NULL if no match is found.
41 */ 36 */
42 37
43mapstruct * 38maptile *
44has_been_loaded (const char *name) 39has_been_loaded (const char *name)
45{ 40{
46 mapstruct *map; 41 maptile *map;
47 42
48 if (!name || !*name) 43 if (!name || !*name)
49 return 0; 44 return 0;
50 for (map = first_map; map; map = map->next) 45 for (map = first_map; map; map = map->next)
51 if (!strcmp (name, map->path)) 46 if (!strcmp (name, map->path))
… …
159int 154int
160check_path (const char *name, int prepend_dir) 155check_path (const char *name, int prepend_dir)
161{ 156{
162 char buf[MAX_BUF]; 157 char buf[MAX_BUF];
163 158
164#ifndef WIN32
165 char *endbuf; 159 char *endbuf;
166 struct stat statbuf; 160 struct stat statbuf;
167 int mode = 0; 161 int mode = 0;
168#endif
169 162
170 if (prepend_dir) 163 if (prepend_dir)
171 strcpy (buf, create_pathname (name)); 164 strcpy (buf, create_pathname (name));
172 else 165 else
173 strcpy (buf, name); 166 strcpy (buf, name);
174#ifdef WIN32 /* ***win32: check this sucker in windows style. */
175 return (_access (buf, 0));
176#else
177 167
178 /* old method (strchr(buf, '\0')) seemd very odd to me - 168 /* old method (strchr(buf, '\0')) seemd very odd to me -
179 * this method should be equivalant and is clearer. 169 * this method should be equivalant and is clearer.
180 * Can not use strcat because we need to cycle through 170 * Can not use strcat because we need to cycle through
181 * all the names. 171 * all the names.
… …
194 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || 184 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
195 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH)) 185 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
196 mode |= 2; 186 mode |= 2;
197 187
198 return (mode); 188 return (mode);
199#endif
200} 189}
201 190
202/* 191/*
203 * Prints out debug-information about a map. 192 * Prints out debug-information about a map.
204 * Dumping these at llevError doesn't seem right, but is 193 * Dumping these at llevError doesn't seem right, but is
205 * necessary to make sure the information is in fact logged. 194 * necessary to make sure the information is in fact logged.
206 */ 195 */
207 196
208void 197void
209dump_map (const mapstruct *m) 198dump_map (const maptile *m)
210{ 199{
211 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);
212 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", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m));
213 202
214 if (m->msg != NULL) 203 if (m->msg != NULL)
… …
231 */ 220 */
232 221
233void 222void
234dump_all_maps (void) 223dump_all_maps (void)
235{ 224{
236 mapstruct *m; 225 maptile *m;
237 226
238 for (m = first_map; m != NULL; m = m->next) 227 for (m = first_map; m; m = m->next)
239 {
240 dump_map (m); 228 dump_map (m);
241 }
242} 229}
243 230
244/* This rolls up wall, blocks_magic, blocks_view, etc, all into 231/* This rolls up wall, blocks_magic, blocks_view, etc, all into
245 * one function that just returns a P_.. value (see map.h) 232 * one function that just returns a P_.. value (see map.h)
246 * it will also do map translation for tiled maps, returning 233 * it will also do map translation for tiled maps, returning
… …
250 * 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
251 * checking for the existence of something on those spaces, but 238 * checking for the existence of something on those spaces, but
252 * don't expect to insert/remove anything from those spaces. 239 * don't expect to insert/remove anything from those spaces.
253 */ 240 */
254int 241int
255get_map_flags (mapstruct *oldmap, mapstruct **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) 242get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
256{ 243{
257 sint16 newx, newy; 244 sint16 newx, newy;
258 int retval = 0; 245 int retval = 0;
259 mapstruct *mp; 246 maptile *mp;
260 247
261 if (out_of_map (oldmap, x, y))
262 return P_OUT_OF_MAP;
263 newx = x; 248 newx = x;
264 newy = y; 249 newy = y;
250
265 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
266 if (mp != oldmap) 256 if (mp != oldmap)
267 retval |= P_NEW_MAP; 257 retval |= P_NEW_MAP;
268 if (newmap)
269 *newmap = mp;
270 if (nx)
271 *nx = newx;
272 if (ny)
273 *ny = newy;
274 258
275 retval |= mp->spaces[newx + mp->width * newy].flags; 259 if (newmap) *newmap = mp;
260 if (nx) *nx = newx;
261 if (ny) *ny = newy;
276 262
277 return retval; 263 return retval | mp->at (newx, newy).flags ();
278} 264}
279
280 265
281/* 266/*
282 * Returns true if the given coordinate is blocked except by the 267 * Returns true if the given coordinate is blocked except by the
283 * object passed is not blocking. This is used with 268 * object passed is not blocking. This is used with
284 * multipart monsters - if we want to see if a 2x2 monster 269 * multipart monsters - if we want to see if a 2x2 monster
… …
288 * monster. 273 * monster.
289 * m, x, y are the target map/coordinates - needed for map tiling. 274 * m, x, y are the target map/coordinates - needed for map tiling.
290 * the coordinates & map passed in should have been updated for tiling 275 * the coordinates & map passed in should have been updated for tiling
291 * by the caller. 276 * by the caller.
292 */ 277 */
293
294int 278int
295blocked_link (object *ob, mapstruct *m, int sx, int sy) 279blocked_link (object *ob, maptile *m, int sx, int sy)
296{ 280{
297 object *tmp; 281 object *tmp;
298 int mflags, blocked; 282 int mflags, blocked;
299 283
300 /* Make sure the coordinates are valid - they should be, as caller should 284 /* Make sure the coordinates are valid - they should be, as caller should
… …
307 } 291 }
308 292
309 /* 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
310 * directly. 294 * directly.
311 */ 295 */
312 mflags = m->spaces[sx + m->width * sy].flags; 296 mflags = m->at (sx, sy).flags ();
313 297
314 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 298 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
315 299
316 /* If space is currently not blocked by anything, no need to 300 /* If space is currently not blocked by anything, no need to
317 * go further. Not true for players - all sorts of special 301 * go further. Not true for players - all sorts of special
… …
336 /* 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
337 * 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
338 * true. If we get through the entire stack, that must mean 322 * true. If we get through the entire stack, that must mean
339 * ob is blocking it, so return 0. 323 * ob is blocking it, so return 0.
340 */ 324 */
341 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)
342 { 326 {
343 327
344 /* This must be before the checks below. Code for inventory checkers. */ 328 /* This must be before the checks below. Code for inventory checkers. */
345 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 329 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
346 { 330 {
… …
410 * 394 *
411 * Note this used to be arch_blocked, but with new movement 395 * Note this used to be arch_blocked, but with new movement
412 * 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
413 * against the move_block values. 397 * against the move_block values.
414 */ 398 */
415
416int 399int
417ob_blocked (const object *ob, mapstruct *m, sint16 x, sint16 y) 400ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
418{ 401{
419 archetype *tmp; 402 archetype *tmp;
420 int flag; 403 int flag;
421 mapstruct *m1; 404 maptile *m1;
422 sint16 sx, sy; 405 sint16 sx, sy;
423 406
424 if (ob == NULL) 407 if (ob == NULL)
425 { 408 {
426 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 409 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
… …
450 433
451 /* 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
452 * head of the object should correspond for the entire object. 435 * head of the object should correspond for the entire object.
453 */ 436 */
454 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 437 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy)))
455 return AB_NO_PASS; 438 return P_NO_PASS;
456
457 } 439 }
440
458 return 0; 441 return 0;
459} 442}
460 443
461/* 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
462 * 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
… …
491 * 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
492 * the more sections and not re-add sections for them. 475 * the more sections and not re-add sections for them.
493 */ 476 */
494 477
495static void 478static void
496link_multipart_objects (mapstruct *m) 479link_multipart_objects (maptile *m)
497{ 480{
498 int x, y; 481 int x, y;
499 object *tmp, *op, *last, *above; 482 object *tmp, *op, *last, *above;
500 archetype *at; 483 archetype *at;
501 484
502 for (x = 0; x < MAP_WIDTH (m); x++) 485 for (x = 0; x < MAP_WIDTH (m); x++)
503 for (y = 0; y < MAP_HEIGHT (m); y++) 486 for (y = 0; y < MAP_HEIGHT (m); y++)
504 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 487 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
505 { 488 {
506 above = tmp->above; 489 above = tmp->above;
507 490
508 /* already multipart - don't do anything more */ 491 /* already multipart - don't do anything more */
509 if (tmp->head || tmp->more) 492 if (tmp->head || tmp->more)
… …
538 * Loads (ands parses) the objects into a given map from the specified 521 * Loads (ands parses) the objects into a given map from the specified
539 * file pointer. 522 * file pointer.
540 * mapflags is the same as we get with load_original_map 523 * mapflags is the same as we get with load_original_map
541 */ 524 */
542void 525void
543load_objects (mapstruct *m, object_thawer & fp, int mapflags) 526load_objects (maptile *m, object_thawer & fp, int mapflags)
544{ 527{
545 int i, j; 528 int i, j;
546 int unique; 529 int unique;
547 object *op, *prev = NULL, *last_more = NULL, *otmp; 530 object *op, *prev = NULL, *last_more = NULL, *otmp;
548 531
549 op = get_object (); 532 op = object::create ();
550 op->map = m; /* To handle buttons correctly */ 533 op->map = m; /* To handle buttons correctly */
551 534
552 while ((i = load_object (fp, op, mapflags))) 535 while ((i = load_object (fp, op, mapflags)))
553 { 536 {
554 /* if the archetype for the object is null, means that we 537 /* if the archetype for the object is null, means that we
… …
562 } 545 }
563 546
564 547
565 switch (i) 548 switch (i)
566 { 549 {
567 case LL_NORMAL: 550 case LL_NORMAL:
568 /* if we are loading an overlay, put the floors on the bottom */ 551 /* if we are loading an overlay, put the floors on the bottom */
569 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) 552 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
570 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); 553 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
571 else 554 else
572 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 555 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
573 556
574 if (op->inv) 557 if (op->inv)
575 sum_weight (op); 558 sum_weight (op);
576 559
577 prev = op, last_more = op; 560 prev = op, last_more = op;
578 break; 561 break;
579 562
580 case LL_MORE: 563 case LL_MORE:
581 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 564 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
582 op->head = prev, last_more->more = op, last_more = op; 565 op->head = prev, last_more->more = op, last_more = op;
583 break; 566 break;
584 } 567 }
585 568
586 if (mapflags & MAP_STYLE) 569 if (mapflags & MAP_STYLE)
587 remove_from_active_list (op); 570 remove_from_active_list (op);
588 571
589 op = get_object (); 572 op = object::create ();
590 op->map = m; 573 op->map = m;
591 } 574 }
592 575
593 for (i = 0; i < m->width; i++) 576 for (i = 0; i < m->width; i++)
594 { 577 {
595 for (j = 0; j < m->height; j++) 578 for (j = 0; j < m->height; j++)
596 { 579 {
597 unique = 0; 580 unique = 0;
598 /* check for unique items, or unique squares */ 581 /* check for unique items, or unique squares */
599 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 582 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
600 { 583 {
601 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 584 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
602 unique = 1; 585 unique = 1;
586
603 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 587 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
604 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 588 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
605 } 589 }
606 } 590 }
607 } 591 }
608 592
609 free_object (op); 593 op->destroy ();
610 link_multipart_objects (m); 594 link_multipart_objects (m);
611} 595}
612 596
613/* This saves all the objects on the map in a non destructive fashion. 597/* This saves all the objects on the map in a non destructive fashion.
614 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 598 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
615 * and we only save the head of multi part objects - this is needed 599 * and we only save the head of multi part objects - this is needed
616 * in order to do map tiling properly. 600 * in order to do map tiling properly.
617 */ 601 */
618void 602void
619save_objects (mapstruct *m, object_freezer & fp, object_freezer & fp2, int flag) 603save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag)
620{ 604{
621 int i, j = 0, unique = 0; 605 int i, j = 0, unique = 0;
622 object *op; 606 object *op;
623 607
624 /* first pass - save one-part objects */ 608 /* first pass - save one-part objects */
625 for (i = 0; i < MAP_WIDTH (m); i++) 609 for (i = 0; i < MAP_WIDTH (m); i++)
626 for (j = 0; j < MAP_HEIGHT (m); j++) 610 for (j = 0; j < MAP_HEIGHT (m); j++)
627 { 611 {
628 unique = 0; 612 unique = 0;
629 for (op = get_map_ob (m, i, j); op; op = op->above) 613 for (op = GET_MAP_OB (m, i, j); op; op = op->above)
630 { 614 {
631 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 615 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
632 unique = 1; 616 unique = 1;
633 617
634 if (op->type == PLAYER) 618 if (op->type == PLAYER)
635 {
636 LOG (llevDebug, "Player on map that is being saved\n");
637 continue; 619 continue;
638 }
639 620
640 if (op->head || op->owner) 621 if (op->head || op->owner)
641 continue; 622 continue;
642 623
643 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 624 if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
644 save_object (fp2, op, 3); 625 save_object (fp2, op, 3);
645 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 626 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID))))
646 save_object (fp, op, 3); 627 save_object (fp, op, 3);
628 }
629 }
630}
647 631
648 } /* for this space */ 632maptile::maptile ()
649 } /* for this j */ 633{
634 in_memory = MAP_SWAPPED;
635 /* The maps used to pick up default x and y values from the
636 * map archetype. Mimic that behaviour.
637 */
638 MAP_WIDTH (this) = 16;
639 MAP_HEIGHT (this) = 16;
640 MAP_RESET_TIMEOUT (this) = 0;
641 MAP_TIMEOUT (this) = 300;
642 MAP_ENTER_X (this) = 0;
643 MAP_ENTER_Y (this) = 0;
644 /*set part to -1 indicating conversion to weather map not yet done */
645 MAP_WORLDPARTX (this) = -1;
646 MAP_WORLDPARTY (this) = -1;
650} 647}
651 648
652/* 649/*
653 * Allocates, initialises, and returns a pointer to a mapstruct. 650 * Allocates, initialises, and returns a pointer to a maptile.
654 * Modified to no longer take a path option which was not being 651 * Modified to no longer take a path option which was not being
655 * used anyways. MSW 2001-07-01 652 * used anyways. MSW 2001-07-01
656 */ 653 */
657 654maptile *
658mapstruct *
659get_linked_map (void) 655get_linked_map (void)
660{ 656{
661 mapstruct *map = new mapstruct; 657 maptile *mp, *map = new maptile;
662 mapstruct *mp;
663 658
664 for (mp = first_map; mp != NULL && mp->next != NULL; mp = mp->next); 659 for (mp = first_map; mp && mp->next; mp = mp->next);
660
665 if (mp == NULL) 661 if (mp == NULL)
666 first_map = map; 662 first_map = map;
667 else 663 else
668 mp->next = map; 664 mp->next = map;
669 665
670 map->in_memory = MAP_SWAPPED;
671 /* The maps used to pick up default x and y values from the
672 * map archetype. Mimic that behaviour.
673 */
674 MAP_WIDTH (map) = 16;
675 MAP_HEIGHT (map) = 16;
676 MAP_RESET_TIMEOUT (map) = 0;
677 MAP_TIMEOUT (map) = 300;
678 MAP_ENTER_X (map) = 0;
679 MAP_ENTER_Y (map) = 0;
680 /*set part to -1 indicating conversion to weather map not yet done */
681 MAP_WORLDPARTX (map) = -1;
682 MAP_WORLDPARTY (map) = -1;
683 return map; 666 return map;
684} 667}
685 668
686/* 669/*
687 * Allocates the arrays contained in a mapstruct. 670 * Allocates the arrays contained in a maptile.
688 * This basically allocates the dynamic array of spaces for the 671 * This basically allocates the dynamic array of spaces for the
689 * map. 672 * map.
690 */ 673 */
691
692void 674void
693allocate_map (mapstruct *m) 675maptile::allocate ()
694{ 676{
695 m->in_memory = MAP_IN_MEMORY; 677 in_memory = MAP_IN_MEMORY;
678
696 /* Log this condition and free the storage. We could I suppose 679 /* Log this condition and free the storage. We could I suppose
697 * realloc, but if the caller is presuming the data will be intact, 680 * realloc, but if the caller is presuming the data will be intact,
698 * that is their poor assumption. 681 * that is their poor assumption.
699 */ 682 */
700 if (m->spaces) 683 if (spaces)
701 { 684 {
702 LOG (llevError, "allocate_map called with already allocated map (%s)\n", m->path); 685 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
703 free (m->spaces); 686 free (spaces);
704 } 687 }
705 688
706 m->spaces = (MapSpace *) calloc (1, MAP_WIDTH (m) * MAP_HEIGHT (m) * sizeof (MapSpace)); 689 spaces = (mapspace *)
690 calloc (1, width * height * sizeof (mapspace));
707 691
708 if (m->spaces == NULL) 692 if (!spaces)
709 fatal (OUT_OF_MEMORY); 693 fatal (OUT_OF_MEMORY);
710} 694}
711 695
712/* Create and returns a map of the specific size. Used 696/* Create and returns a map of the specific size. Used
713 * in random map code and the editor. 697 * in random map code and the editor.
714 */ 698 */
715mapstruct * 699maptile *
716get_empty_map (int sizex, int sizey) 700get_empty_map (int sizex, int sizey)
717{ 701{
718 mapstruct *m = get_linked_map (); 702 maptile *m = get_linked_map ();
719 703
720 m->width = sizex; 704 m->width = sizex;
721 m->height = sizey; 705 m->height = sizey;
722 m->in_memory = MAP_SWAPPED; 706 m->in_memory = MAP_SWAPPED;
723 allocate_map (m); 707 m->allocate ();
708
724 return m; 709 return m;
725} 710}
726 711
727/* Takes a string from a map definition and outputs a pointer to the array of shopitems 712/* Takes a string from a map definition and outputs a pointer to the array of shopitems
728 * corresponding to that string. Memory is allocated for this, it must be freed 713 * corresponding to that string. Memory is allocated for this, it must be freed
… …
736 char *shop_string, *p, *q, *next_semicolon, *next_colon; 721 char *shop_string, *p, *q, *next_semicolon, *next_colon;
737 shopitems *items = NULL; 722 shopitems *items = NULL;
738 int i = 0, number_of_entries = 0; 723 int i = 0, number_of_entries = 0;
739 const typedata *current_type; 724 const typedata *current_type;
740 725
741 shop_string = strdup_local (input_string); 726 shop_string = strdup (input_string);
742 p = shop_string; 727 p = shop_string;
743 /* first we'll count the entries, we'll need that for allocating the array shortly */ 728 /* first we'll count the entries, we'll need that for allocating the array shortly */
744 while (p) 729 while (p)
745 { 730 {
746 p = strchr (p, ';'); 731 p = strchr (p, ';');
… …
805} 790}
806 791
807/* opposite of parse string, this puts the string that was originally fed in to 792/* opposite of parse string, this puts the string that was originally fed in to
808 * the map (or something equivilent) into output_string. */ 793 * the map (or something equivilent) into output_string. */
809static void 794static void
810print_shop_string (mapstruct *m, char *output_string) 795print_shop_string (maptile *m, char *output_string)
811{ 796{
812 int i; 797 int i;
813 char tmp[MAX_BUF]; 798 char tmp[MAX_BUF];
814 799
815 strcpy (output_string, ""); 800 strcpy (output_string, "");
… …
849 * MSW 2001-07-01 834 * MSW 2001-07-01
850 * return 0 on success, 1 on failure. 835 * return 0 on success, 1 on failure.
851 */ 836 */
852 837
853static int 838static int
854load_map_header (object_thawer & fp, mapstruct *m) 839load_map_header (object_thawer & fp, maptile *m)
855{ 840{
856 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; 841 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
857 int msgpos = 0; 842 int msgpos = 0;
858 int maplorepos = 0; 843 int maplorepos = 0;
859 844
860 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 845 while (fgets (buf, HUGE_BUF, fp) != NULL)
861 { 846 {
862 buf[HUGE_BUF - 1] = 0; 847 buf[HUGE_BUF - 1] = 0;
863 key = buf; 848 key = buf;
849
864 while (isspace (*key)) 850 while (isspace (*key))
865 key++; 851 key++;
852
866 if (*key == 0) 853 if (*key == 0)
867 continue; /* empty line */ 854 continue; /* empty line */
855
868 value = strchr (key, ' '); 856 value = strchr (key, ' ');
857
869 if (!value) 858 if (!value)
870 { 859 {
871 end = strchr (key, '\n'); 860 if ((end = strchr (key, '\n')))
872 if (end != NULL)
873 {
874 *end = 0; 861 *end = 0;
875 }
876 } 862 }
877 else 863 else
878 { 864 {
879 *value = 0; 865 *value = 0;
880 value++; 866 value++;
881 end = strchr (value, '\n'); 867 end = strchr (value, '\n');
868
882 while (isspace (*value)) 869 while (isspace (*value))
883 { 870 {
884 value++; 871 value++;
872
885 if (*value == '\0' || value == end) 873 if (*value == '\0' || value == end)
886 { 874 {
887 /* Nothing but spaces. */ 875 /* Nothing but spaces. */
888 value = NULL; 876 value = NULL;
889 break; 877 break;
… …
912 * that use the parameter. 900 * that use the parameter.
913 */ 901 */
914 902
915 if (!strcmp (key, "msg")) 903 if (!strcmp (key, "msg"))
916 { 904 {
917 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 905 while (fgets (buf, HUGE_BUF, fp) != NULL)
918 { 906 {
919 if (!strcmp (buf, "endmsg\n")) 907 if (!strcmp (buf, "endmsg\n"))
920 break; 908 break;
921 else 909 else
922 { 910 {
… …
929 * with nothing between). There is no reason in those cases to 917 * with nothing between). There is no reason in those cases to
930 * keep the empty message. Also, msgbuf contains garbage data 918 * keep the empty message. Also, msgbuf contains garbage data
931 * when msgpos is zero, so copying it results in crashes 919 * when msgpos is zero, so copying it results in crashes
932 */ 920 */
933 if (msgpos != 0) 921 if (msgpos != 0)
934 m->msg = strdup_local (msgbuf); 922 m->msg = strdup (msgbuf);
935 } 923 }
936 else if (!strcmp (key, "maplore")) 924 else if (!strcmp (key, "maplore"))
937 { 925 {
938 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 926 while (fgets (buf, HUGE_BUF, fp) != NULL)
939 { 927 {
940 if (!strcmp (buf, "endmaplore\n")) 928 if (!strcmp (buf, "endmaplore\n"))
941 break; 929 break;
942 else 930 else
943 { 931 {
… …
945 strcpy (maplorebuf + maplorepos, buf); 933 strcpy (maplorebuf + maplorepos, buf);
946 maplorepos += strlen (buf); 934 maplorepos += strlen (buf);
947 } 935 }
948 } 936 }
949 if (maplorepos != 0) 937 if (maplorepos != 0)
950 m->maplore = strdup_local (maplorebuf); 938 m->maplore = strdup (maplorebuf);
951 } 939 }
952 else if (!strcmp (key, "end")) 940 else if (!strcmp (key, "end"))
953 { 941 {
954 break; 942 break;
955 } 943 }
… …
964 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); 952 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
965 } 953 }
966 else if (!strcmp (key, "name")) 954 else if (!strcmp (key, "name"))
967 { 955 {
968 *end = 0; 956 *end = 0;
969 m->name = strdup_local (value); 957 m->name = strdup (value);
970 } 958 }
971 /* first strcmp value on these are old names supported 959 /* first strcmp value on these are old names supported
972 * for compatibility reasons. The new values (second) are 960 * for compatibility reasons. The new values (second) are
973 * what really should be used. 961 * what really should be used.
974 */ 962 */
975 else if (!strcmp (key, "oid")) 963 else if (!strcmp (key, "oid"))
976 {
977 fp.get (m, atoi (value)); 964 fp.get (m, atoi (value));
978 }
979 else if (!strcmp (key, "attach")) 965 else if (!strcmp (key, "attach"))
980 {
981 m->attach = value; 966 m->attach = value;
982 }
983 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) 967 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
984 {
985 m->enter_x = atoi (value); 968 m->enter_x = atoi (value);
986 }
987 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) 969 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
988 {
989 m->enter_y = atoi (value); 970 m->enter_y = atoi (value);
990 }
991 else if (!strcmp (key, "x") || !strcmp (key, "width")) 971 else if (!strcmp (key, "x") || !strcmp (key, "width"))
992 {
993 m->width = atoi (value); 972 m->width = atoi (value);
994 }
995 else if (!strcmp (key, "y") || !strcmp (key, "height")) 973 else if (!strcmp (key, "y") || !strcmp (key, "height"))
996 {
997 m->height = atoi (value); 974 m->height = atoi (value);
998 }
999 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) 975 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
1000 {
1001 m->reset_timeout = atoi (value); 976 m->reset_timeout = atoi (value);
1002 }
1003 else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) 977 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1004 {
1005 m->timeout = atoi (value); 978 m->timeout = atoi (value);
1006 }
1007 else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) 979 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1008 { 980 m->difficulty = clamp (atoi (value), 1, settings.max_level);
1009 m->difficulty = atoi (value);
1010 }
1011 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) 981 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1012 {
1013 m->darkness = atoi (value); 982 m->darkness = atoi (value);
1014 }
1015 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) 983 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1016 {
1017 m->fixed_resettime = atoi (value); 984 m->fixed_resettime = atoi (value);
1018 }
1019 else if (!strcmp (key, "unique")) 985 else if (!strcmp (key, "unique"))
1020 {
1021 m->unique = atoi (value); 986 m->unique = atoi (value);
1022 }
1023 else if (!strcmp (key, "template")) 987 else if (!strcmp (key, "template"))
1024 {
1025 m->templatemap = atoi (value); 988 m->templatemap = atoi (value);
1026 }
1027 else if (!strcmp (key, "region")) 989 else if (!strcmp (key, "region"))
1028 {
1029 m->region = get_region_by_name (value); 990 m->region = get_region_by_name (value);
1030 }
1031 else if (!strcmp (key, "shopitems")) 991 else if (!strcmp (key, "shopitems"))
1032 { 992 {
1033 *end = 0; 993 *end = 0;
1034 m->shopitems = parse_shop_string (value); 994 m->shopitems = parse_shop_string (value);
1035 } 995 }
1036 else if (!strcmp (key, "shopgreed")) 996 else if (!strcmp (key, "shopgreed"))
1037 {
1038 m->shopgreed = atof (value); 997 m->shopgreed = atof (value);
1039 }
1040 else if (!strcmp (key, "shopmin")) 998 else if (!strcmp (key, "shopmin"))
1041 {
1042 m->shopmin = atol (value); 999 m->shopmin = atol (value);
1043 }
1044 else if (!strcmp (key, "shopmax")) 1000 else if (!strcmp (key, "shopmax"))
1045 {
1046 m->shopmax = atol (value); 1001 m->shopmax = atol (value);
1047 }
1048 else if (!strcmp (key, "shoprace")) 1002 else if (!strcmp (key, "shoprace"))
1049 { 1003 {
1050 *end = 0; 1004 *end = 0;
1051 m->shoprace = strdup_local (value); 1005 m->shoprace = strdup (value);
1052 } 1006 }
1053 else if (!strcmp (key, "outdoor")) 1007 else if (!strcmp (key, "outdoor"))
1054 {
1055 m->outdoor = atoi (value); 1008 m->outdoor = atoi (value);
1056 }
1057 else if (!strcmp (key, "temp")) 1009 else if (!strcmp (key, "temp"))
1058 {
1059 m->temp = atoi (value); 1010 m->temp = atoi (value);
1060 }
1061 else if (!strcmp (key, "pressure")) 1011 else if (!strcmp (key, "pressure"))
1062 {
1063 m->pressure = atoi (value); 1012 m->pressure = atoi (value);
1064 }
1065 else if (!strcmp (key, "humid")) 1013 else if (!strcmp (key, "humid"))
1066 {
1067 m->humid = atoi (value); 1014 m->humid = atoi (value);
1068 }
1069 else if (!strcmp (key, "windspeed")) 1015 else if (!strcmp (key, "windspeed"))
1070 {
1071 m->windspeed = atoi (value); 1016 m->windspeed = atoi (value);
1072 }
1073 else if (!strcmp (key, "winddir")) 1017 else if (!strcmp (key, "winddir"))
1074 {
1075 m->winddir = atoi (value); 1018 m->winddir = atoi (value);
1076 }
1077 else if (!strcmp (key, "sky")) 1019 else if (!strcmp (key, "sky"))
1078 {
1079 m->sky = atoi (value); 1020 m->sky = atoi (value);
1080 }
1081 else if (!strcmp (key, "nosmooth")) 1021 else if (!strcmp (key, "nosmooth"))
1082 {
1083 m->nosmooth = atoi (value); 1022 m->nosmooth = atoi (value);
1084 }
1085 else if (!strncmp (key, "tile_path_", 10)) 1023 else if (!strncmp (key, "tile_path_", 10))
1086 { 1024 {
1087 int tile = atoi (key + 10); 1025 int tile = atoi (key + 10);
1088 1026
1089 if (tile < 1 || tile > 4) 1027 if (tile < 1 || tile > 4)
… …
1122 } 1060 }
1123 1061
1124 if (editor) 1062 if (editor)
1125 { 1063 {
1126 /* Use the value as in the file. */ 1064 /* Use the value as in the file. */
1127 m->tile_path[tile - 1] = strdup_local (value); 1065 m->tile_path[tile - 1] = strdup (value);
1128 } 1066 }
1129 else if (path != NULL) 1067 else if (path != NULL)
1130 { 1068 {
1131 /* Use the normalized value. */ 1069 /* Use the normalized value. */
1132 m->tile_path[tile - 1] = strdup_local (path); 1070 m->tile_path[tile - 1] = strdup (path);
1133 } 1071 }
1134 } /* end if tile direction (in)valid */ 1072 } /* end if tile direction (in)valid */
1135 } 1073 }
1136 else 1074 else
1137 {
1138 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); 1075 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1139 }
1140 } 1076 }
1077
1141 if (!key || strcmp (key, "end")) 1078 if (!key || strcmp (key, "end"))
1142 { 1079 {
1143 LOG (llevError, "Got premature eof on map header!\n"); 1080 LOG (llevError, "Got premature eof on map header!\n");
1144 return 1; 1081 return 1;
1145 } 1082 }
1083
1146 return 0; 1084 return 0;
1147} 1085}
1148 1086
1149/* 1087/*
1150 * Opens the file "filename" and reads information about the map 1088 * Opens the file "filename" and reads information about the map
1151 * from the given file, and stores it in a newly allocated 1089 * from the given file, and stores it in a newly allocated
1152 * mapstruct. A pointer to this structure is returned, or NULL on failure. 1090 * maptile. A pointer to this structure is returned, or NULL on failure.
1153 * flags correspond to those in map.h. Main ones used are 1091 * flags correspond to those in map.h. Main ones used are
1154 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and 1092 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1155 * MAP_BLOCK, in which case we block on this load. This happens in all 1093 * MAP_BLOCK, in which case we block on this load. This happens in all
1156 * cases, no matter if this flag is set or not. 1094 * cases, no matter if this flag is set or not.
1157 * MAP_STYLE: style map - don't add active objects, don't add to server 1095 * MAP_STYLE: style map - don't add active objects, don't add to server
1158 * managed map list. 1096 * managed map list.
1159 */ 1097 */
1160 1098
1161mapstruct * 1099maptile *
1162load_original_map (const char *filename, int flags) 1100load_original_map (const char *filename, int flags)
1163{ 1101{
1164 mapstruct *m; 1102 maptile *m;
1165 char pathname[MAX_BUF]; 1103 char pathname[MAX_BUF];
1166 1104
1167 if (flags & MAP_PLAYER_UNIQUE) 1105 if (flags & MAP_PLAYER_UNIQUE)
1168 strcpy (pathname, filename); 1106 strcpy (pathname, filename);
1169 else if (flags & MAP_OVERLAY) 1107 else if (flags & MAP_OVERLAY)
… …
1186 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1124 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1187 delete_map (m); 1125 delete_map (m);
1188 return NULL; 1126 return NULL;
1189 } 1127 }
1190 1128
1191 allocate_map (m); 1129 m->allocate ();
1192 1130
1193 m->in_memory = MAP_LOADING; 1131 m->in_memory = MAP_LOADING;
1194 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1132 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1195 1133
1196 m->in_memory = MAP_IN_MEMORY; 1134 m->in_memory = MAP_IN_MEMORY;
… …
1205 * Loads a map, which has been loaded earlier, from file. 1143 * Loads a map, which has been loaded earlier, from file.
1206 * Return the map object we load into (this can change from the passed 1144 * Return the map object we load into (this can change from the passed
1207 * option if we can't find the original map) 1145 * option if we can't find the original map)
1208 */ 1146 */
1209 1147
1210static mapstruct * 1148static maptile *
1211load_temporary_map (mapstruct *m) 1149load_temporary_map (maptile *m)
1212{ 1150{
1213 char buf[MAX_BUF]; 1151 char buf[MAX_BUF];
1214 1152
1215 if (!m->tmpname) 1153 if (!m->tmpname)
1216 { 1154 {
… …
1242 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname); 1180 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1243 delete_map (m); 1181 delete_map (m);
1244 m = load_original_map (m->path, 0); 1182 m = load_original_map (m->path, 0);
1245 return NULL; 1183 return NULL;
1246 } 1184 }
1185
1247 allocate_map (m); 1186 m->allocate ();
1248 1187
1249 m->in_memory = MAP_LOADING; 1188 m->in_memory = MAP_LOADING;
1250 load_objects (m, thawer, 0); 1189 load_objects (m, thawer, 0);
1251 1190
1252 m->in_memory = MAP_IN_MEMORY; 1191 m->in_memory = MAP_IN_MEMORY;
… …
1258 * Loads a map, which has been loaded earlier, from file. 1197 * Loads a map, which has been loaded earlier, from file.
1259 * Return the map object we load into (this can change from the passed 1198 * Return the map object we load into (this can change from the passed
1260 * option if we can't find the original map) 1199 * option if we can't find the original map)
1261 */ 1200 */
1262 1201
1263mapstruct * 1202maptile *
1264load_overlay_map (const char *filename, mapstruct *m) 1203load_overlay_map (const char *filename, maptile *m)
1265{ 1204{
1266 char pathname[MAX_BUF]; 1205 char pathname[MAX_BUF];
1267 1206
1268 strcpy (pathname, create_overlay_pathname (filename)); 1207 strcpy (pathname, create_overlay_pathname (filename));
1269 1208
… …
1277 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1216 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1278 delete_map (m); 1217 delete_map (m);
1279 m = load_original_map (m->path, 0); 1218 m = load_original_map (m->path, 0);
1280 return NULL; 1219 return NULL;
1281 } 1220 }
1282 /*allocate_map(m); */ 1221 /*m->allocate ();*/
1283 1222
1284 m->in_memory = MAP_LOADING; 1223 m->in_memory = MAP_LOADING;
1285 load_objects (m, thawer, MAP_OVERLAY); 1224 load_objects (m, thawer, MAP_OVERLAY);
1286 1225
1287 m->in_memory = MAP_IN_MEMORY; 1226 m->in_memory = MAP_IN_MEMORY;
… …
1292 * This is the start of unique map handling code 1231 * This is the start of unique map handling code
1293 *****************************************************************************/ 1232 *****************************************************************************/
1294 1233
1295/* This goes through map 'm' and removed any unique items on the map. */ 1234/* This goes through map 'm' and removed any unique items on the map. */
1296static void 1235static void
1297delete_unique_items (mapstruct *m) 1236delete_unique_items (maptile *m)
1298{ 1237{
1299 int i, j, unique; 1238 int i, j, unique;
1300 object *op, *next; 1239 object *op, *next;
1301 1240
1302 for (i = 0; i < MAP_WIDTH (m); i++) 1241 for (i = 0; i < MAP_WIDTH (m); i++)
1303 for (j = 0; j < MAP_HEIGHT (m); j++) 1242 for (j = 0; j < MAP_HEIGHT (m); j++)
1304 { 1243 {
1305 unique = 0; 1244 unique = 0;
1245
1306 for (op = get_map_ob (m, i, j); op; op = next) 1246 for (op = GET_MAP_OB (m, i, j); op; op = next)
1307 { 1247 {
1308 next = op->above; 1248 next = op->above;
1249
1309 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1250 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1310 unique = 1; 1251 unique = 1;
1252
1311 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1253 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1312 { 1254 {
1313 clean_object (op); 1255 clean_object (op);
1256
1314 if (QUERY_FLAG (op, FLAG_IS_LINKED)) 1257 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1315 remove_button_link (op); 1258 remove_button_link (op);
1316 remove_ob (op); 1259
1317 free_object (op); 1260 op->destroy ();
1318 } 1261 }
1319 } 1262 }
1320 } 1263 }
1321} 1264}
1322 1265
… …
1324/* 1267/*
1325 * Loads unique objects from file(s) into the map which is in memory 1268 * Loads unique objects from file(s) into the map which is in memory
1326 * m is the map to load unique items into. 1269 * m is the map to load unique items into.
1327 */ 1270 */
1328static void 1271static void
1329load_unique_objects (mapstruct *m) 1272load_unique_objects (maptile *m)
1330{ 1273{
1331 int count; 1274 int count;
1332 char firstname[MAX_BUF]; 1275 char firstname[MAX_BUF];
1333 1276
1334 for (count = 0; count < 10; count++) 1277 for (count = 0; count < 10; count++)
… …
1357 1300
1358/* 1301/*
1359 * Saves a map to file. If flag is set, it is saved into the same 1302 * Saves a map to file. If flag is set, it is saved into the same
1360 * file it was (originally) loaded from. Otherwise a temporary 1303 * file it was (originally) loaded from. Otherwise a temporary
1361 * filename will be genarated, and the file will be stored there. 1304 * filename will be genarated, and the file will be stored there.
1362 * The temporary filename will be stored in the mapstructure. 1305 * The temporary filename will be stored in the maptileure.
1363 * If the map is unique, we also save to the filename in the map 1306 * If the map is unique, we also save to the filename in the map
1364 * (this should have been updated when first loaded) 1307 * (this should have been updated when first loaded)
1365 */ 1308 */
1366 1309
1367int 1310int
1368new_save_map (mapstruct *m, int flag) 1311new_save_map (maptile *m, int flag)
1369{ 1312{
1370 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1313 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1371 int i; 1314 int i;
1372 1315
1373 if (flag && !*m->path) 1316 if (flag && !*m->path)
… …
1391 make_path_to_file (filename); 1334 make_path_to_file (filename);
1392 } 1335 }
1393 else 1336 else
1394 { 1337 {
1395 if (!m->tmpname) 1338 if (!m->tmpname)
1396 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1339 m->tmpname = tempnam (settings.tmpdir, NULL);
1397 1340
1398 strcpy (filename, m->tmpname); 1341 strcpy (filename, m->tmpname);
1399 } 1342 }
1400 1343
1401 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1344 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1425 print_shop_string (m, shop); 1368 print_shop_string (m, shop);
1426 fprintf (freezer, "shopitems %s\n", shop); 1369 fprintf (freezer, "shopitems %s\n", shop);
1427 } 1370 }
1428 if (m->shopgreed) 1371 if (m->shopgreed)
1429 fprintf (freezer, "shopgreed %f\n", m->shopgreed); 1372 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1430#ifndef WIN32
1431 if (m->shopmin) 1373 if (m->shopmin)
1432 fprintf (freezer, "shopmin %llu\n", m->shopmin); 1374 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1433 if (m->shopmax) 1375 if (m->shopmax)
1434 fprintf (freezer, "shopmax %llu\n", m->shopmax); 1376 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1435#else
1436 if (m->shopmin)
1437 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1438 if (m->shopmax)
1439 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1440#endif
1441 if (m->shoprace) 1377 if (m->shoprace)
1442 fprintf (freezer, "shoprace %s\n", m->shoprace); 1378 fprintf (freezer, "shoprace %s\n", m->shoprace);
1443 if (m->darkness) 1379 if (m->darkness)
1444 fprintf (freezer, "darkness %d\n", m->darkness); 1380 fprintf (freezer, "darkness %d\n", m->darkness);
1445 if (m->width) 1381 if (m->width)
… …
1524 object *tmp, *next; 1460 object *tmp, *next;
1525 1461
1526 for (tmp = op->inv; tmp; tmp = next) 1462 for (tmp = op->inv; tmp; tmp = next)
1527 { 1463 {
1528 next = tmp->below; 1464 next = tmp->below;
1465
1529 clean_object (tmp); 1466 clean_object (tmp);
1530 if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) 1467 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1531 remove_button_link (tmp); 1468 remove_button_link (tmp);
1532 remove_ob (tmp); 1469
1533 free_object (tmp); 1470 tmp->destroy ();
1534 } 1471 }
1535} 1472}
1536 1473
1537/* 1474/*
1538 * Remove and free all objects in the given map. 1475 * Remove and free all objects in the given map.
1539 */ 1476 */
1540 1477
1541void 1478void
1542free_all_objects (mapstruct *m) 1479free_all_objects (maptile *m)
1543{ 1480{
1544 int i, j; 1481 int i, j;
1545 object *op; 1482 object *op;
1546 1483
1547 for (i = 0; i < MAP_WIDTH (m); i++) 1484 for (i = 0; i < MAP_WIDTH (m); i++)
… …
1554 if (op == previous_obj) 1491 if (op == previous_obj)
1555 { 1492 {
1556 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); 1493 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1557 break; 1494 break;
1558 } 1495 }
1496
1559 previous_obj = op; 1497 previous_obj = op;
1498
1560 if (op->head != NULL) 1499 if (op->head != NULL)
1561 op = op->head; 1500 op = op->head;
1562 1501
1563 /* If the map isn't in memory, free_object will remove and 1502 /* If the map isn't in memory, free_object will remove and
1564 * free objects in op's inventory. So let it do the job. 1503 * free objects in op's inventory. So let it do the job.
1565 */ 1504 */
1566 if (m->in_memory == MAP_IN_MEMORY) 1505 if (m->in_memory == MAP_IN_MEMORY)
1567 clean_object (op); 1506 clean_object (op);
1568 remove_ob (op); 1507
1569 free_object (op); 1508 op->destroy ();
1570 } 1509 }
1571 } 1510 }
1572} 1511}
1573 1512
1574/* 1513/*
1575 * Frees everything allocated by the given mapstructure. 1514 * Frees everything allocated by the given maptileure.
1576 * don't free tmpname - our caller is left to do that 1515 * don't free tmpname - our caller is left to do that
1577 */ 1516 */
1578 1517
1579void 1518void
1580free_map (mapstruct *m, int flag) 1519free_map (maptile *m, int flag)
1581{ 1520{
1582 int i; 1521 int i;
1583 1522
1584 if (!m->in_memory) 1523 if (!m->in_memory)
1585 { 1524 {
1586 LOG (llevError, "Trying to free freed map.\n"); 1525 LOG (llevError, "Trying to free freed map.\n");
1587 return; 1526 return;
1588 } 1527 }
1528
1529 // TODO: use new/delete
1530#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1531
1589 if (flag && m->spaces) 1532 if (flag && m->spaces)
1590 free_all_objects (m); 1533 free_all_objects (m);
1591 if (m->name) 1534 if (m->name)
1592 FREE_AND_CLEAR (m->name); 1535 FREE_AND_CLEAR (m->name);
1593 if (m->spaces) 1536 if (m->spaces)
1594 FREE_AND_CLEAR (m->spaces); 1537 FREE_AND_CLEAR (m->spaces);
1595 if (m->msg) 1538 if (m->msg)
1596 FREE_AND_CLEAR (m->msg); 1539 FREE_AND_CLEAR (m->msg);
1597 if (m->maplore) 1540 if (m->maplore)
1598 FREE_AND_CLEAR (m->maplore); 1541 FREE_AND_CLEAR (m->maplore);
1599 if (m->shopitems) 1542
1600 delete[]m->shopitems; 1543 delete [] m->shopitems;
1601 m->shopitems = 0; 1544 m->shopitems = 0;
1545
1602 if (m->shoprace) 1546 if (m->shoprace)
1603 FREE_AND_CLEAR (m->shoprace); 1547 FREE_AND_CLEAR (m->shoprace);
1548
1604 if (m->buttons) 1549 if (m->buttons)
1605 free_objectlinkpt (m->buttons); 1550 free_objectlinkpt (m->buttons);
1551
1606 m->buttons = NULL; 1552 m->buttons = NULL;
1553
1607 for (i = 0; i < 4; i++) 1554 for (i = 0; i < 4; i++)
1608 { 1555 {
1609 if (m->tile_path[i]) 1556 if (m->tile_path[i])
1610 FREE_AND_CLEAR (m->tile_path[i]); 1557 FREE_AND_CLEAR (m->tile_path[i]);
1611 m->tile_map[i] = NULL; 1558 m->tile_map[i] = NULL;
1612 } 1559 }
1560
1613 m->in_memory = MAP_SWAPPED; 1561 m->in_memory = MAP_SWAPPED;
1562
1563#undef FREE_AND_CLEAR
1564
1614} 1565}
1615 1566
1616/* 1567/*
1617 * function: vanish mapstruct 1568 * function: vanish maptile
1618 * m : pointer to mapstruct, if NULL no action 1569 * m : pointer to maptile, if NULL no action
1619 * this deletes all the data on the map (freeing pointers) 1570 * this deletes all the data on the map (freeing pointers)
1620 * and then removes this map from the global linked list of maps. 1571 * and then removes this map from the global linked list of maps.
1621 */ 1572 */
1622 1573
1623void 1574void
1624delete_map (mapstruct *m) 1575delete_map (maptile *m)
1625{ 1576{
1626 mapstruct *tmp, *last; 1577 maptile *tmp, *last;
1627 int i; 1578 int i;
1628 1579
1629 if (!m) 1580 if (!m)
1630 return; 1581 return;
1631 1582
… …
1678 else 1629 else
1679 last->next = m->next; 1630 last->next = m->next;
1680 1631
1681 delete m; 1632 delete m;
1682} 1633}
1683
1684
1685 1634
1686/* 1635/*
1687 * Makes sure the given map is loaded and swapped in. 1636 * Makes sure the given map is loaded and swapped in.
1688 * name is path name of the map. 1637 * name is path name of the map.
1689 * flags meaning: 1638 * flags meaning:
… …
1692 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1641 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1693 * dont do any more name translation on it. 1642 * dont do any more name translation on it.
1694 * 1643 *
1695 * Returns a pointer to the given map. 1644 * Returns a pointer to the given map.
1696 */ 1645 */
1697 1646maptile *
1698mapstruct *
1699ready_map_name (const char *name, int flags) 1647ready_map_name (const char *name, int flags)
1700{ 1648{
1701 mapstruct *m; 1649 maptile *m;
1702 1650
1703 if (!name) 1651 if (!name)
1704 return (NULL); 1652 return (NULL);
1705 1653
1706 /* Have we been at this level before? */ 1654 /* Have we been at this level before? */
… …
1808 * have a difficulty set than using this function - human calculation 1756 * have a difficulty set than using this function - human calculation
1809 * is much better than this functions guesswork. 1757 * is much better than this functions guesswork.
1810 */ 1758 */
1811 1759
1812int 1760int
1813calculate_difficulty (mapstruct *m) 1761calculate_difficulty (maptile *m)
1814{ 1762{
1815 object *op; 1763 object *op;
1816 archetype *at; 1764 archetype *at;
1817 int x, y, i; 1765 int x, y, i;
1818 long monster_cnt = 0; 1766 long monster_cnt = 0;
… …
1825 return MAP_DIFFICULTY (m); 1773 return MAP_DIFFICULTY (m);
1826 } 1774 }
1827 1775
1828 for (x = 0; x < MAP_WIDTH (m); x++) 1776 for (x = 0; x < MAP_WIDTH (m); x++)
1829 for (y = 0; y < MAP_HEIGHT (m); y++) 1777 for (y = 0; y < MAP_HEIGHT (m); y++)
1830 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 1778 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1831 { 1779 {
1832 if (QUERY_FLAG (op, FLAG_MONSTER)) 1780 if (QUERY_FLAG (op, FLAG_MONSTER))
1833 { 1781 {
1834 total_exp += op->stats.exp; 1782 total_exp += op->stats.exp;
1835 monster_cnt++; 1783 monster_cnt++;
… …
1860 1808
1861 return 1; 1809 return 1;
1862} 1810}
1863 1811
1864void 1812void
1865clean_tmp_map (mapstruct *m) 1813clean_tmp_map (maptile *m)
1866{ 1814{
1867 if (m->tmpname == NULL) 1815 if (m->tmpname == NULL)
1868 return; 1816 return;
1869 INVOKE_MAP (CLEAN, m); 1817 INVOKE_MAP (CLEAN, m);
1870 (void) unlink (m->tmpname); 1818 (void) unlink (m->tmpname);
… …
1895 * to maps than los. 1843 * to maps than los.
1896 * postive values make it darker, negative make it brighter 1844 * postive values make it darker, negative make it brighter
1897 */ 1845 */
1898 1846
1899int 1847int
1900change_map_light (mapstruct *m, int change) 1848change_map_light (maptile *m, int change)
1901{ 1849{
1902 int new_level = m->darkness + change; 1850 int new_level = m->darkness + change;
1903 1851
1904 /* Nothing to do */ 1852 /* Nothing to do */
1905 if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS)) 1853 if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS))
… …
1928 /* All clients need to get re-updated for the change */ 1876 /* All clients need to get re-updated for the change */
1929 update_all_map_los (m); 1877 update_all_map_los (m);
1930 return 1; 1878 return 1;
1931} 1879}
1932 1880
1933
1934/* 1881/*
1935 * This function updates various attributes about a specific space 1882 * This function updates various attributes about a specific space
1936 * on the map (what it looks like, whether it blocks magic, 1883 * on the map (what it looks like, whether it blocks magic,
1937 * has a living creatures, prevents people from passing 1884 * has a living creatures, prevents people from passing
1938 * through, etc) 1885 * through, etc)
1939 */ 1886 */
1940void 1887void
1941update_position (mapstruct *m, int x, int y) 1888mapspace::update_ ()
1942{ 1889{
1943 object *tmp, *last = NULL; 1890 object *tmp, *last = 0;
1944 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1891 uint8 flags = 0, light = 0, anywhere = 0;
1945 New_Face *top, *floor, *middle; 1892 New_Face *top, *floor, *middle;
1946 object *top_obj, *floor_obj, *middle_obj; 1893 object *top_obj, *floor_obj, *middle_obj;
1947 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1894 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1948 1895
1949 oldflags = GET_MAP_FLAGS (m, x, y);
1950 if (!(oldflags & P_NEED_UPDATE))
1951 {
1952 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1953 return;
1954 }
1955
1956 middle = blank_face; 1896 middle = blank_face;
1957 top = blank_face; 1897 top = blank_face;
1958 floor = blank_face; 1898 floor = blank_face;
1959 1899
1960 middle_obj = NULL; 1900 middle_obj = 0;
1961 top_obj = NULL; 1901 top_obj = 0;
1962 floor_obj = NULL; 1902 floor_obj = 0;
1963 1903
1964 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1904 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above)
1965 { 1905 {
1966
1967 /* This could be made additive I guess (two lights better than 1906 /* This could be made additive I guess (two lights better than
1968 * one). But if so, it shouldn't be a simple additive - 2 1907 * one). But if so, it shouldn't be a simple additive - 2
1969 * light bulbs do not illuminate twice as far as once since 1908 * light bulbs do not illuminate twice as far as once since
1970 * it is a disapation factor that is squared (or is it cubed?) 1909 * it is a dissapation factor that is cubed.
1971 */ 1910 */
1972 if (tmp->glow_radius > light) 1911 if (tmp->glow_radius > light)
1973 light = tmp->glow_radius; 1912 light = tmp->glow_radius;
1974 1913
1975 /* This call is needed in order to update objects the player 1914 /* This call is needed in order to update objects the player
… …
2013 { 1952 {
2014 middle = tmp->face; 1953 middle = tmp->face;
2015 middle_obj = tmp; 1954 middle_obj = tmp;
2016 } 1955 }
2017 } 1956 }
1957
2018 if (tmp == tmp->above) 1958 if (tmp == tmp->above)
2019 { 1959 {
2020 LOG (llevError, "Error in structure of map\n"); 1960 LOG (llevError, "Error in structure of map\n");
2021 exit (-1); 1961 exit (-1);
2022 } 1962 }
2023 1963
2024 move_slow |= tmp->move_slow; 1964 move_slow |= tmp->move_slow;
2025 move_block |= tmp->move_block; 1965 move_block |= tmp->move_block;
2026 move_on |= tmp->move_on; 1966 move_on |= tmp->move_on;
2027 move_off |= tmp->move_off; 1967 move_off |= tmp->move_off;
2028 move_allow |= tmp->move_allow; 1968 move_allow |= tmp->move_allow;
2029 1969
2030 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2031 flags |= P_IS_ALIVE;
2032 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2033 flags |= P_NO_MAGIC;
2034 if (QUERY_FLAG (tmp, FLAG_DAMNED))
2035 flags |= P_NO_CLERIC;
2036 if (tmp->type == SAFE_GROUND)
2037 flags |= P_SAFE;
2038
2039 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1970 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2040 flags |= P_BLOCKSVIEW; 1971 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2041 } /* for stack of objects */ 1972 if (tmp->type == PLAYER) flags |= P_PLAYER;
2042 1973 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2043 /* we don't want to rely on this function to have accurate flags, but 1974 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2044 * since we're already doing the work, we calculate them here. 1975 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2045 * if they don't match, logic is broken someplace.
2046 */
2047 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2048 { 1976 }
2049 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1977
2050 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1978 this->light = light;
2051 } 1979 this->flags_ = flags;
2052 SET_MAP_FLAGS (m, x, y, flags); 1980 this->move_block = move_block & ~move_allow;
2053 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1981 this->move_on = move_on;
2054 SET_MAP_MOVE_ON (m, x, y, move_on); 1982 this->move_off = move_off;
2055 SET_MAP_MOVE_OFF (m, x, y, move_off); 1983 this->move_slow = move_slow;
2056 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2057 1984
2058 /* At this point, we have a floor face (if there is a floor), 1985 /* At this point, we have a floor face (if there is a floor),
2059 * and the floor is set - we are not going to touch it at 1986 * and the floor is set - we are not going to touch it at
2060 * this point. 1987 * this point.
2061 * middle contains the highest visibility face. 1988 * middle contains the highest visibility face.
… …
2115 break; 2042 break;
2116 } 2043 }
2117 } 2044 }
2118 } 2045 }
2119 } 2046 }
2047
2120 if (middle == floor) 2048 if (middle == floor)
2121 middle = blank_face; 2049 middle = blank_face;
2050
2122 if (top == middle) 2051 if (top == middle)
2123 middle = blank_face; 2052 middle = blank_face;
2124 SET_MAP_FACE (m, x, y, top, 0);
2125 if (top != blank_face)
2126 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2127 else
2128 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2129 SET_MAP_FACE (m, x, y, middle, 1);
2130 if (middle != blank_face)
2131 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2132 else
2133 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2134 SET_MAP_FACE (m, x, y, floor, 2);
2135 if (floor != blank_face)
2136 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2137 else
2138 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2139 SET_MAP_LIGHT (m, x, y, light);
2140}
2141 2053
2054 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
2055 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
2056 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
2057}
2142 2058
2143void 2059void
2144set_map_reset_time (mapstruct *map) 2060set_map_reset_time (maptile *map)
2145{ 2061{
2146 int timeout; 2062 int timeout;
2147 2063
2148 timeout = MAP_RESET_TIMEOUT (map); 2064 timeout = MAP_RESET_TIMEOUT (map);
2149 if (timeout <= 0) 2065 if (timeout <= 0)
2150 timeout = MAP_DEFAULTRESET; 2066 timeout = MAP_DEFAULTRESET;
2151 if (timeout >= MAP_MAXRESET) 2067 if (timeout >= MAP_MAXRESET)
2152 timeout = MAP_MAXRESET; 2068 timeout = MAP_MAXRESET;
2153 MAP_WHEN_RESET (map) = seconds () + timeout; 2069 MAP_WHEN_RESET (map) = time (0) + timeout;
2154} 2070}
2155 2071
2156/* this updates the orig_map->tile_map[tile_num] value after loading 2072/* this updates the orig_map->tile_map[tile_num] value after loading
2157 * the map. It also takes care of linking back the freshly loaded 2073 * the map. It also takes care of linking back the freshly loaded
2158 * maps tile_map values if it tiles back to this one. It returns 2074 * maps tile_map values if it tiles back to this one. It returns
2159 * the value of orig_map->tile_map[tile_num]. It really only does this 2075 * the value of orig_map->tile_map[tile_num]. It really only does this
2160 * so that it is easier for calling functions to verify success. 2076 * so that it is easier for calling functions to verify success.
2161 */ 2077 */
2162 2078
2163static mapstruct * 2079static maptile *
2164load_and_link_tiled_map (mapstruct *orig_map, int tile_num) 2080load_and_link_tiled_map (maptile *orig_map, int tile_num)
2165{ 2081{
2166 int dest_tile = (tile_num + 2) % 4; 2082 int dest_tile = (tile_num + 2) % 4;
2167 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]); 2083 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
2168 2084
2169 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 2085 orig_map->tile_map[tile_num] = ready_map_name (path, 0);
… …
2184 * tiled maps. 2100 * tiled maps.
2185 * 2101 *
2186 * 2102 *
2187 */ 2103 */
2188int 2104int
2189out_of_map (mapstruct *m, int x, int y) 2105out_of_map (maptile *m, int x, int y)
2190{ 2106{
2191
2192 /* If we get passed a null map, this is obviously the 2107 /* If we get passed a null map, this is obviously the
2193 * case. This generally shouldn't happen, but if the 2108 * case. This generally shouldn't happen, but if the
2194 * map loads fail below, it could happen. 2109 * map loads fail below, it could happen.
2195 */ 2110 */
2196 if (!m) 2111 if (!m)
… …
2198 2113
2199 if (x < 0) 2114 if (x < 0)
2200 { 2115 {
2201 if (!m->tile_path[3]) 2116 if (!m->tile_path[3])
2202 return 1; 2117 return 1;
2118
2203 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2119 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2204 {
2205 load_and_link_tiled_map (m, 3); 2120 load_and_link_tiled_map (m, 3);
2206 } 2121
2207 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2122 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y));
2208 } 2123 }
2124
2209 if (x >= MAP_WIDTH (m)) 2125 if (x >= MAP_WIDTH (m))
2210 { 2126 {
2211 if (!m->tile_path[1]) 2127 if (!m->tile_path[1])
2212 return 1; 2128 return 1;
2129
2213 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2130 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2214 {
2215 load_and_link_tiled_map (m, 1); 2131 load_and_link_tiled_map (m, 1);
2216 } 2132
2217 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2133 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y));
2218 } 2134 }
2135
2219 if (y < 0) 2136 if (y < 0)
2220 { 2137 {
2221 if (!m->tile_path[0]) 2138 if (!m->tile_path[0])
2222 return 1; 2139 return 1;
2140
2223 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2141 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2224 {
2225 load_and_link_tiled_map (m, 0); 2142 load_and_link_tiled_map (m, 0);
2226 } 2143
2227 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2144 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0])));
2228 } 2145 }
2146
2229 if (y >= MAP_HEIGHT (m)) 2147 if (y >= MAP_HEIGHT (m))
2230 { 2148 {
2231 if (!m->tile_path[2]) 2149 if (!m->tile_path[2])
2232 return 1; 2150 return 1;
2151
2233 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2152 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2234 {
2235 load_and_link_tiled_map (m, 2); 2153 load_and_link_tiled_map (m, 2);
2236 } 2154
2237 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2155 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m)));
2238 } 2156 }
2239 2157
2240 /* Simple case - coordinates are within this local 2158 /* Simple case - coordinates are within this local
2241 * map. 2159 * map.
… …
2249 * the map as that the coordinates are really on, and 2167 * the map as that the coordinates are really on, and
2250 * updates x and y to be the localized coordinates. 2168 * updates x and y to be the localized coordinates.
2251 * Using this is more efficient of calling out_of_map 2169 * Using this is more efficient of calling out_of_map
2252 * and then figuring out what the real map is 2170 * and then figuring out what the real map is
2253 */ 2171 */
2254mapstruct * 2172maptile *
2255get_map_from_coord (mapstruct *m, sint16 * x, sint16 * y) 2173get_map_from_coord (maptile *m, sint16 * x, sint16 * y)
2256{ 2174{
2257 2175
2258 if (*x < 0) 2176 if (*x < 0)
2259 { 2177 {
2260 if (!m->tile_path[3]) 2178 if (!m->tile_path[3])
2261 return NULL; 2179 return 0;
2262 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2180 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2263 load_and_link_tiled_map (m, 3); 2181 load_and_link_tiled_map (m, 3);
2264 2182
2265 *x += MAP_WIDTH (m->tile_map[3]); 2183 *x += MAP_WIDTH (m->tile_map[3]);
2266 return (get_map_from_coord (m->tile_map[3], x, y)); 2184 return (get_map_from_coord (m->tile_map[3], x, y));
2267 } 2185 }
2186
2268 if (*x >= MAP_WIDTH (m)) 2187 if (*x >= MAP_WIDTH (m))
2269 { 2188 {
2270 if (!m->tile_path[1]) 2189 if (!m->tile_path[1])
2271 return NULL; 2190 return 0;
2191
2272 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2192 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2273 load_and_link_tiled_map (m, 1); 2193 load_and_link_tiled_map (m, 1);
2274 2194
2275 *x -= MAP_WIDTH (m); 2195 *x -= MAP_WIDTH (m);
2276 return (get_map_from_coord (m->tile_map[1], x, y)); 2196 return (get_map_from_coord (m->tile_map[1], x, y));
2277 } 2197 }
2198
2278 if (*y < 0) 2199 if (*y < 0)
2279 { 2200 {
2280 if (!m->tile_path[0]) 2201 if (!m->tile_path[0])
2281 return NULL; 2202 return 0;
2203
2282 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2204 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2283 load_and_link_tiled_map (m, 0); 2205 load_and_link_tiled_map (m, 0);
2284 2206
2285 *y += MAP_HEIGHT (m->tile_map[0]); 2207 *y += MAP_HEIGHT (m->tile_map[0]);
2286 return (get_map_from_coord (m->tile_map[0], x, y)); 2208 return (get_map_from_coord (m->tile_map[0], x, y));
2287 } 2209 }
2210
2288 if (*y >= MAP_HEIGHT (m)) 2211 if (*y >= MAP_HEIGHT (m))
2289 { 2212 {
2290 if (!m->tile_path[2]) 2213 if (!m->tile_path[2])
2291 return NULL; 2214 return 0;
2215
2292 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2216 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2293 load_and_link_tiled_map (m, 2); 2217 load_and_link_tiled_map (m, 2);
2294 2218
2295 *y -= MAP_HEIGHT (m); 2219 *y -= MAP_HEIGHT (m);
2296 return (get_map_from_coord (m->tile_map[2], x, y)); 2220 return (get_map_from_coord (m->tile_map[2], x, y));
… …
2306/** 2230/**
2307 * Return whether map2 is adjacent to map1. If so, store the distance from 2231 * Return whether map2 is adjacent to map1. If so, store the distance from
2308 * map1 to map2 in dx/dy. 2232 * map1 to map2 in dx/dy.
2309 */ 2233 */
2310static int 2234static int
2311adjacent_map (const mapstruct *map1, const mapstruct *map2, int *dx, int *dy) 2235adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
2312{ 2236{
2313 if (!map1 || !map2) 2237 if (!map1 || !map2)
2314 return 0; 2238 return 0;
2315 2239
2316 if (map1 == map2) 2240 if (map1 == map2)
… …
2474 * for something in the future. Also, since no object is pasted, the best 2398 * for something in the future. Also, since no object is pasted, the best
2475 * field of the rv_vector is set to NULL. 2399 * field of the rv_vector is set to NULL.
2476 */ 2400 */
2477 2401
2478void 2402void
2479get_rangevector_from_mapcoord (const mapstruct *m, int x, int y, const object *op2, rv_vector * retval, int flags) 2403get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags)
2480{ 2404{
2481 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 2405 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
2482 { 2406 {
2483 /* be conservative and fill in _some_ data */ 2407 /* be conservative and fill in _some_ data */
2484 retval->distance = 100000; 2408 retval->distance = 100000;

Diff Legend

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