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.59 by root, Sat Dec 30 20:32:30 2006 UTC vs.
Revision 1.84 by root, Mon Feb 5 01:24:45 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 <global.h>
25#include <funcpoint.h> 26#include <funcpoint.h>
26 27
27#include <loader.h> 28#include <loader.h>
… …
36 * it really should be called create_mapname 37 * it really should be called create_mapname
37 */ 38 */
38const char * 39const char *
39create_pathname (const char *name) 40create_pathname (const char *name)
40{ 41{
41 static char buf[MAX_BUF]; 42 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); 43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
50 return (buf); 44 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} 45}
114 46
115/* 47/*
116 * This function checks if a file with the given path exists. 48 * This function checks if a file with the given path exists.
117 * -1 is returned if it fails, otherwise the mode of the file 49 * -1 is returned if it fails, otherwise the mode of the file
… …
135 char *endbuf; 67 char *endbuf;
136 struct stat statbuf; 68 struct stat statbuf;
137 int mode = 0; 69 int mode = 0;
138 70
139 if (prepend_dir) 71 if (prepend_dir)
140 strcpy (buf, create_pathname (name)); 72 assign (buf, create_pathname (name));
141 else 73 else
142 strcpy (buf, name); 74 assign (buf, name);
143 75
144 /* old method (strchr(buf, '\0')) seemd very odd to me - 76 /* old method (strchr(buf, '\0')) seemd very odd to me -
145 * this method should be equivalant and is clearer. 77 * this method should be equivalant and is clearer.
146 * Can not use strcat because we need to cycle through 78 * Can not use strcat because we need to cycle through
147 * all the names. 79 * all the names.
… …
296 228
297 } 229 }
298 return 0; 230 return 0;
299} 231}
300 232
301
302/* 233/*
303 * Returns true if the given object can't fit in the given spot. 234 * 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, 235 * This is meant for multi space objects - for single space objecs,
305 * just calling get_map_blocked and checking that against movement type 236 * just calling get_map_blocked and checking that against movement type
306 * of object. This function goes through all the parts of the 237 * of object. This function goes through all the parts of the
… …
398 * carrying. 329 * carrying.
399 */ 330 */
400 sum_weight (container); 331 sum_weight (container);
401} 332}
402 333
334void
335maptile::set_object_flag (int flag, int value)
336{
337 if (!spaces)
338 return;
339
340 for (mapspace *ms = spaces + size (); ms-- > spaces; )
341 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
342 tmp->flag [flag] = value;
343}
344
403/* link_multipart_objects go through all the objects on the map looking 345/* 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 346 * 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 347 * info we have, they only have the head (as would be expected when
406 * they are saved). We do have to look for the old maps that did save 348 * they are saved). We do have to look for the old maps that did save
407 * the more sections and not re-add sections for them. 349 * the more sections and not re-add sections for them.
… …
457 * Loads (ands parses) the objects into a given map from the specified 399 * Loads (ands parses) the objects into a given map from the specified
458 * file pointer. 400 * file pointer.
459 * mapflags is the same as we get with load_original_map 401 * mapflags is the same as we get with load_original_map
460 */ 402 */
461bool 403bool
462maptile::load_objects (object_thawer &thawer) 404maptile::_load_objects (object_thawer &thawer)
463{ 405{
464 int unique; 406 int unique;
465 object *op, *prev = NULL, *last_more = NULL, *otmp; 407 object *op, *prev = NULL, *last_more = NULL, *otmp;
466 408
467 op = object::create (); 409 op = object::create ();
… …
528 if (!spaces) 470 if (!spaces)
529 return; 471 return;
530 472
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 473 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 474 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 475 op->activate_recursive ();
534} 476}
535 477
536void 478void
537maptile::deactivate () 479maptile::deactivate ()
538{ 480{
539 if (!spaces) 481 if (!spaces)
540 return; 482 return;
541 483
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 484 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 485 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 486 op->deactivate_recursive ();
545} 487}
546 488
547bool 489bool
548maptile::save_objects (object_freezer &freezer, int flags) 490maptile::_save_objects (object_freezer &freezer, int flags)
549{ 491{
492 static int cede_count = 0;
493
550 if (flags & IO_HEADER) 494 if (flags & IO_HEADER)
551 save_header (freezer); 495 _save_header (freezer);
552 496
553 if (!spaces) 497 if (!spaces)
554 return false; 498 return false;
555 499
556 for (int i = 0; i < size (); ++i) 500 for (int i = 0; i < size (); ++i)
557 { 501 {
502#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508#endif
509
558 int unique = 0; 510 int unique = 0;
559 for (object *op = spaces [i].bot; op; op = op->above) 511 for (object *op = spaces [i].bot; op; op = op->above)
560 { 512 {
513 // count per-object, but cede only when modification-safe
514 cede_count++;
515
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 516 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
562 unique = 1; 517 unique = 1;
563 518
564 if (!op->can_map_save ()) 519 if (!op->can_map_save ())
565 continue; 520 continue;
… …
576 531
577 return true; 532 return true;
578} 533}
579 534
580bool 535bool
581maptile::load_objects (const char *path, bool skip_header) 536maptile::_load_objects (const char *path, bool skip_header)
582{ 537{
583 object_thawer thawer (path); 538 object_thawer thawer (path);
584 539
585 if (!thawer) 540 if (!thawer)
586 return false; 541 return false;
… …
594 break; 549 break;
595 550
596 thawer.skip_kv (kw); 551 thawer.skip_kv (kw);
597 } 552 }
598 553
599 return load_objects (thawer); 554 return _load_objects (thawer);
600} 555}
601 556
602bool 557bool
603maptile::save_objects (const char *path, int flags) 558maptile::_save_objects (const char *path, int flags)
604{ 559{
605 object_freezer freezer; 560 object_freezer freezer;
606 561
607 if (!save_objects (freezer, flags)) 562 if (!_save_objects (freezer, flags))
608 return false; 563 return false;
609 564
610 return freezer.save (path); 565 return freezer.save (path);
611} 566}
612 567
… …
776 * This could be done in lex (like the object loader), but I think 731 * 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. 732 * currently, there are few enough fields this is not a big deal.
778 * MSW 2001-07-01 733 * MSW 2001-07-01
779 */ 734 */
780bool 735bool
781maptile::load_header (object_thawer &thawer) 736maptile::_load_header (object_thawer &thawer)
782{ 737{
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 (;;) 738 for (;;)
788 { 739 {
789 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
790 741
791 switch (kw) 742 switch (kw)
792 { 743 {
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: 744 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 745 thawer.get_ml (KW_endmsg, msg);
802 break; 746 break;
803 747
804 case KW_lore: // CF+ extension 748 case KW_lore: // CF+ extension
… …
836 case KW_sky: thawer.get (sky); break; 780 case KW_sky: thawer.get (sky); break;
837 781
838 case KW_per_player: thawer.get (per_player); break; 782 case KW_per_player: thawer.get (per_player); break;
839 case KW_per_party: thawer.get (per_party); break; 783 case KW_per_party: thawer.get (per_party); break;
840 784
841 case KW_region: get_region_by_name (thawer.get_str ()); break; 785 case KW_region: default_region = region::find (thawer.get_str ()); break;
842 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 786 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
843 787
844 // old names new names 788 // old names new names
845 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 789 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; 790 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 799 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 800 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 801 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 802 case KW_tile_path_4: thawer.get (tile_path [3]); break;
859 803
804 case KW_end:
805 return true;
806
860 default: 807 default:
861 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 808 if (!thawer.parse_error (kw, "map", 0))
809 return false;
862 break; 810 break;
863 } 811 }
864 } 812 }
865 813
866 abort (); 814 abort ();
867} 815}
868 816
869bool 817bool
870maptile::load_header (const char *path) 818maptile::_load_header (const char *path)
871{ 819{
872 object_thawer thawer (path); 820 object_thawer thawer (path);
873 821
874 if (!thawer) 822 if (!thawer)
875 return false; 823 return false;
876 824
877 return load_header (thawer); 825 return _load_header (thawer);
878} 826}
879 827
880/****************************************************************************** 828/******************************************************************************
881 * This is the start of unique map handling code 829 * This is the start of unique map handling code
882 *****************************************************************************/ 830 *****************************************************************************/
… …
905 } 853 }
906 } 854 }
907} 855}
908 856
909bool 857bool
910maptile::save_header (object_freezer &freezer) 858maptile::_save_header (object_freezer &freezer)
911{ 859{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k) 860#define MAP_OUT(k) freezer.put (KW_ ## k, k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 861#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
914 862
915 MAP_OUT2 (arch, "map"); 863 MAP_OUT2 (arch, "map");
… …
919 MAP_OUT (reset_time); 867 MAP_OUT (reset_time);
920 MAP_OUT (reset_timeout); 868 MAP_OUT (reset_timeout);
921 MAP_OUT (fixed_resettime); 869 MAP_OUT (fixed_resettime);
922 MAP_OUT (difficulty); 870 MAP_OUT (difficulty);
923 871
924 if (region) MAP_OUT2 (region, region->name); 872 if (default_region) MAP_OUT2 (region, default_region->name);
925 873
926 if (shopitems) 874 if (shopitems)
927 { 875 {
928 char shop[MAX_BUF]; 876 char shop[MAX_BUF];
929 print_shop_string (this, shop); 877 print_shop_string (this, shop);
… …
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 905 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]); 906 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]); 907 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]); 908 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 909
962 MAP_OUT2 (end, 0); 910 freezer.put (this);
911 freezer.put (KW_end);
963 912
964 return true; 913 return true;
965} 914}
966 915
967bool 916bool
968maptile::save_header (const char *path) 917maptile::_save_header (const char *path)
969{ 918{
970 object_freezer freezer; 919 object_freezer freezer;
971 920
972 if (!save_header (freezer)) 921 if (!_save_header (freezer))
973 return false; 922 return false;
974 923
975 return freezer.save (path); 924 return freezer.save (path);
976} 925}
977 926
… …
979 * Remove and free all objects in the given map. 928 * Remove and free all objects in the given map.
980 */ 929 */
981void 930void
982maptile::clear () 931maptile::clear ()
983{ 932{
933 sfree (regions, size ()), regions = 0;
934 free (regionmap), regionmap = 0;
935
984 if (!spaces) 936 if (spaces)
985 return; 937 {
986
987 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 938 for (mapspace *ms = spaces + size (); ms-- > spaces; )
988 while (object *op = ms->bot) 939 while (object *op = ms->bot)
989 { 940 {
990 if (op->head) 941 if (op->head)
991 op = op->head; 942 op = op->head;
992 943
993 op->destroy_inv (false); 944 op->destroy_inv (false);
994 op->destroy (); 945 op->destroy ();
995 } 946 }
996 947
997 sfree (spaces, size ()), spaces = 0; 948 sfree (spaces, size ()), spaces = 0;
949 }
998 950
999 if (buttons) 951 if (buttons)
1000 free_objectlinkpt (buttons), buttons = 0; 952 free_objectlinkpt (buttons), buttons = 0;
1001} 953}
1002 954
… …
1156 */ 1108 */
1157void 1109void
1158mapspace::update_ () 1110mapspace::update_ ()
1159{ 1111{
1160 object *tmp, *last = 0; 1112 object *tmp, *last = 0;
1161 uint8 flags = 0, light = 0, anywhere = 0; 1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1162 New_Face *top, *floor, *middle; 1114 facetile *top, *floor, *middle;
1163 object *top_obj, *floor_obj, *middle_obj; 1115 object *top_obj, *floor_obj, *middle_obj;
1164 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1165 1117
1166 middle = blank_face; 1118 middle = blank_face;
1167 top = blank_face; 1119 top = blank_face;
… …
1283 1235
1284 /* If two top faces are already set, quit processing */ 1236 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1237 if ((top != blank_face) && (middle != blank_face))
1286 break; 1238 break;
1287 1239
1288 /* Only show visible faces, unless its the editor - show all */ 1240 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1241 if (!tmp->invisible)
1290 { 1242 {
1291 /* Fill in top if needed */ 1243 /* Fill in top if needed */
1292 if (top == blank_face) 1244 if (top == blank_face)
1293 { 1245 {
1294 top = tmp->face; 1246 top = tmp->face;
… …
1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1276 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; 1277 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; 1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1327} 1279}
1328 1280
1329/* this updates the orig_map->tile_map[tile_num] value after loading 1281/* 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 1282 * 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 1283 * 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 1284 * the value of orig_map->tile_map[tile_num].
1333 * so that it is easier for calling functions to verify success.
1334 */ 1285 */
1335static maptile * 1286static inline maptile *
1336load_and_link_tiled_map (maptile *orig_map, int tile_num) 1287find_and_link (maptile *orig_map, int tile_num)
1337{ 1288{
1289 maptile *mp = orig_map->tile_map [tile_num];
1290
1291 if (!mp)
1292 {
1338 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); 1293 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1339 mp->load (); 1294
1295 if (!mp)
1296 {
1297 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1298 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1299 &orig_map->tile_path[tile_num], &orig_map->path);
1300 mp = new maptile (1, 1);
1301 mp->alloc ();
1302 mp->in_memory = MAP_IN_MEMORY;
1303 }
1304 }
1340 1305
1341 int dest_tile = (tile_num + 2) % 4; 1306 int dest_tile = (tile_num + 2) % 4;
1342 1307
1343 orig_map->tile_map[tile_num] = mp; 1308 orig_map->tile_map [tile_num] = mp;
1344 1309
1345 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1310 // 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) 1311 //TODO: non-euclidean maps MUST GO
1312 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; 1313 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1348 1314
1349 return mp; 1315 return mp;
1316}
1317
1318static inline void
1319load_and_link (maptile *orig_map, int tile_num)
1320{
1321 find_and_link (orig_map, tile_num)->load_sync ();
1350} 1322}
1351 1323
1352/* this returns TRUE if the coordinates (x,y) are out of 1324/* this returns TRUE if the coordinates (x,y) are out of
1353 * map m. This function also takes into account any 1325 * map m. This function also takes into account any
1354 * tiling considerations, loading adjacant maps as needed. 1326 * tiling considerations, loading adjacant maps as needed.
… …
1371 { 1343 {
1372 if (!m->tile_path[3]) 1344 if (!m->tile_path[3])
1373 return 1; 1345 return 1;
1374 1346
1375 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1347 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1376 load_and_link_tiled_map (m, 3); 1348 find_and_link (m, 3);
1377 1349
1378 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1350 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1379 } 1351 }
1380 1352
1381 if (x >= m->width) 1353 if (x >= m->width)
1382 { 1354 {
1383 if (!m->tile_path[1]) 1355 if (!m->tile_path[1])
1384 return 1; 1356 return 1;
1385 1357
1386 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1358 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1387 load_and_link_tiled_map (m, 1); 1359 find_and_link (m, 1);
1388 1360
1389 return out_of_map (m->tile_map[1], x - m->width, y); 1361 return out_of_map (m->tile_map[1], x - m->width, y);
1390 } 1362 }
1391 1363
1392 if (y < 0) 1364 if (y < 0)
1393 { 1365 {
1394 if (!m->tile_path[0]) 1366 if (!m->tile_path[0])
1395 return 1; 1367 return 1;
1396 1368
1397 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1369 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1398 load_and_link_tiled_map (m, 0); 1370 find_and_link (m, 0);
1399 1371
1400 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1372 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1401 } 1373 }
1402 1374
1403 if (y >= m->height) 1375 if (y >= m->height)
1404 { 1376 {
1405 if (!m->tile_path[2]) 1377 if (!m->tile_path[2])
1406 return 1; 1378 return 1;
1407 1379
1408 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1380 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1409 load_and_link_tiled_map (m, 2); 1381 find_and_link (m, 2);
1410 1382
1411 return out_of_map (m->tile_map[2], x, y - m->height); 1383 return out_of_map (m->tile_map[2], x, y - m->height);
1412 } 1384 }
1413 1385
1414 /* Simple case - coordinates are within this local 1386 /* Simple case - coordinates are within this local
… …
1419 1391
1420/* This is basically the same as out_of_map above, but 1392/* This is basically the same as out_of_map above, but
1421 * instead we return NULL if no map is valid (coordinates 1393 * instead we return NULL if no map is valid (coordinates
1422 * out of bounds and no tiled map), otherwise it returns 1394 * out of bounds and no tiled map), otherwise it returns
1423 * the map as that the coordinates are really on, and 1395 * the map as that the coordinates are really on, and
1424 * updates x and y to be the localized coordinates. 1396 * updates x and y to be the localised coordinates.
1425 * Using this is more efficient of calling out_of_map 1397 * Using this is more efficient of calling out_of_map
1426 * and then figuring out what the real map is 1398 * and then figuring out what the real map is
1427 */ 1399 */
1428maptile * 1400maptile *
1429get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1401maptile::xy_find (sint16 &x, sint16 &y)
1430{ 1402{
1431 if (*x < 0) 1403 if (x < 0)
1432 { 1404 {
1433 if (!m->tile_path[3]) 1405 if (!tile_path[3])
1434 return 0; 1406 return 0;
1435 1407
1436 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1408 find_and_link (this, 3);
1437 load_and_link_tiled_map (m, 3);
1438
1439 *x += m->tile_map[3]->width; 1409 x += tile_map[3]->width;
1440 return (get_map_from_coord (m->tile_map[3], x, y)); 1410 return tile_map[3]->xy_find (x, y);
1441 } 1411 }
1442 1412
1443 if (*x >= m->width) 1413 if (x >= width)
1444 { 1414 {
1445 if (!m->tile_path[1]) 1415 if (!tile_path[1])
1446 return 0; 1416 return 0;
1447 1417
1448 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1418 find_and_link (this, 1);
1449 load_and_link_tiled_map (m, 1);
1450
1451 *x -= m->width; 1419 x -= width;
1452 return (get_map_from_coord (m->tile_map[1], x, y)); 1420 return tile_map[1]->xy_find (x, y);
1453 } 1421 }
1454 1422
1455 if (*y < 0) 1423 if (y < 0)
1456 { 1424 {
1457 if (!m->tile_path[0]) 1425 if (!tile_path[0])
1458 return 0; 1426 return 0;
1459 1427
1460 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1428 find_and_link (this, 0);
1461 load_and_link_tiled_map (m, 0);
1462
1463 *y += m->tile_map[0]->height; 1429 y += tile_map[0]->height;
1464 return (get_map_from_coord (m->tile_map[0], x, y)); 1430 return tile_map[0]->xy_find (x, y);
1465 } 1431 }
1466 1432
1467 if (*y >= m->height) 1433 if (y >= height)
1468 { 1434 {
1469 if (!m->tile_path[2]) 1435 if (!tile_path[2])
1470 return 0; 1436 return 0;
1471 1437
1472 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1438 find_and_link (this, 2);
1473 load_and_link_tiled_map (m, 2);
1474
1475 *y -= m->height; 1439 y -= height;
1476 return (get_map_from_coord (m->tile_map[2], x, y)); 1440 return tile_map[2]->xy_find (x, y);
1477 } 1441 }
1478 1442
1479 /* Simple case - coordinates are within this local 1443 /* Simple case - coordinates are within this local
1480 * map. 1444 * map.
1481 */ 1445 */
1482 return m; 1446 return this;
1483} 1447}
1484 1448
1485/** 1449/**
1486 * Return whether map2 is adjacent to map1. If so, store the distance from 1450 * Return whether map2 is adjacent to map1. If so, store the distance from
1487 * map1 to map2 in dx/dy. 1451 * map1 to map2 in dx/dy.
1488 */ 1452 */
1489static int 1453int
1490adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1491{ 1455{
1492 if (!map1 || !map2) 1456 if (!map1 || !map2)
1493 return 0; 1457 return 0;
1494 1458
1459 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1460 //fix: compare paths instead (this is likely faster, too!)
1495 if (map1 == map2) 1461 if (map1 == map2)
1496 { 1462 {
1497 *dx = 0; 1463 *dx = 0;
1498 *dy = 0; 1464 *dy = 0;
1499 } 1465 }
… …
1559 } 1525 }
1560 else 1526 else
1561 return 0; 1527 return 0;
1562 1528
1563 return 1; 1529 return 1;
1530}
1531
1532maptile *
1533maptile::xy_load (sint16 &x, sint16 &y)
1534{
1535 maptile *map = xy_find (x, y);
1536
1537 if (map)
1538 map->load_sync ();
1539
1540 return map;
1541}
1542
1543maptile *
1544get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1545{
1546 return m->xy_load (*x, *y);
1564} 1547}
1565 1548
1566/* From map.c 1549/* From map.c
1567 * This is used by get_player to determine where the other 1550 * This is used by get_player to determine where the other
1568 * creature is. get_rangevector takes into account map tiling, 1551 * creature is. get_rangevector takes into account map tiling,
1569 * so you just can not look the the map coordinates and get the 1552 * so you just can not look the the map coordinates and get the
1570 * righte value. distance_x/y are distance away, which 1553 * righte value. distance_x/y are distance away, which
1571 * can be negativbe. direction is the crossfire direction scheme 1554 * can be negative. direction is the crossfire direction scheme
1572 * that the creature should head. part is the part of the 1555 * that the creature should head. part is the part of the
1573 * monster that is closest. 1556 * monster that is closest.
1574 * 1557 *
1575 * get_rangevector looks at op1 and op2, and fills in the 1558 * get_rangevector looks at op1 and op2, and fills in the
1576 * structure for op1 to get to op2. 1559 * structure for op1 to get to op2.
… …
1623 { 1606 {
1624 best_distance = tmpi; 1607 best_distance = tmpi;
1625 best = tmp; 1608 best = tmp;
1626 } 1609 }
1627 } 1610 }
1611
1628 if (best != op1) 1612 if (best != op1)
1629 { 1613 {
1630 retval->distance_x += op1->x - best->x; 1614 retval->distance_x += op1->x - best->x;
1631 retval->distance_y += op1->y - best->y; 1615 retval->distance_y += op1->y - best->y;
1632 } 1616 }
1633 } 1617 }
1618
1634 retval->part = best; 1619 retval->part = best;
1635 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1620 retval->distance = idistance (retval->distance_x, retval->distance_y);
1636 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1637 } 1622 }
1638} 1623}
1639 1624
1640/* this is basically the same as get_rangevector above, but instead of 1625/* 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 1630 * 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 1631 * 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 1632 * for something in the future. Also, since no object is pasted, the best
1648 * field of the rv_vector is set to NULL. 1633 * field of the rv_vector is set to NULL.
1649 */ 1634 */
1650
1651void 1635void
1652get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1636get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1653{ 1637{
1654 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1638 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1655 { 1639 {
1656 /* be conservative and fill in _some_ data */ 1640 /* be conservative and fill in _some_ data */
1657 retval->distance = 100000; 1641 retval->distance = 100000;
… …
1664 { 1648 {
1665 retval->distance_x += op2->x - x; 1649 retval->distance_x += op2->x - x;
1666 retval->distance_y += op2->y - y; 1650 retval->distance_y += op2->y - y;
1667 1651
1668 retval->part = NULL; 1652 retval->part = NULL;
1669 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1653 retval->distance = idistance (retval->distance_x, retval->distance_y);
1670 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1654 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1671 } 1655 }
1672} 1656}
1673 1657
1674/* Returns true of op1 and op2 are effectively on the same map 1658/* Returns true of op1 and op2 are effectively on the same map
… …
1694 op->remove (); 1678 op->remove ();
1695 1679
1696 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1680 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1697} 1681}
1698 1682
1683region *
1684maptile::region (int x, int y) const
1685{
1686 if (regions
1687 && regionmap
1688 && !OUT_OF_REAL_MAP (this, x, y))
1689 if (struct region *reg = regionmap [regions [y * width + x]])
1690 return reg;
1691
1692 if (default_region)
1693 return default_region;
1694
1695 return ::region::default_region ();
1696}
1697

Diff Legend

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