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.58 by root, Sat Dec 30 18:45:27 2006 UTC vs.
Revision 1.87 by root, Thu Feb 15 21:07:48 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h>
25#include <funcpoint.h>
26
27#include <loader.h>
28#include <unistd.h> 25#include <unistd.h>
26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
29 31
30#include "path.h" 32#include "path.h"
31 33
32/* 34/*
33 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
… …
36 * it really should be called create_mapname 38 * it really should be called create_mapname
37 */ 39 */
38const char * 40const char *
39create_pathname (const char *name) 41create_pathname (const char *name)
40{ 42{
41 static char buf[MAX_BUF]; 43 static char buf[8192];
42
43 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
44 * someplace else in the code? msw 2-17-97
45 */
46 if (*name == '/')
47 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
48 else
49 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); 44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
50 return (buf); 45 return buf;
51}
52
53/*
54 * same as create_pathname, but for the overlay maps.
55 */
56const char *
57create_overlay_pathname (const char *name)
58{
59 static char buf[MAX_BUF];
60
61 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
62 * someplace else in the code? msw 2-17-97
63 */
64 if (*name == '/')
65 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
66 else
67 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
68 return (buf);
69}
70
71/*
72 * same as create_pathname, but for the template maps.
73 */
74const char *
75create_template_pathname (const char *name)
76{
77 static char buf[MAX_BUF];
78
79 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
80 * someplace else in the code? msw 2-17-97
81 */
82 if (*name == '/')
83 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
84 else
85 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
86 return (buf);
87}
88
89/*
90 * This makes absolute path to the itemfile where unique objects
91 * will be saved. Converts '/' to '@'. I think it's essier maintain
92 * files than full directory structure, but if this is problem it can
93 * be changed.
94 */
95static const char *
96create_items_path (const char *s)
97{
98 static char buf[MAX_BUF];
99 char *t;
100
101 if (*s == '/')
102 s++;
103
104 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
105
106 for (t = buf + strlen (buf); *s; s++, t++)
107 if (*s == '/')
108 *t = '@';
109 else
110 *t = *s;
111 *t = 0;
112 return (buf);
113} 46}
114 47
115/* 48/*
116 * This function checks if a file with the given path exists. 49 * This function checks if a file with the given path exists.
117 * -1 is returned if it fails, otherwise the mode of the file 50 * -1 is returned if it fails, otherwise the mode of the file
… …
135 char *endbuf; 68 char *endbuf;
136 struct stat statbuf; 69 struct stat statbuf;
137 int mode = 0; 70 int mode = 0;
138 71
139 if (prepend_dir) 72 if (prepend_dir)
140 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
141 else 74 else
142 strcpy (buf, name); 75 assign (buf, name);
143 76
144 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
145 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
146 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
147 * all the names. 80 * all the names.
… …
296 229
297 } 230 }
298 return 0; 231 return 0;
299} 232}
300 233
301
302/* 234/*
303 * Returns true if the given object can't fit in the given spot. 235 * Returns true if the given object can't fit in the given spot.
304 * This is meant for multi space objects - for single space objecs, 236 * This is meant for multi space objects - for single space objecs,
305 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
306 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
331 archetype *tmp; 263 archetype *tmp;
332 int flag; 264 int flag;
333 maptile *m1; 265 maptile *m1;
334 sint16 sx, sy; 266 sint16 sx, sy;
335 267
336 if (ob == NULL) 268 if (!ob)
337 { 269 {
338 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
339 if (flag & P_OUT_OF_MAP) 271 if (flag & P_OUT_OF_MAP)
340 return P_OUT_OF_MAP; 272 return P_OUT_OF_MAP;
341 273
… …
396 328
397 /* sum_weight will go through and calculate what all the containers are 329 /* sum_weight will go through and calculate what all the containers are
398 * carrying. 330 * carrying.
399 */ 331 */
400 sum_weight (container); 332 sum_weight (container);
333}
334
335void
336maptile::set_object_flag (int flag, int value)
337{
338 if (!spaces)
339 return;
340
341 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value;
401} 344}
402 345
403/* link_multipart_objects go through all the objects on the map looking 346/* link_multipart_objects go through all the objects on the map looking
404 * for objects whose arch says they are multipart yet according to the 347 * for objects whose arch says they are multipart yet according to the
405 * info we have, they only have the head (as would be expected when 348 * info we have, they only have the head (as would be expected when
… …
457 * Loads (ands parses) the objects into a given map from the specified 400 * Loads (ands parses) the objects into a given map from the specified
458 * file pointer. 401 * file pointer.
459 * mapflags is the same as we get with load_original_map 402 * mapflags is the same as we get with load_original_map
460 */ 403 */
461bool 404bool
462maptile::load_objects (object_thawer &thawer) 405maptile::_load_objects (object_thawer &thawer)
463{ 406{
464 int unique; 407 int unique;
465 object *op, *prev = NULL, *last_more = NULL, *otmp; 408 object *op, *prev = NULL, *last_more = NULL, *otmp;
466 409
467 op = object::create (); 410 op = object::create ();
… …
528 if (!spaces) 471 if (!spaces)
529 return; 472 return;
530 473
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 474 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 475 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 476 op->activate_recursive ();
534} 477}
535 478
536void 479void
537maptile::deactivate () 480maptile::deactivate ()
538{ 481{
539 if (!spaces) 482 if (!spaces)
540 return; 483 return;
541 484
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 485 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 486 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 487 op->deactivate_recursive ();
545} 488}
546 489
547bool 490bool
548maptile::save_objects (object_freezer &freezer, int flags) 491maptile::_save_objects (object_freezer &freezer, int flags)
549{ 492{
493 static int cede_count = 0;
494
550 if (flags & IO_HEADER) 495 if (flags & IO_HEADER)
551 save_header (freezer); 496 _save_header (freezer);
552 497
553 if (!spaces) 498 if (!spaces)
554 return false; 499 return false;
555 500
556 for (int i = 0; i < size (); ++i) 501 for (int i = 0; i < size (); ++i)
557 { 502 {
503#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
504 if (cede_count >= 500)
505 {
506 cede_count = 0;
507 coroapi::cede ();
508 }
509#endif
510
558 int unique = 0; 511 int unique = 0;
559 for (object *op = spaces [i].bot; op; op = op->above) 512 for (object *op = spaces [i].bot; op; op = op->above)
560 { 513 {
514 // count per-object, but cede only when modification-safe
515 cede_count++;
516
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 517 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
562 unique = 1; 518 unique = 1;
563 519
564 if (!op->can_map_save ()) 520 if (!op->can_map_save ())
565 continue; 521 continue;
… …
576 532
577 return true; 533 return true;
578} 534}
579 535
580bool 536bool
581maptile::load_objects (const char *path, bool skip_header) 537maptile::_load_objects (const char *path, bool skip_header)
582{ 538{
583 object_thawer thawer (path); 539 object_thawer thawer (path);
584 540
585 if (!thawer) 541 if (!thawer)
586 return false; 542 return false;
587 543
588 if (skip_header) 544 if (skip_header)
589 for (;;) 545 for (;;)
590 { 546 {
591 keyword kw = thawer.get_kv ();
592
593 if (kw == KW_end) 547 if (thawer.kw == KW_end)
594 break; 548 break;
595 549
596 thawer.skip_kv (kw); 550 thawer.skip_kv ();
597 } 551 }
598 552
599 return load_objects (thawer); 553 return _load_objects (thawer);
600} 554}
601 555
602bool 556bool
603maptile::save_objects (const char *path, int flags) 557maptile::_save_objects (const char *path, int flags)
604{ 558{
605 object_freezer freezer; 559 object_freezer freezer;
606 560
607 if (!save_objects (freezer, flags)) 561 if (!_save_objects (freezer, flags))
608 return false; 562 return false;
609 563
610 return freezer.save (path); 564 return freezer.save (path);
611} 565}
612 566
613maptile::maptile () 567maptile::maptile ()
614{ 568{
615 in_memory = MAP_SWAPPED; 569 in_memory = MAP_SWAPPED;
616 570
617 /* The maps used to pick up default x and y values from the 571 /* The maps used to pick up default x and y values from the
618 * map archetype. Mimic that behaviour. 572 * map archetype. Mimic that behaviour.
619 */ 573 */
620 width = 16; 574 width = 16;
621 height = 16; 575 height = 16;
622 reset_timeout = 0;
623 timeout = 300; 576 timeout = 300;
624 enter_x = 0; 577 max_nrof = 1000; // 1000 items of anything
625 enter_y = 0; 578 max_volume = 2000000; // 2m³
626} 579}
627 580
628maptile::maptile (int w, int h) 581maptile::maptile (int w, int h)
629{ 582{
630 in_memory = MAP_SWAPPED; 583 in_memory = MAP_SWAPPED;
… …
776 * This could be done in lex (like the object loader), but I think 729 * This could be done in lex (like the object loader), but I think
777 * currently, there are few enough fields this is not a big deal. 730 * currently, there are few enough fields this is not a big deal.
778 * MSW 2001-07-01 731 * MSW 2001-07-01
779 */ 732 */
780bool 733bool
781maptile::load_header (object_thawer &thawer) 734maptile::_load_header (object_thawer &thawer)
782{ 735{
783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
784 int msgpos = 0;
785 int maplorepos = 0;
786
787 for (;;) 736 for (;;)
788 { 737 {
789 keyword kw = thawer.get_kv (); 738 keyword kw = thawer.get_kv ();
790 739
791 switch (kw) 740 switch (kw)
792 { 741 {
793 case KW_EOF:
794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path);
795 return false;
796
797 case KW_end:
798 return true;
799
800 case KW_msg: 742 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 743 thawer.get_ml (KW_endmsg, msg);
802 break; 744 break;
803 745
804 case KW_lore: // CF+ extension 746 case KW_lore: // CF+ extension
… …
836 case KW_sky: thawer.get (sky); break; 778 case KW_sky: thawer.get (sky); break;
837 779
838 case KW_per_player: thawer.get (per_player); break; 780 case KW_per_player: thawer.get (per_player); break;
839 case KW_per_party: thawer.get (per_party); break; 781 case KW_per_party: thawer.get (per_party); break;
840 782
841 case KW_region: get_region_by_name (thawer.get_str ()); break; 783 case KW_region: default_region = region::find (thawer.get_str ()); break;
842 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 784 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
843 785
844 // old names new names 786 // old names new names
845 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 787 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
846 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 788 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 797 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 798 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 799 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 800 case KW_tile_path_4: thawer.get (tile_path [3]); break;
859 801
802 case KW_end:
803 return true;
804
860 default: 805 default:
861 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 806 if (!thawer.parse_error ("map", 0))
807 return false;
862 break; 808 break;
863 } 809 }
864 } 810 }
865 811
866 abort (); 812 abort ();
867} 813}
868 814
869bool 815bool
870maptile::load_header (const char *path) 816maptile::_load_header (const char *path)
871{ 817{
872 object_thawer thawer (path); 818 object_thawer thawer (path);
873 819
874 if (!thawer) 820 if (!thawer)
875 return false; 821 return false;
876 822
877 return load_header (thawer); 823 return _load_header (thawer);
878} 824}
879 825
880/****************************************************************************** 826/******************************************************************************
881 * This is the start of unique map handling code 827 * This is the start of unique map handling code
882 *****************************************************************************/ 828 *****************************************************************************/
… …
905 } 851 }
906 } 852 }
907} 853}
908 854
909bool 855bool
910maptile::save_header (object_freezer &freezer) 856maptile::_save_header (object_freezer &freezer)
911{ 857{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k) 858#define MAP_OUT(k) freezer.put (KW_ ## k, k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 859#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
914 860
915 MAP_OUT2 (arch, "map"); 861 MAP_OUT2 (arch, "map");
… …
919 MAP_OUT (reset_time); 865 MAP_OUT (reset_time);
920 MAP_OUT (reset_timeout); 866 MAP_OUT (reset_timeout);
921 MAP_OUT (fixed_resettime); 867 MAP_OUT (fixed_resettime);
922 MAP_OUT (difficulty); 868 MAP_OUT (difficulty);
923 869
924 if (region) MAP_OUT2 (region, region->name); 870 if (default_region) MAP_OUT2 (region, default_region->name);
925 871
926 if (shopitems) 872 if (shopitems)
927 { 873 {
928 char shop[MAX_BUF]; 874 char shop[MAX_BUF];
929 print_shop_string (this, shop); 875 print_shop_string (this, shop);
… …
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 903 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
958 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 904 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
959 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 905 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
960 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 906 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 907
962 MAP_OUT2 (end, 0); 908 freezer.put (this);
909 freezer.put (KW_end);
963 910
964 return true; 911 return true;
965} 912}
966 913
967bool 914bool
968maptile::save_header (const char *path) 915maptile::_save_header (const char *path)
969{ 916{
970 object_freezer freezer; 917 object_freezer freezer;
971 918
972 if (!save_header (freezer)) 919 if (!_save_header (freezer))
973 return false; 920 return false;
974 921
975 return freezer.save (path); 922 return freezer.save (path);
976} 923}
977 924
… …
979 * Remove and free all objects in the given map. 926 * Remove and free all objects in the given map.
980 */ 927 */
981void 928void
982maptile::clear () 929maptile::clear ()
983{ 930{
931 sfree (regions, size ()), regions = 0;
932 free (regionmap), regionmap = 0;
933
984 if (!spaces) 934 if (spaces)
985 return; 935 {
986
987 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 936 for (mapspace *ms = spaces + size (); ms-- > spaces; )
988 while (object *op = ms->bot) 937 while (object *op = ms->bot)
989 { 938 {
990 if (op->head) 939 if (op->head)
991 op = op->head; 940 op = op->head;
992 941
993 op->destroy_inv (false); 942 op->destroy_inv (false);
994 op->destroy (); 943 op->destroy ();
995 } 944 }
996 945
997 sfree (spaces, size ()), spaces = 0; 946 sfree (spaces, size ()), spaces = 0;
947 }
998 948
999 if (buttons) 949 if (buttons)
1000 free_objectlinkpt (buttons), buttons = 0; 950 free_objectlinkpt (buttons), buttons = 0;
1001} 951}
1002 952
… …
1156 */ 1106 */
1157void 1107void
1158mapspace::update_ () 1108mapspace::update_ ()
1159{ 1109{
1160 object *tmp, *last = 0; 1110 object *tmp, *last = 0;
1161 uint8 flags = 0, light = 0, anywhere = 0; 1111 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1162 New_Face *top, *floor, *middle; 1112 facetile *top, *floor, *middle;
1163 object *top_obj, *floor_obj, *middle_obj; 1113 object *top_obj, *floor_obj, *middle_obj;
1164 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1114 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1165 1115
1166 middle = blank_face; 1116 middle = blank_face;
1167 top = blank_face; 1117 top = blank_face;
… …
1283 1233
1284 /* If two top faces are already set, quit processing */ 1234 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1235 if ((top != blank_face) && (middle != blank_face))
1286 break; 1236 break;
1287 1237
1288 /* Only show visible faces, unless its the editor - show all */ 1238 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1239 if (!tmp->invisible)
1290 { 1240 {
1291 /* Fill in top if needed */ 1241 /* Fill in top if needed */
1292 if (top == blank_face) 1242 if (top == blank_face)
1293 { 1243 {
1294 top = tmp->face; 1244 top = tmp->face;
… …
1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1274 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1325 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1275 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1326 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1276 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1327} 1277}
1328 1278
1279uint64
1280mapspace::volume () const
1281{
1282 uint64 vol = 0;
1283
1284 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1285 vol += op->volume ();
1286
1287 return vol;
1288}
1289
1329/* this updates the orig_map->tile_map[tile_num] value after loading 1290/* this updates the orig_map->tile_map[tile_num] value after finding
1330 * the map. It also takes care of linking back the freshly loaded 1291 * the map. It also takes care of linking back the freshly found
1331 * maps tile_map values if it tiles back to this one. It returns 1292 * maps tile_map values if it tiles back to this one. It returns
1332 * the value of orig_map->tile_map[tile_num]. It really only does this 1293 * the value of orig_map->tile_map[tile_num].
1333 * so that it is easier for calling functions to verify success.
1334 */ 1294 */
1335static maptile * 1295static inline maptile *
1336load_and_link_tiled_map (maptile *orig_map, int tile_num) 1296find_and_link (maptile *orig_map, int tile_num)
1337{ 1297{
1298 maptile *mp = orig_map->tile_map [tile_num];
1299
1300 if (!mp)
1301 {
1338 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); 1302 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1339 mp->load (); 1303
1304 if (!mp)
1305 {
1306 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1307 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1308 &orig_map->tile_path[tile_num], &orig_map->path);
1309 mp = new maptile (1, 1);
1310 mp->alloc ();
1311 mp->in_memory = MAP_IN_MEMORY;
1312 }
1313 }
1340 1314
1341 int dest_tile = (tile_num + 2) % 4; 1315 int dest_tile = (tile_num + 2) % 4;
1342 1316
1343 orig_map->tile_map[tile_num] = mp; 1317 orig_map->tile_map [tile_num] = mp;
1344 1318
1345 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1319 // optimisation: back-link map to origin map if euclidean
1346 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1320 //TODO: non-euclidean maps MUST GO
1321 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1347 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1322 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1348 1323
1349 return mp; 1324 return mp;
1325}
1326
1327static inline void
1328load_and_link (maptile *orig_map, int tile_num)
1329{
1330 find_and_link (orig_map, tile_num)->load_sync ();
1350} 1331}
1351 1332
1352/* this returns TRUE if the coordinates (x,y) are out of 1333/* this returns TRUE if the coordinates (x,y) are out of
1353 * map m. This function also takes into account any 1334 * map m. This function also takes into account any
1354 * tiling considerations, loading adjacant maps as needed. 1335 * tiling considerations, loading adjacant maps as needed.
… …
1371 { 1352 {
1372 if (!m->tile_path[3]) 1353 if (!m->tile_path[3])
1373 return 1; 1354 return 1;
1374 1355
1375 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1356 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1376 load_and_link_tiled_map (m, 3); 1357 find_and_link (m, 3);
1377 1358
1378 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1359 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1379 } 1360 }
1380 1361
1381 if (x >= m->width) 1362 if (x >= m->width)
1382 { 1363 {
1383 if (!m->tile_path[1]) 1364 if (!m->tile_path[1])
1384 return 1; 1365 return 1;
1385 1366
1386 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1367 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1387 load_and_link_tiled_map (m, 1); 1368 find_and_link (m, 1);
1388 1369
1389 return out_of_map (m->tile_map[1], x - m->width, y); 1370 return out_of_map (m->tile_map[1], x - m->width, y);
1390 } 1371 }
1391 1372
1392 if (y < 0) 1373 if (y < 0)
1393 { 1374 {
1394 if (!m->tile_path[0]) 1375 if (!m->tile_path[0])
1395 return 1; 1376 return 1;
1396 1377
1397 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1378 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1398 load_and_link_tiled_map (m, 0); 1379 find_and_link (m, 0);
1399 1380
1400 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1381 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1401 } 1382 }
1402 1383
1403 if (y >= m->height) 1384 if (y >= m->height)
1404 { 1385 {
1405 if (!m->tile_path[2]) 1386 if (!m->tile_path[2])
1406 return 1; 1387 return 1;
1407 1388
1408 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1389 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1409 load_and_link_tiled_map (m, 2); 1390 find_and_link (m, 2);
1410 1391
1411 return out_of_map (m->tile_map[2], x, y - m->height); 1392 return out_of_map (m->tile_map[2], x, y - m->height);
1412 } 1393 }
1413 1394
1414 /* Simple case - coordinates are within this local 1395 /* Simple case - coordinates are within this local
… …
1419 1400
1420/* This is basically the same as out_of_map above, but 1401/* This is basically the same as out_of_map above, but
1421 * instead we return NULL if no map is valid (coordinates 1402 * instead we return NULL if no map is valid (coordinates
1422 * out of bounds and no tiled map), otherwise it returns 1403 * out of bounds and no tiled map), otherwise it returns
1423 * the map as that the coordinates are really on, and 1404 * the map as that the coordinates are really on, and
1424 * updates x and y to be the localized coordinates. 1405 * updates x and y to be the localised coordinates.
1425 * Using this is more efficient of calling out_of_map 1406 * Using this is more efficient of calling out_of_map
1426 * and then figuring out what the real map is 1407 * and then figuring out what the real map is
1427 */ 1408 */
1428maptile * 1409maptile *
1429get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1410maptile::xy_find (sint16 &x, sint16 &y)
1430{ 1411{
1431 if (*x < 0) 1412 if (x < 0)
1432 { 1413 {
1433 if (!m->tile_path[3]) 1414 if (!tile_path[3])
1434 return 0; 1415 return 0;
1435 1416
1436 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1417 find_and_link (this, 3);
1437 load_and_link_tiled_map (m, 3);
1438
1439 *x += m->tile_map[3]->width; 1418 x += tile_map[3]->width;
1440 return (get_map_from_coord (m->tile_map[3], x, y)); 1419 return tile_map[3]->xy_find (x, y);
1441 } 1420 }
1442 1421
1443 if (*x >= m->width) 1422 if (x >= width)
1444 { 1423 {
1445 if (!m->tile_path[1]) 1424 if (!tile_path[1])
1446 return 0; 1425 return 0;
1447 1426
1448 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1427 find_and_link (this, 1);
1449 load_and_link_tiled_map (m, 1);
1450
1451 *x -= m->width; 1428 x -= width;
1452 return (get_map_from_coord (m->tile_map[1], x, y)); 1429 return tile_map[1]->xy_find (x, y);
1453 } 1430 }
1454 1431
1455 if (*y < 0) 1432 if (y < 0)
1456 { 1433 {
1457 if (!m->tile_path[0]) 1434 if (!tile_path[0])
1458 return 0; 1435 return 0;
1459 1436
1460 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1437 find_and_link (this, 0);
1461 load_and_link_tiled_map (m, 0);
1462
1463 *y += m->tile_map[0]->height; 1438 y += tile_map[0]->height;
1464 return (get_map_from_coord (m->tile_map[0], x, y)); 1439 return tile_map[0]->xy_find (x, y);
1465 } 1440 }
1466 1441
1467 if (*y >= m->height) 1442 if (y >= height)
1468 { 1443 {
1469 if (!m->tile_path[2]) 1444 if (!tile_path[2])
1470 return 0; 1445 return 0;
1471 1446
1472 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1447 find_and_link (this, 2);
1473 load_and_link_tiled_map (m, 2);
1474
1475 *y -= m->height; 1448 y -= height;
1476 return (get_map_from_coord (m->tile_map[2], x, y)); 1449 return tile_map[2]->xy_find (x, y);
1477 } 1450 }
1478 1451
1479 /* Simple case - coordinates are within this local 1452 /* Simple case - coordinates are within this local
1480 * map. 1453 * map.
1481 */ 1454 */
1482 return m; 1455 return this;
1483} 1456}
1484 1457
1485/** 1458/**
1486 * Return whether map2 is adjacent to map1. If so, store the distance from 1459 * Return whether map2 is adjacent to map1. If so, store the distance from
1487 * map1 to map2 in dx/dy. 1460 * map1 to map2 in dx/dy.
1488 */ 1461 */
1489static int 1462int
1490adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1463adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1491{ 1464{
1492 if (!map1 || !map2) 1465 if (!map1 || !map2)
1493 return 0; 1466 return 0;
1494 1467
1468 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1469 //fix: compare paths instead (this is likely faster, too!)
1495 if (map1 == map2) 1470 if (map1 == map2)
1496 { 1471 {
1497 *dx = 0; 1472 *dx = 0;
1498 *dy = 0; 1473 *dy = 0;
1499 } 1474 }
… …
1559 } 1534 }
1560 else 1535 else
1561 return 0; 1536 return 0;
1562 1537
1563 return 1; 1538 return 1;
1539}
1540
1541maptile *
1542maptile::xy_load (sint16 &x, sint16 &y)
1543{
1544 maptile *map = xy_find (x, y);
1545
1546 if (map)
1547 map->load_sync ();
1548
1549 return map;
1550}
1551
1552maptile *
1553get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1554{
1555 return m->xy_load (*x, *y);
1564} 1556}
1565 1557
1566/* From map.c 1558/* From map.c
1567 * This is used by get_player to determine where the other 1559 * This is used by get_player to determine where the other
1568 * creature is. get_rangevector takes into account map tiling, 1560 * creature is. get_rangevector takes into account map tiling,
1569 * so you just can not look the the map coordinates and get the 1561 * so you just can not look the the map coordinates and get the
1570 * righte value. distance_x/y are distance away, which 1562 * righte value. distance_x/y are distance away, which
1571 * can be negativbe. direction is the crossfire direction scheme 1563 * can be negative. direction is the crossfire direction scheme
1572 * that the creature should head. part is the part of the 1564 * that the creature should head. part is the part of the
1573 * monster that is closest. 1565 * monster that is closest.
1574 * 1566 *
1575 * get_rangevector looks at op1 and op2, and fills in the 1567 * get_rangevector looks at op1 and op2, and fills in the
1576 * structure for op1 to get to op2. 1568 * structure for op1 to get to op2.
… …
1587get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1579get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1588{ 1580{
1589 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1581 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1590 { 1582 {
1591 /* be conservative and fill in _some_ data */ 1583 /* be conservative and fill in _some_ data */
1592 retval->distance = 100000; 1584 retval->distance = 10000;
1593 retval->distance_x = 32767; 1585 retval->distance_x = 10000;
1594 retval->distance_y = 32767; 1586 retval->distance_y = 10000;
1595 retval->direction = 0; 1587 retval->direction = 0;
1596 retval->part = 0; 1588 retval->part = 0;
1597 } 1589 }
1598 else 1590 else
1599 { 1591 {
… …
1604 1596
1605 best = op1; 1597 best = op1;
1606 /* If this is multipart, find the closest part now */ 1598 /* If this is multipart, find the closest part now */
1607 if (!(flags & 0x1) && op1->more) 1599 if (!(flags & 0x1) && op1->more)
1608 { 1600 {
1609 object *tmp;
1610 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1601 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1611 1602
1612 /* we just take the offset of the piece to head to figure 1603 /* we just take the offset of the piece to head to figure
1613 * distance instead of doing all that work above again 1604 * distance instead of doing all that work above again
1614 * since the distance fields we set above are positive in the 1605 * since the distance fields we set above are positive in the
1615 * same axis as is used for multipart objects, the simply arithmetic 1606 * same axis as is used for multipart objects, the simply arithmetic
1616 * below works. 1607 * below works.
1617 */ 1608 */
1618 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1609 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1619 { 1610 {
1620 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1611 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1621 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1612 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1622 if (tmpi < best_distance) 1613 if (tmpi < best_distance)
1623 { 1614 {
1624 best_distance = tmpi; 1615 best_distance = tmpi;
1625 best = tmp; 1616 best = tmp;
1626 } 1617 }
1627 } 1618 }
1619
1628 if (best != op1) 1620 if (best != op1)
1629 { 1621 {
1630 retval->distance_x += op1->x - best->x; 1622 retval->distance_x += op1->x - best->x;
1631 retval->distance_y += op1->y - best->y; 1623 retval->distance_y += op1->y - best->y;
1632 } 1624 }
1633 } 1625 }
1626
1634 retval->part = best; 1627 retval->part = best;
1635 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1628 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1636 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1629 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1637 } 1630 }
1638} 1631}
1639 1632
1640/* this is basically the same as get_rangevector above, but instead of 1633/* this is basically the same as get_rangevector above, but instead of
… …
1645 * flags has no meaning for this function at this time - I kept it in to 1638 * flags has no meaning for this function at this time - I kept it in to
1646 * be more consistant with the above function and also in case they are needed 1639 * be more consistant with the above function and also in case they are needed
1647 * for something in the future. Also, since no object is pasted, the best 1640 * for something in the future. Also, since no object is pasted, the best
1648 * field of the rv_vector is set to NULL. 1641 * field of the rv_vector is set to NULL.
1649 */ 1642 */
1650
1651void 1643void
1652get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1644get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1653{ 1645{
1654 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1646 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1655 { 1647 {
1656 /* be conservative and fill in _some_ data */ 1648 /* be conservative and fill in _some_ data */
1657 retval->distance = 100000; 1649 retval->distance = 100000;
… …
1664 { 1656 {
1665 retval->distance_x += op2->x - x; 1657 retval->distance_x += op2->x - x;
1666 retval->distance_y += op2->y - y; 1658 retval->distance_y += op2->y - y;
1667 1659
1668 retval->part = NULL; 1660 retval->part = NULL;
1669 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1661 retval->distance = idistance (retval->distance_x, retval->distance_y);
1670 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1662 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1671 } 1663 }
1672} 1664}
1673 1665
1674/* Returns true of op1 and op2 are effectively on the same map 1666/* Returns true of op1 and op2 are effectively on the same map
… …
1694 op->remove (); 1686 op->remove ();
1695 1687
1696 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1688 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1697} 1689}
1698 1690
1691region *
1692maptile::region (int x, int y) const
1693{
1694 if (regions
1695 && regionmap
1696 && !OUT_OF_REAL_MAP (this, x, y))
1697 if (struct region *reg = regionmap [regions [y * width + x]])
1698 return reg;
1699
1700 if (default_region)
1701 return default_region;
1702
1703 return ::region::default_region ();
1704}
1705
1706

Diff Legend

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