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.62 by root, Sun Dec 31 22:23:11 2006 UTC vs.
Revision 1.85 by root, Wed Feb 7 23:50:01 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.
… …
66 char *endbuf; 68 char *endbuf;
67 struct stat statbuf; 69 struct stat statbuf;
68 int mode = 0; 70 int mode = 0;
69 71
70 if (prepend_dir) 72 if (prepend_dir)
71 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
72 else 74 else
73 strcpy (buf, name); 75 assign (buf, name);
74 76
75 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
76 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
77 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
78 * all the names. 80 * all the names.
… …
227 229
228 } 230 }
229 return 0; 231 return 0;
230} 232}
231 233
232
233/* 234/*
234 * 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.
235 * This is meant for multi space objects - for single space objecs, 236 * This is meant for multi space objects - for single space objecs,
236 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
237 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
329 * carrying. 330 * carrying.
330 */ 331 */
331 sum_weight (container); 332 sum_weight (container);
332} 333}
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;
344}
345
334/* 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
335 * 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
336 * 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
337 * 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
338 * the more sections and not re-add sections for them. 350 * the more sections and not re-add sections for them.
… …
388 * 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
389 * file pointer. 401 * file pointer.
390 * mapflags is the same as we get with load_original_map 402 * mapflags is the same as we get with load_original_map
391 */ 403 */
392bool 404bool
393maptile::load_objects (object_thawer &thawer) 405maptile::_load_objects (object_thawer &thawer)
394{ 406{
395 int unique; 407 int unique;
396 object *op, *prev = NULL, *last_more = NULL, *otmp; 408 object *op, *prev = NULL, *last_more = NULL, *otmp;
397 409
398 op = object::create (); 410 op = object::create ();
… …
474 for (object *op = ms->bot; op; op = op->above) 486 for (object *op = ms->bot; op; op = op->above)
475 op->deactivate_recursive (); 487 op->deactivate_recursive ();
476} 488}
477 489
478bool 490bool
479maptile::save_objects (object_freezer &freezer, int flags) 491maptile::_save_objects (object_freezer &freezer, int flags)
480{ 492{
493 static int cede_count = 0;
494
481 if (flags & IO_HEADER) 495 if (flags & IO_HEADER)
482 save_header (freezer); 496 _save_header (freezer);
483 497
484 if (!spaces) 498 if (!spaces)
485 return false; 499 return false;
486 500
487 for (int i = 0; i < size (); ++i) 501 for (int i = 0; i < size (); ++i)
488 { 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
489 int unique = 0; 511 int unique = 0;
490 for (object *op = spaces [i].bot; op; op = op->above) 512 for (object *op = spaces [i].bot; op; op = op->above)
491 { 513 {
514 // count per-object, but cede only when modification-safe
515 cede_count++;
516
492 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 517 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
493 unique = 1; 518 unique = 1;
494 519
495 if (!op->can_map_save ()) 520 if (!op->can_map_save ())
496 continue; 521 continue;
… …
507 532
508 return true; 533 return true;
509} 534}
510 535
511bool 536bool
512maptile::load_objects (const char *path, bool skip_header) 537maptile::_load_objects (const char *path, bool skip_header)
513{ 538{
514 object_thawer thawer (path); 539 object_thawer thawer (path);
515 540
516 if (!thawer) 541 if (!thawer)
517 return false; 542 return false;
… …
525 break; 550 break;
526 551
527 thawer.skip_kv (kw); 552 thawer.skip_kv (kw);
528 } 553 }
529 554
530 return load_objects (thawer); 555 return _load_objects (thawer);
531} 556}
532 557
533bool 558bool
534maptile::save_objects (const char *path, int flags) 559maptile::_save_objects (const char *path, int flags)
535{ 560{
536 object_freezer freezer; 561 object_freezer freezer;
537 562
538 if (!save_objects (freezer, flags)) 563 if (!_save_objects (freezer, flags))
539 return false; 564 return false;
540 565
541 return freezer.save (path); 566 return freezer.save (path);
542} 567}
543 568
544maptile::maptile () 569maptile::maptile ()
545{ 570{
546 in_memory = MAP_SWAPPED; 571 in_memory = MAP_SWAPPED;
547 572
548 /* 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
549 * map archetype. Mimic that behaviour. 574 * map archetype. Mimic that behaviour.
550 */ 575 */
551 width = 16; 576 width = 16;
552 height = 16; 577 height = 16;
553 reset_timeout = 0;
554 timeout = 300; 578 timeout = 300;
555 enter_x = 0; 579 max_nrof = 1000; // 1000 items of anything
556 enter_y = 0; 580 max_volume = 2000000; // 2m³
557} 581}
558 582
559maptile::maptile (int w, int h) 583maptile::maptile (int w, int h)
560{ 584{
561 in_memory = MAP_SWAPPED; 585 in_memory = MAP_SWAPPED;
… …
707 * 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
708 * 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.
709 * MSW 2001-07-01 733 * MSW 2001-07-01
710 */ 734 */
711bool 735bool
712maptile::load_header (object_thawer &thawer) 736maptile::_load_header (object_thawer &thawer)
713{ 737{
714 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
715 int msgpos = 0;
716 int maplorepos = 0;
717
718 for (;;) 738 for (;;)
719 { 739 {
720 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
721 741
722 switch (kw) 742 switch (kw)
723 { 743 {
724 case KW_EOF:
725 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
726 return false;
727
728 case KW_end:
729 return true;
730
731 case KW_msg: 744 case KW_msg:
732 thawer.get_ml (KW_endmsg, msg); 745 thawer.get_ml (KW_endmsg, msg);
733 break; 746 break;
734 747
735 case KW_lore: // CF+ extension 748 case KW_lore: // CF+ extension
… …
767 case KW_sky: thawer.get (sky); break; 780 case KW_sky: thawer.get (sky); break;
768 781
769 case KW_per_player: thawer.get (per_player); break; 782 case KW_per_player: thawer.get (per_player); break;
770 case KW_per_party: thawer.get (per_party); break; 783 case KW_per_party: thawer.get (per_party); break;
771 784
772 case KW_region: get_region_by_name (thawer.get_str ()); break; 785 case KW_region: default_region = region::find (thawer.get_str ()); break;
773 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 786 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
774 787
775 // old names new names 788 // old names new names
776 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;
777 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;
… …
786 case KW_tile_path_1: thawer.get (tile_path [0]); break; 799 case KW_tile_path_1: thawer.get (tile_path [0]); break;
787 case KW_tile_path_2: thawer.get (tile_path [1]); break; 800 case KW_tile_path_2: thawer.get (tile_path [1]); break;
788 case KW_tile_path_3: thawer.get (tile_path [2]); break; 801 case KW_tile_path_3: thawer.get (tile_path [2]); break;
789 case KW_tile_path_4: thawer.get (tile_path [3]); break; 802 case KW_tile_path_4: thawer.get (tile_path [3]); break;
790 803
804 case KW_end:
805 return true;
806
791 default: 807 default:
792 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;
793 break; 810 break;
794 } 811 }
795 } 812 }
796 813
797 abort (); 814 abort ();
798} 815}
799 816
800bool 817bool
801maptile::load_header (const char *path) 818maptile::_load_header (const char *path)
802{ 819{
803 object_thawer thawer (path); 820 object_thawer thawer (path);
804 821
805 if (!thawer) 822 if (!thawer)
806 return false; 823 return false;
807 824
808 return load_header (thawer); 825 return _load_header (thawer);
809} 826}
810 827
811/****************************************************************************** 828/******************************************************************************
812 * This is the start of unique map handling code 829 * This is the start of unique map handling code
813 *****************************************************************************/ 830 *****************************************************************************/
… …
836 } 853 }
837 } 854 }
838} 855}
839 856
840bool 857bool
841maptile::save_header (object_freezer &freezer) 858maptile::_save_header (object_freezer &freezer)
842{ 859{
843#define MAP_OUT(k) freezer.put (KW_ ## k, k) 860#define MAP_OUT(k) freezer.put (KW_ ## k, k)
844#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 861#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
845 862
846 MAP_OUT2 (arch, "map"); 863 MAP_OUT2 (arch, "map");
… …
850 MAP_OUT (reset_time); 867 MAP_OUT (reset_time);
851 MAP_OUT (reset_timeout); 868 MAP_OUT (reset_timeout);
852 MAP_OUT (fixed_resettime); 869 MAP_OUT (fixed_resettime);
853 MAP_OUT (difficulty); 870 MAP_OUT (difficulty);
854 871
855 if (region) MAP_OUT2 (region, region->name); 872 if (default_region) MAP_OUT2 (region, default_region->name);
856 873
857 if (shopitems) 874 if (shopitems)
858 { 875 {
859 char shop[MAX_BUF]; 876 char shop[MAX_BUF];
860 print_shop_string (this, shop); 877 print_shop_string (this, shop);
… …
888 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]);
889 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]);
890 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]);
891 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]);
892 909
910 freezer.put (this);
893 freezer.put (KW_end); 911 freezer.put (KW_end);
894 912
895 return true; 913 return true;
896} 914}
897 915
898bool 916bool
899maptile::save_header (const char *path) 917maptile::_save_header (const char *path)
900{ 918{
901 object_freezer freezer; 919 object_freezer freezer;
902 920
903 if (!save_header (freezer)) 921 if (!_save_header (freezer))
904 return false; 922 return false;
905 923
906 return freezer.save (path); 924 return freezer.save (path);
907} 925}
908 926
… …
910 * Remove and free all objects in the given map. 928 * Remove and free all objects in the given map.
911 */ 929 */
912void 930void
913maptile::clear () 931maptile::clear ()
914{ 932{
933 sfree (regions, size ()), regions = 0;
934 free (regionmap), regionmap = 0;
935
915 if (!spaces) 936 if (spaces)
916 return; 937 {
917
918 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 938 for (mapspace *ms = spaces + size (); ms-- > spaces; )
919 while (object *op = ms->bot) 939 while (object *op = ms->bot)
920 { 940 {
921 if (op->head) 941 if (op->head)
922 op = op->head; 942 op = op->head;
923 943
924 op->destroy_inv (false); 944 op->destroy_inv (false);
925 op->destroy (); 945 op->destroy ();
926 } 946 }
927 947
928 sfree (spaces, size ()), spaces = 0; 948 sfree (spaces, size ()), spaces = 0;
949 }
929 950
930 if (buttons) 951 if (buttons)
931 free_objectlinkpt (buttons), buttons = 0; 952 free_objectlinkpt (buttons), buttons = 0;
932} 953}
933 954
… …
1087 */ 1108 */
1088void 1109void
1089mapspace::update_ () 1110mapspace::update_ ()
1090{ 1111{
1091 object *tmp, *last = 0; 1112 object *tmp, *last = 0;
1092 uint8 flags = 0, light = 0, anywhere = 0; 1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1093 New_Face *top, *floor, *middle; 1114 facetile *top, *floor, *middle;
1094 object *top_obj, *floor_obj, *middle_obj; 1115 object *top_obj, *floor_obj, *middle_obj;
1095 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;
1096 1117
1097 middle = blank_face; 1118 middle = blank_face;
1098 top = blank_face; 1119 top = blank_face;
… …
1214 1235
1215 /* If two top faces are already set, quit processing */ 1236 /* If two top faces are already set, quit processing */
1216 if ((top != blank_face) && (middle != blank_face)) 1237 if ((top != blank_face) && (middle != blank_face))
1217 break; 1238 break;
1218 1239
1219 /* Only show visible faces, unless its the editor - show all */ 1240 /* Only show visible faces */
1220 if (!tmp->invisible || editor) 1241 if (!tmp->invisible)
1221 { 1242 {
1222 /* Fill in top if needed */ 1243 /* Fill in top if needed */
1223 if (top == blank_face) 1244 if (top == blank_face)
1224 { 1245 {
1225 top = tmp->face; 1246 top = tmp->face;
… …
1255 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;
1256 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;
1257 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;
1258} 1279}
1259 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
1260/* 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
1261 * 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
1262 * 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
1263 * the value of orig_map->tile_map[tile_num]. It really only does this 1295 * the value of orig_map->tile_map[tile_num].
1264 * so that it is easier for calling functions to verify success.
1265 */ 1296 */
1266static maptile * 1297static inline maptile *
1267load_and_link_tiled_map (maptile *orig_map, int tile_num) 1298find_and_link (maptile *orig_map, int tile_num)
1268{ 1299{
1300 maptile *mp = orig_map->tile_map [tile_num];
1301
1302 if (!mp)
1303 {
1269 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);
1270 1305
1271 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1306 if (!mp)
1272 { 1307 {
1273 // 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
1274 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",
1275 &orig_map->tile_path[tile_num], &orig_map->path); 1310 &orig_map->tile_path[tile_num], &orig_map->path);
1276 mp = new maptile (1, 1); 1311 mp = new maptile (1, 1);
1277 mp->alloc (); 1312 mp->alloc ();
1278 mp->in_memory = MAP_IN_MEMORY; 1313 mp->in_memory = MAP_IN_MEMORY;
1314 }
1279 } 1315 }
1280 1316
1281 int dest_tile = (tile_num + 2) % 4; 1317 int dest_tile = (tile_num + 2) % 4;
1282 1318
1283 orig_map->tile_map[tile_num] = mp; 1319 orig_map->tile_map [tile_num] = mp;
1284 1320
1285 // optimisation: back-link map to origin map if euclidean 1321 // optimisation: back-link map to origin map if euclidean
1286 //TODO: non-euclidean maps MUST GO 1322 //TODO: non-euclidean maps MUST GO
1287 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)
1288 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;
1289 1325
1290 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 ();
1291} 1333}
1292 1334
1293/* this returns TRUE if the coordinates (x,y) are out of 1335/* this returns TRUE if the coordinates (x,y) are out of
1294 * map m. This function also takes into account any 1336 * map m. This function also takes into account any
1295 * tiling considerations, loading adjacant maps as needed. 1337 * tiling considerations, loading adjacant maps as needed.
… …
1312 { 1354 {
1313 if (!m->tile_path[3]) 1355 if (!m->tile_path[3])
1314 return 1; 1356 return 1;
1315 1357
1316 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)
1317 load_and_link_tiled_map (m, 3); 1359 find_and_link (m, 3);
1318 1360
1319 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);
1320 } 1362 }
1321 1363
1322 if (x >= m->width) 1364 if (x >= m->width)
1323 { 1365 {
1324 if (!m->tile_path[1]) 1366 if (!m->tile_path[1])
1325 return 1; 1367 return 1;
1326 1368
1327 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)
1328 load_and_link_tiled_map (m, 1); 1370 find_and_link (m, 1);
1329 1371
1330 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);
1331 } 1373 }
1332 1374
1333 if (y < 0) 1375 if (y < 0)
1334 { 1376 {
1335 if (!m->tile_path[0]) 1377 if (!m->tile_path[0])
1336 return 1; 1378 return 1;
1337 1379
1338 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)
1339 load_and_link_tiled_map (m, 0); 1381 find_and_link (m, 0);
1340 1382
1341 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);
1342 } 1384 }
1343 1385
1344 if (y >= m->height) 1386 if (y >= m->height)
1345 { 1387 {
1346 if (!m->tile_path[2]) 1388 if (!m->tile_path[2])
1347 return 1; 1389 return 1;
1348 1390
1349 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)
1350 load_and_link_tiled_map (m, 2); 1392 find_and_link (m, 2);
1351 1393
1352 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);
1353 } 1395 }
1354 1396
1355 /* Simple case - coordinates are within this local 1397 /* Simple case - coordinates are within this local
… …
1360 1402
1361/* This is basically the same as out_of_map above, but 1403/* This is basically the same as out_of_map above, but
1362 * instead we return NULL if no map is valid (coordinates 1404 * instead we return NULL if no map is valid (coordinates
1363 * out of bounds and no tiled map), otherwise it returns 1405 * out of bounds and no tiled map), otherwise it returns
1364 * the map as that the coordinates are really on, and 1406 * the map as that the coordinates are really on, and
1365 * updates x and y to be the localized coordinates. 1407 * updates x and y to be the localised coordinates.
1366 * Using this is more efficient of calling out_of_map 1408 * Using this is more efficient of calling out_of_map
1367 * and then figuring out what the real map is 1409 * and then figuring out what the real map is
1368 */ 1410 */
1369maptile * 1411maptile *
1370get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1412maptile::xy_find (sint16 &x, sint16 &y)
1371{ 1413{
1372 if (*x < 0) 1414 if (x < 0)
1373 { 1415 {
1374 if (!m->tile_path[3]) 1416 if (!tile_path[3])
1375 return 0; 1417 return 0;
1376 1418
1377 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1419 find_and_link (this, 3);
1378 load_and_link_tiled_map (m, 3);
1379
1380 *x += m->tile_map[3]->width; 1420 x += tile_map[3]->width;
1381 return (get_map_from_coord (m->tile_map[3], x, y)); 1421 return tile_map[3]->xy_find (x, y);
1382 } 1422 }
1383 1423
1384 if (*x >= m->width) 1424 if (x >= width)
1385 { 1425 {
1386 if (!m->tile_path[1]) 1426 if (!tile_path[1])
1387 return 0; 1427 return 0;
1388 1428
1389 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1429 find_and_link (this, 1);
1390 load_and_link_tiled_map (m, 1);
1391
1392 *x -= m->width; 1430 x -= width;
1393 return (get_map_from_coord (m->tile_map[1], x, y)); 1431 return tile_map[1]->xy_find (x, y);
1394 } 1432 }
1395 1433
1396 if (*y < 0) 1434 if (y < 0)
1397 { 1435 {
1398 if (!m->tile_path[0]) 1436 if (!tile_path[0])
1399 return 0; 1437 return 0;
1400 1438
1401 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1439 find_and_link (this, 0);
1402 load_and_link_tiled_map (m, 0);
1403
1404 *y += m->tile_map[0]->height; 1440 y += tile_map[0]->height;
1405 return (get_map_from_coord (m->tile_map[0], x, y)); 1441 return tile_map[0]->xy_find (x, y);
1406 } 1442 }
1407 1443
1408 if (*y >= m->height) 1444 if (y >= height)
1409 { 1445 {
1410 if (!m->tile_path[2]) 1446 if (!tile_path[2])
1411 return 0; 1447 return 0;
1412 1448
1413 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1449 find_and_link (this, 2);
1414 load_and_link_tiled_map (m, 2);
1415
1416 *y -= m->height; 1450 y -= height;
1417 return (get_map_from_coord (m->tile_map[2], x, y)); 1451 return tile_map[2]->xy_find (x, y);
1418 } 1452 }
1419 1453
1420 /* Simple case - coordinates are within this local 1454 /* Simple case - coordinates are within this local
1421 * map. 1455 * map.
1422 */ 1456 */
1423 return m; 1457 return this;
1424} 1458}
1425 1459
1426/** 1460/**
1427 * 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
1428 * map1 to map2 in dx/dy. 1462 * map1 to map2 in dx/dy.
1429 */ 1463 */
1430static int 1464int
1431adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1465adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1432{ 1466{
1433 if (!map1 || !map2) 1467 if (!map1 || !map2)
1434 return 0; 1468 return 0;
1435 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!)
1436 if (map1 == map2) 1472 if (map1 == map2)
1437 { 1473 {
1438 *dx = 0; 1474 *dx = 0;
1439 *dy = 0; 1475 *dy = 0;
1440 } 1476 }
… …
1500 } 1536 }
1501 else 1537 else
1502 return 0; 1538 return 0;
1503 1539
1504 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);
1505} 1558}
1506 1559
1507/* From map.c 1560/* From map.c
1508 * This is used by get_player to determine where the other 1561 * This is used by get_player to determine where the other
1509 * creature is. get_rangevector takes into account map tiling, 1562 * creature is. get_rangevector takes into account map tiling,
1510 * 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
1511 * righte value. distance_x/y are distance away, which 1564 * righte value. distance_x/y are distance away, which
1512 * can be negativbe. direction is the crossfire direction scheme 1565 * can be negative. direction is the crossfire direction scheme
1513 * that the creature should head. part is the part of the 1566 * that the creature should head. part is the part of the
1514 * monster that is closest. 1567 * monster that is closest.
1515 * 1568 *
1516 * get_rangevector looks at op1 and op2, and fills in the 1569 * get_rangevector looks at op1 and op2, and fills in the
1517 * structure for op1 to get to op2. 1570 * structure for op1 to get to op2.
… …
1564 { 1617 {
1565 best_distance = tmpi; 1618 best_distance = tmpi;
1566 best = tmp; 1619 best = tmp;
1567 } 1620 }
1568 } 1621 }
1622
1569 if (best != op1) 1623 if (best != op1)
1570 { 1624 {
1571 retval->distance_x += op1->x - best->x; 1625 retval->distance_x += op1->x - best->x;
1572 retval->distance_y += op1->y - best->y; 1626 retval->distance_y += op1->y - best->y;
1573 } 1627 }
1574 } 1628 }
1629
1575 retval->part = best; 1630 retval->part = best;
1576 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1631 retval->distance = idistance (retval->distance_x, retval->distance_y);
1577 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1632 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1578 } 1633 }
1579} 1634}
1580 1635
1581/* this is basically the same as get_rangevector above, but instead of 1636/* this is basically the same as get_rangevector above, but instead of
… …
1586 * flags has no meaning for this function at this time - I kept it in to 1641 * flags has no meaning for this function at this time - I kept it in to
1587 * be more consistant with the above function and also in case they are needed 1642 * be more consistant with the above function and also in case they are needed
1588 * for something in the future. Also, since no object is pasted, the best 1643 * for something in the future. Also, since no object is pasted, the best
1589 * field of the rv_vector is set to NULL. 1644 * field of the rv_vector is set to NULL.
1590 */ 1645 */
1591
1592void 1646void
1593get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1647get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1594{ 1648{
1595 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1649 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1596 { 1650 {
1597 /* be conservative and fill in _some_ data */ 1651 /* be conservative and fill in _some_ data */
1598 retval->distance = 100000; 1652 retval->distance = 100000;
… …
1605 { 1659 {
1606 retval->distance_x += op2->x - x; 1660 retval->distance_x += op2->x - x;
1607 retval->distance_y += op2->y - y; 1661 retval->distance_y += op2->y - y;
1608 1662
1609 retval->part = NULL; 1663 retval->part = NULL;
1610 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1664 retval->distance = idistance (retval->distance_x, retval->distance_y);
1611 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1665 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1612 } 1666 }
1613} 1667}
1614 1668
1615/* Returns true of op1 and op2 are effectively on the same map 1669/* Returns true of op1 and op2 are effectively on the same map
… …
1635 op->remove (); 1689 op->remove ();
1636 1690
1637 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1691 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1638} 1692}
1639 1693
1694region *
1695maptile::region (int x, int y) const
1696{
1697 if (regions
1698 && regionmap
1699 && !OUT_OF_REAL_MAP (this, x, y))
1700 if (struct region *reg = regionmap [regions [y * width + x]])
1701 return reg;
1702
1703 if (default_region)
1704 return default_region;
1705
1706 return ::region::default_region ();
1707}
1708
1709

Diff Legend

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