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.60 by root, Sun Dec 31 10:28:35 2006 UTC vs.
Revision 1.86 by root, Thu Feb 15 15:43:36 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
… …
398 * carrying. 330 * carrying.
399 */ 331 */
400 sum_weight (container); 332 sum_weight (container);
401} 333}
402 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;
344}
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
406 * they are saved). We do have to look for the old maps that did save 349 * 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. 350 * the more sections and not re-add sections for them.
… …
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;
… …
594 break; 550 break;
595 551
596 thawer.skip_kv (kw); 552 thawer.skip_kv (kw);
597 } 553 }
598 554
599 return load_objects (thawer); 555 return _load_objects (thawer);
600} 556}
601 557
602bool 558bool
603maptile::save_objects (const char *path, int flags) 559maptile::_save_objects (const char *path, int flags)
604{ 560{
605 object_freezer freezer; 561 object_freezer freezer;
606 562
607 if (!save_objects (freezer, flags)) 563 if (!_save_objects (freezer, flags))
608 return false; 564 return false;
609 565
610 return freezer.save (path); 566 return freezer.save (path);
611} 567}
612 568
613maptile::maptile () 569maptile::maptile ()
614{ 570{
615 in_memory = MAP_SWAPPED; 571 in_memory = MAP_SWAPPED;
616 572
617 /* The maps used to pick up default x and y values from the 573 /* The maps used to pick up default x and y values from the
618 * map archetype. Mimic that behaviour. 574 * map archetype. Mimic that behaviour.
619 */ 575 */
620 width = 16; 576 width = 16;
621 height = 16; 577 height = 16;
622 reset_timeout = 0;
623 timeout = 300; 578 timeout = 300;
624 enter_x = 0; 579 max_nrof = 1000; // 1000 items of anything
625 enter_y = 0; 580 max_volume = 2000000; // 2m³
626} 581}
627 582
628maptile::maptile (int w, int h) 583maptile::maptile (int w, int h)
629{ 584{
630 in_memory = MAP_SWAPPED; 585 in_memory = MAP_SWAPPED;
… …
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
1281uint64
1282mapspace::volume () const
1283{
1284 uint64 vol = 0;
1285
1286 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1287 vol += op->volume ();
1288
1289 return vol;
1290}
1291
1329/* this updates the orig_map->tile_map[tile_num] value after loading 1292/* 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 1293 * 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 1294 * 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 1295 * the value of orig_map->tile_map[tile_num].
1333 * so that it is easier for calling functions to verify success.
1334 */ 1296 */
1335static maptile * 1297static inline maptile *
1336load_and_link_tiled_map (maptile *orig_map, int tile_num) 1298find_and_link (maptile *orig_map, int tile_num)
1337{ 1299{
1300 maptile *mp = orig_map->tile_map [tile_num];
1301
1302 if (!mp)
1303 {
1338 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1304 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1339 1305
1340 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1306 if (!mp)
1341 { 1307 {
1342 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1308 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1343 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1309 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1344 &orig_map->tile_path[tile_num], &orig_map->path); 1310 &orig_map->tile_path[tile_num], &orig_map->path);
1345 mp = new maptile (1, 1); 1311 mp = new maptile (1, 1);
1346 mp->alloc (); 1312 mp->alloc ();
1347 mp->in_memory = MAP_IN_MEMORY; 1313 mp->in_memory = MAP_IN_MEMORY;
1314 }
1348 } 1315 }
1349 1316
1350 int dest_tile = (tile_num + 2) % 4; 1317 int dest_tile = (tile_num + 2) % 4;
1351 1318
1352 orig_map->tile_map[tile_num] = mp; 1319 orig_map->tile_map [tile_num] = mp;
1353 1320
1354 // optimisation: back-link map to origin map if euclidean 1321 // optimisation: back-link map to origin map if euclidean
1355 //TODO: non-euclidean maps MUST GO 1322 //TODO: non-euclidean maps MUST GO
1356 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1323 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1357 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1324 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1358 1325
1359 return mp; 1326 return mp;
1327}
1328
1329static inline void
1330load_and_link (maptile *orig_map, int tile_num)
1331{
1332 find_and_link (orig_map, tile_num)->load_sync ();
1360} 1333}
1361 1334
1362/* this returns TRUE if the coordinates (x,y) are out of 1335/* this returns TRUE if the coordinates (x,y) are out of
1363 * map m. This function also takes into account any 1336 * map m. This function also takes into account any
1364 * tiling considerations, loading adjacant maps as needed. 1337 * tiling considerations, loading adjacant maps as needed.
… …
1381 { 1354 {
1382 if (!m->tile_path[3]) 1355 if (!m->tile_path[3])
1383 return 1; 1356 return 1;
1384 1357
1385 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1358 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1386 load_and_link_tiled_map (m, 3); 1359 find_and_link (m, 3);
1387 1360
1388 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1361 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1389 } 1362 }
1390 1363
1391 if (x >= m->width) 1364 if (x >= m->width)
1392 { 1365 {
1393 if (!m->tile_path[1]) 1366 if (!m->tile_path[1])
1394 return 1; 1367 return 1;
1395 1368
1396 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1369 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1397 load_and_link_tiled_map (m, 1); 1370 find_and_link (m, 1);
1398 1371
1399 return out_of_map (m->tile_map[1], x - m->width, y); 1372 return out_of_map (m->tile_map[1], x - m->width, y);
1400 } 1373 }
1401 1374
1402 if (y < 0) 1375 if (y < 0)
1403 { 1376 {
1404 if (!m->tile_path[0]) 1377 if (!m->tile_path[0])
1405 return 1; 1378 return 1;
1406 1379
1407 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1380 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1408 load_and_link_tiled_map (m, 0); 1381 find_and_link (m, 0);
1409 1382
1410 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1383 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1411 } 1384 }
1412 1385
1413 if (y >= m->height) 1386 if (y >= m->height)
1414 { 1387 {
1415 if (!m->tile_path[2]) 1388 if (!m->tile_path[2])
1416 return 1; 1389 return 1;
1417 1390
1418 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1391 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1419 load_and_link_tiled_map (m, 2); 1392 find_and_link (m, 2);
1420 1393
1421 return out_of_map (m->tile_map[2], x, y - m->height); 1394 return out_of_map (m->tile_map[2], x, y - m->height);
1422 } 1395 }
1423 1396
1424 /* Simple case - coordinates are within this local 1397 /* Simple case - coordinates are within this local
… …
1429 1402
1430/* This is basically the same as out_of_map above, but 1403/* This is basically the same as out_of_map above, but
1431 * instead we return NULL if no map is valid (coordinates 1404 * instead we return NULL if no map is valid (coordinates
1432 * out of bounds and no tiled map), otherwise it returns 1405 * out of bounds and no tiled map), otherwise it returns
1433 * the map as that the coordinates are really on, and 1406 * the map as that the coordinates are really on, and
1434 * updates x and y to be the localized coordinates. 1407 * updates x and y to be the localised coordinates.
1435 * Using this is more efficient of calling out_of_map 1408 * Using this is more efficient of calling out_of_map
1436 * and then figuring out what the real map is 1409 * and then figuring out what the real map is
1437 */ 1410 */
1438maptile * 1411maptile *
1439get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1412maptile::xy_find (sint16 &x, sint16 &y)
1440{ 1413{
1441 if (*x < 0) 1414 if (x < 0)
1442 { 1415 {
1443 if (!m->tile_path[3]) 1416 if (!tile_path[3])
1444 return 0; 1417 return 0;
1445 1418
1446 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1419 find_and_link (this, 3);
1447 load_and_link_tiled_map (m, 3);
1448
1449 *x += m->tile_map[3]->width; 1420 x += tile_map[3]->width;
1450 return (get_map_from_coord (m->tile_map[3], x, y)); 1421 return tile_map[3]->xy_find (x, y);
1451 } 1422 }
1452 1423
1453 if (*x >= m->width) 1424 if (x >= width)
1454 { 1425 {
1455 if (!m->tile_path[1]) 1426 if (!tile_path[1])
1456 return 0; 1427 return 0;
1457 1428
1458 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1429 find_and_link (this, 1);
1459 load_and_link_tiled_map (m, 1);
1460
1461 *x -= m->width; 1430 x -= width;
1462 return (get_map_from_coord (m->tile_map[1], x, y)); 1431 return tile_map[1]->xy_find (x, y);
1463 } 1432 }
1464 1433
1465 if (*y < 0) 1434 if (y < 0)
1466 { 1435 {
1467 if (!m->tile_path[0]) 1436 if (!tile_path[0])
1468 return 0; 1437 return 0;
1469 1438
1470 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1439 find_and_link (this, 0);
1471 load_and_link_tiled_map (m, 0);
1472
1473 *y += m->tile_map[0]->height; 1440 y += tile_map[0]->height;
1474 return (get_map_from_coord (m->tile_map[0], x, y)); 1441 return tile_map[0]->xy_find (x, y);
1475 } 1442 }
1476 1443
1477 if (*y >= m->height) 1444 if (y >= height)
1478 { 1445 {
1479 if (!m->tile_path[2]) 1446 if (!tile_path[2])
1480 return 0; 1447 return 0;
1481 1448
1482 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1449 find_and_link (this, 2);
1483 load_and_link_tiled_map (m, 2);
1484
1485 *y -= m->height; 1450 y -= height;
1486 return (get_map_from_coord (m->tile_map[2], x, y)); 1451 return tile_map[2]->xy_find (x, y);
1487 } 1452 }
1488 1453
1489 /* Simple case - coordinates are within this local 1454 /* Simple case - coordinates are within this local
1490 * map. 1455 * map.
1491 */ 1456 */
1492 return m; 1457 return this;
1493} 1458}
1494 1459
1495/** 1460/**
1496 * Return whether map2 is adjacent to map1. If so, store the distance from 1461 * Return whether map2 is adjacent to map1. If so, store the distance from
1497 * map1 to map2 in dx/dy. 1462 * map1 to map2 in dx/dy.
1498 */ 1463 */
1499static int 1464int
1500adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1465adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1501{ 1466{
1502 if (!map1 || !map2) 1467 if (!map1 || !map2)
1503 return 0; 1468 return 0;
1504 1469
1470 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1471 //fix: compare paths instead (this is likely faster, too!)
1505 if (map1 == map2) 1472 if (map1 == map2)
1506 { 1473 {
1507 *dx = 0; 1474 *dx = 0;
1508 *dy = 0; 1475 *dy = 0;
1509 } 1476 }
… …
1569 } 1536 }
1570 else 1537 else
1571 return 0; 1538 return 0;
1572 1539
1573 return 1; 1540 return 1;
1541}
1542
1543maptile *
1544maptile::xy_load (sint16 &x, sint16 &y)
1545{
1546 maptile *map = xy_find (x, y);
1547
1548 if (map)
1549 map->load_sync ();
1550
1551 return map;
1552}
1553
1554maptile *
1555get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1556{
1557 return m->xy_load (*x, *y);
1574} 1558}
1575 1559
1576/* From map.c 1560/* From map.c
1577 * This is used by get_player to determine where the other 1561 * This is used by get_player to determine where the other
1578 * creature is. get_rangevector takes into account map tiling, 1562 * creature is. get_rangevector takes into account map tiling,
1579 * so you just can not look the the map coordinates and get the 1563 * so you just can not look the the map coordinates and get the
1580 * righte value. distance_x/y are distance away, which 1564 * righte value. distance_x/y are distance away, which
1581 * can be negativbe. direction is the crossfire direction scheme 1565 * can be negative. direction is the crossfire direction scheme
1582 * that the creature should head. part is the part of the 1566 * that the creature should head. part is the part of the
1583 * monster that is closest. 1567 * monster that is closest.
1584 * 1568 *
1585 * get_rangevector looks at op1 and op2, and fills in the 1569 * get_rangevector looks at op1 and op2, and fills in the
1586 * structure for op1 to get to op2. 1570 * structure for op1 to get to op2.
… …
1597get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1581get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1598{ 1582{
1599 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1583 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1600 { 1584 {
1601 /* be conservative and fill in _some_ data */ 1585 /* be conservative and fill in _some_ data */
1602 retval->distance = 100000; 1586 retval->distance = 10000;
1603 retval->distance_x = 32767; 1587 retval->distance_x = 10000;
1604 retval->distance_y = 32767; 1588 retval->distance_y = 10000;
1605 retval->direction = 0; 1589 retval->direction = 0;
1606 retval->part = 0; 1590 retval->part = 0;
1607 } 1591 }
1608 else 1592 else
1609 { 1593 {
… …
1614 1598
1615 best = op1; 1599 best = op1;
1616 /* If this is multipart, find the closest part now */ 1600 /* If this is multipart, find the closest part now */
1617 if (!(flags & 0x1) && op1->more) 1601 if (!(flags & 0x1) && op1->more)
1618 { 1602 {
1619 object *tmp;
1620 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1603 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1621 1604
1622 /* we just take the offset of the piece to head to figure 1605 /* we just take the offset of the piece to head to figure
1623 * distance instead of doing all that work above again 1606 * distance instead of doing all that work above again
1624 * since the distance fields we set above are positive in the 1607 * since the distance fields we set above are positive in the
1625 * same axis as is used for multipart objects, the simply arithmetic 1608 * same axis as is used for multipart objects, the simply arithmetic
1626 * below works. 1609 * below works.
1627 */ 1610 */
1628 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1611 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1629 { 1612 {
1630 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1613 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1631 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1614 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1632 if (tmpi < best_distance) 1615 if (tmpi < best_distance)
1633 { 1616 {
1634 best_distance = tmpi; 1617 best_distance = tmpi;
1635 best = tmp; 1618 best = tmp;
1636 } 1619 }
1637 } 1620 }
1621
1638 if (best != op1) 1622 if (best != op1)
1639 { 1623 {
1640 retval->distance_x += op1->x - best->x; 1624 retval->distance_x += op1->x - best->x;
1641 retval->distance_y += op1->y - best->y; 1625 retval->distance_y += op1->y - best->y;
1642 } 1626 }
1643 } 1627 }
1628
1644 retval->part = best; 1629 retval->part = best;
1645 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1630 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1646 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1631 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1647 } 1632 }
1648} 1633}
1649 1634
1650/* this is basically the same as get_rangevector above, but instead of 1635/* this is basically the same as get_rangevector above, but instead of
… …
1655 * flags has no meaning for this function at this time - I kept it in to 1640 * flags has no meaning for this function at this time - I kept it in to
1656 * be more consistant with the above function and also in case they are needed 1641 * be more consistant with the above function and also in case they are needed
1657 * for something in the future. Also, since no object is pasted, the best 1642 * for something in the future. Also, since no object is pasted, the best
1658 * field of the rv_vector is set to NULL. 1643 * field of the rv_vector is set to NULL.
1659 */ 1644 */
1660
1661void 1645void
1662get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1646get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1663{ 1647{
1664 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1648 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1665 { 1649 {
1666 /* be conservative and fill in _some_ data */ 1650 /* be conservative and fill in _some_ data */
1667 retval->distance = 100000; 1651 retval->distance = 100000;
… …
1674 { 1658 {
1675 retval->distance_x += op2->x - x; 1659 retval->distance_x += op2->x - x;
1676 retval->distance_y += op2->y - y; 1660 retval->distance_y += op2->y - y;
1677 1661
1678 retval->part = NULL; 1662 retval->part = NULL;
1679 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1663 retval->distance = idistance (retval->distance_x, retval->distance_y);
1680 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1664 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1681 } 1665 }
1682} 1666}
1683 1667
1684/* Returns true of op1 and op2 are effectively on the same map 1668/* Returns true of op1 and op2 are effectively on the same map
… …
1704 op->remove (); 1688 op->remove ();
1705 1689
1706 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1690 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1707} 1691}
1708 1692
1693region *
1694maptile::region (int x, int y) const
1695{
1696 if (regions
1697 && regionmap
1698 && !OUT_OF_REAL_MAP (this, x, y))
1699 if (struct region *reg = regionmap [regions [y * width + x]])
1700 return reg;
1701
1702 if (default_region)
1703 return default_region;
1704
1705 return ::region::default_region ();
1706}
1707
1708

Diff Legend

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