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.116 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.147 by root, Mon Sep 29 10:20:48 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
27#include "funcpoint.h"
28
29#include "loader.h" 27#include "loader.h"
30
31#include "path.h" 28#include "path.h"
32 29
33/* This rolls up wall, blocks_magic, blocks_view, etc, all into 30/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34 * one function that just returns a P_.. value (see map.h) 31 * one function that just returns a P_.. value (see map.h)
35 * it will also do map translation for tiled maps, returning 32 * it will also do map translation for tiled maps, returning
… …
166 } 163 }
167 return 0; 164 return 0;
168} 165}
169 166
170/* 167/*
171 * Returns true if the given object can't fit in the given spot. 168 * Returns qthe blocking object if the given object can't fit in the given
172 * This is meant for multi space objects - for single space objecs, 169 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 170 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 171 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 172 * object and makes sure they can be inserted.
176 * 173 *
177 * While this doesn't call out of map, the get_map_flags does. 174 * While this doesn't call out of map, the get_map_flags does.
178 * 175 *
179 * This function has been used to deprecate arch_out_of_map - 176 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 177 * this function also does that check, and since in most cases,
… …
191 * 188 *
192 * Note this used to be arch_blocked, but with new movement 189 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 190 * code, we need to have actual object to check its move_type
194 * against the move_block values. 191 * against the move_block values.
195 */ 192 */
196int 193bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 194object::blocked (maptile *m, int x, int y) const
198{ 195{
199 archetype *tmp; 196 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
200 int flag;
201 maptile *m1;
202 sint16 sx, sy;
203
204 if (!ob)
205 {
206 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
207 if (flag & P_OUT_OF_MAP)
208 return P_OUT_OF_MAP;
209
210 /* don't have object, so don't know what types would block */
211 return m1->at (sx, sy).move_block;
212 } 197 {
198 mapxy pos (m, x + tmp->x, y + tmp->y);
213 199
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 200 if (!pos.normalise ())
215 { 201 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 202
218 if (flag & P_OUT_OF_MAP) 203 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 204
220 if (flag & P_IS_ALIVE) 205 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 206 return 1;
222 207
223 mapspace &ms = m1->at (sx, sy); 208 /* However, often ob doesn't have any move type
224 209 * (signifying non-moving objects)
225 /* find_first_free_spot() calls this function. However, often
226 * ob doesn't have any move type (when used to place exits)
227 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 210 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 211 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 212 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 213 continue;
232 214
233 /* Note it is intentional that we check ob - the movement type of the 215 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 216 * head of the object should correspond for the entire object.
235 */ 217 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 218 if (ms.blocks (move_type))
237 return P_NO_PASS; 219 return 1;
238 } 220 }
239 221
240 return 0; 222 return 0;
241} 223}
242 224
… …
260 242
261 insert_ob_in_ob (tmp, container); 243 insert_ob_in_ob (tmp, container);
262 tmp = next; 244 tmp = next;
263 } 245 }
264 246
265 /* sum_weight will go through and calculate what all the containers are 247 // go through and calculate what all the containers are carrying.
266 * carrying. 248 //TODO: remove
267 */ 249 container->update_weight ();
268 sum_weight (container);
269} 250}
270 251
271void 252void
272maptile::set_object_flag (int flag, int value) 253maptile::set_object_flag (int flag, int value)
273{ 254{
… …
275 return; 256 return;
276 257
277 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 258 for (mapspace *ms = spaces + size (); ms-- > spaces; )
278 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 259 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279 tmp->flag [flag] = value; 260 tmp->flag [flag] = value;
261}
262
263void
264maptile::post_load_original ()
265{
266 if (!spaces)
267 return;
268
269 set_object_flag (FLAG_OBJ_ORIGINAL);
270
271 for (mapspace *ms = spaces + size (); ms-- > spaces; )
272 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
273 INVOKE_OBJECT (RESET, tmp);
280} 274}
281 275
282/* link_multipart_objects go through all the objects on the map looking 276/* link_multipart_objects go through all the objects on the map looking
283 * for objects whose arch says they are multipart yet according to the 277 * for objects whose arch says they are multipart yet according to the
284 * info we have, they only have the head (as would be expected when 278 * info we have, they only have the head (as would be expected when
… …
322bool 316bool
323maptile::_load_objects (object_thawer &f) 317maptile::_load_objects (object_thawer &f)
324{ 318{
325 for (;;) 319 for (;;)
326 { 320 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 321 coroapi::cede_to_tick (); // cede once in a while
328 322
329 switch (f.kw) 323 switch (f.kw)
330 { 324 {
331 case KW_arch: 325 case KW_arch:
332 if (object *op = object::read (f, this)) 326 if (object *op = object::read (f, this))
333 { 327 {
328 // TODO: why?
334 if (op->inv) 329 if (op->inv)
335 sum_weight (op); 330 op->update_weight ();
336 331
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 332 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
333 {
334 // we insert manually because
335 // a) its way faster
336 // b) we remove manually, too, and there are good reasons for that
337 // c) its correct
338 mapspace &ms = at (op->x, op->y);
339
340 op->flag [FLAG_REMOVED] = false;
341
342 op->above = 0;
343 op->below = ms.top;
344
345 if (ms.top)
346 ms.top->above = op;
347 else
348 ms.bot = op;
349
350 ms.top = op;
351 ms.flags_ = 0;
352 }
353 else
354 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy_inv (false); // be explicit about dropping
357 op->destroy (true);
358 }
338 } 359 }
339 360
340 continue; 361 continue;
341 362
342 case KW_EOF: 363 case KW_EOF:
… …
383 if (!spaces) 404 if (!spaces)
384 return false; 405 return false;
385 406
386 for (int i = 0; i < size (); ++i) 407 for (int i = 0; i < size (); ++i)
387 { 408 {
388 int unique = 0; 409 bool unique = 0;
410
389 for (object *op = spaces [i].bot; op; op = op->above) 411 for (object *op = spaces [i].bot; op; op = op->above)
390 { 412 {
391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 413 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392 unique = 1;
393 414
394 if (!op->can_map_save ()) 415 if (expect_false (!op->can_map_save ()))
395 continue; 416 continue;
396 417
397 if (unique || op->flag [FLAG_UNIQUE]) 418 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
398 { 419 {
399 if (flags & IO_UNIQUES) 420 if (flags & IO_UNIQUES)
400 op->write (f); 421 op->write (f);
401 } 422 }
402 else if (flags & IO_OBJECTS) 423 else if (expect_true (flags & IO_OBJECTS))
403 op->write (f); 424 op->write (f);
404 } 425 }
405 } 426 }
406 427
407 coroapi::cede_to_tick (); 428 coroapi::cede_to_tick ();
408 429
409 return true; 430 return true;
410}
411
412bool
413maptile::_load_objects (const char *path, bool skip_header)
414{
415 object_thawer f (path);
416
417 if (!f)
418 return false;
419
420 f.next ();
421
422 if (skip_header)
423 for (;;)
424 {
425 keyword kw = f.kw;
426 f.skip ();
427 if (kw == KW_end)
428 break;
429 }
430
431 return _load_objects (f);
432} 431}
433 432
434bool 433bool
435maptile::_save_objects (const char *path, int flags) 434maptile::_save_objects (const char *path, int flags)
436{ 435{
… …
611bool 610bool
612maptile::_load_header (object_thawer &thawer) 611maptile::_load_header (object_thawer &thawer)
613{ 612{
614 for (;;) 613 for (;;)
615 { 614 {
616 thawer.next ();
617
618 switch (thawer.kw) 615 switch (thawer.kw)
619 { 616 {
620 case KW_msg: 617 case KW_msg:
621 thawer.get_ml (KW_endmsg, msg); 618 thawer.get_ml (KW_endmsg, msg);
622 break; 619 break;
… …
656 case KW_sky: thawer.get (sky); break; 653 case KW_sky: thawer.get (sky); break;
657 654
658 case KW_per_player: thawer.get (per_player); break; 655 case KW_per_player: thawer.get (per_player); break;
659 case KW_per_party: thawer.get (per_party); break; 656 case KW_per_party: thawer.get (per_party); break;
660 case KW_no_reset: thawer.get (no_reset); break; 657 case KW_no_reset: thawer.get (no_reset); break;
658 case KW_no_drop: thawer.get (no_drop); break;
661 659
662 case KW_region: default_region = region::find (thawer.get_str ()); break; 660 case KW_region: default_region = region::find (thawer.get_str ()); break;
663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 661 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
664 662
665 // old names new names 663 // old names new names
… …
677 case KW_tile_path_2: thawer.get (tile_path [1]); break; 675 case KW_tile_path_2: thawer.get (tile_path [1]); break;
678 case KW_tile_path_3: thawer.get (tile_path [2]); break; 676 case KW_tile_path_3: thawer.get (tile_path [2]); break;
679 case KW_tile_path_4: thawer.get (tile_path [3]); break; 677 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 678
681 case KW_ERROR: 679 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value); 680 set_key_text (thawer.kw_str, thawer.value);
683 break; 681 break;
684 682
685 case KW_end: 683 case KW_end:
684 thawer.next ();
686 return true; 685 return true;
687 686
688 default: 687 default:
689 if (!thawer.parse_error ("map", 0)) 688 if (!thawer.parse_error ("map", 0))
690 return false; 689 return false;
691 break; 690 break;
692 } 691 }
692
693 thawer.next ();
693 } 694 }
694 695
695 abort (); 696 abort ();
696}
697
698bool
699maptile::_load_header (const char *path)
700{
701 object_thawer thawer (path);
702
703 if (!thawer)
704 return false;
705
706 return _load_header (thawer);
707} 697}
708 698
709/****************************************************************************** 699/******************************************************************************
710 * This is the start of unique map handling code 700 * This is the start of unique map handling code
711 *****************************************************************************/ 701 *****************************************************************************/
… …
725 unique = 1; 715 unique = 1;
726 716
727 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 717 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
728 { 718 {
729 op->destroy_inv (false); 719 op->destroy_inv (false);
730 op->destroy (); 720 op->destroy (true);
731 } 721 }
732 722
733 op = above; 723 op = above;
734 } 724 }
735 } 725 }
… …
747 MAP_OUT (swap_time); 737 MAP_OUT (swap_time);
748 MAP_OUT (reset_time); 738 MAP_OUT (reset_time);
749 MAP_OUT (reset_timeout); 739 MAP_OUT (reset_timeout);
750 MAP_OUT (fixed_resettime); 740 MAP_OUT (fixed_resettime);
751 MAP_OUT (no_reset); 741 MAP_OUT (no_reset);
742 MAP_OUT (no_drop);
752 MAP_OUT (difficulty); 743 MAP_OUT (difficulty);
753 744
754 if (default_region) MAP_OUT2 (region, default_region->name); 745 if (default_region) MAP_OUT2 (region, default_region->name);
755 746
756 if (shopitems) 747 if (shopitems)
… …
810 * Remove and free all objects in the given map. 801 * Remove and free all objects in the given map.
811 */ 802 */
812void 803void
813maptile::clear () 804maptile::clear ()
814{ 805{
815 sfree (regions, size ()); regions = 0;
816 delete [] regionmap; regionmap = 0;
817
818 if (spaces) 806 if (spaces)
819 { 807 {
820 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 808 for (mapspace *ms = spaces + size (); ms-- > spaces; )
821 while (object *op = ms->bot) 809 while (object *op = ms->bot)
822 { 810 {
811 // manually remove, as to not trigger anything
812 if (ms->bot = op->above)
813 ms->bot->below = 0;
814
815 op->flag [FLAG_REMOVED] = true;
816
823 op = op->head_ (); 817 object *head = op->head_ ();
818 if (op == head)
819 {
824 op->destroy_inv (false); 820 op->destroy_inv (false);
825 op->destroy (); 821 op->destroy (true);
822 }
823 else if (head->map != op->map)
824 {
825 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
826 head->destroy (true);
827 }
826 } 828 }
827 829
828 sfree (spaces, size ()), spaces = 0; 830 sfree0 (spaces, size ());
829 } 831 }
830 832
831 if (buttons) 833 if (buttons)
832 free_objectlinkpt (buttons), buttons = 0; 834 free_objectlinkpt (buttons), buttons = 0;
835
836 sfree0 (regions, size ());
837 delete [] regionmap; regionmap = 0;
833} 838}
834 839
835void 840void
836maptile::clear_header () 841maptile::clear_header ()
837{ 842{
… …
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 894 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break; 895 break;
891 896
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 897 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 898 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE) 899 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 900 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID) 901 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ()) 902 || op->is_alive ())
899 ; // do not decay 903 ; // do not decay
… …
933 destroy = 1; 937 destroy = 1;
934 } 938 }
935 939
936 /* adjust overall chance below */ 940 /* adjust overall chance below */
937 if (destroy && rndm (0, 1)) 941 if (destroy && rndm (0, 1))
938 op->destroy (); 942 op->destroy (true);
939 } 943 }
940} 944}
941 945
942/* 946/*
943 * Updates every button on the map (by calling update_button() for them). 947 * Updates every button on the map (by calling update_button() for them).
… …
991 995
992 if (QUERY_FLAG (op, FLAG_GENERATOR)) 996 if (QUERY_FLAG (op, FLAG_GENERATOR))
993 { 997 {
994 total_exp += op->stats.exp; 998 total_exp += op->stats.exp;
995 999
996 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 1000 if (archetype *at = op->other_arch)
1001 {
997 total_exp += at->stats.exp * 8; 1002 total_exp += at->stats.exp * 8;
998
999 monster_cnt++; 1003 monster_cnt++;
1004 }
1005
1006 for (object *inv = op->inv; inv; inv = inv->below)
1007 {
1008 total_exp += op->stats.exp * 8;
1009 monster_cnt++;
1010 }
1000 } 1011 }
1001 } 1012 }
1002 1013
1003 avgexp = (double) total_exp / monster_cnt; 1014 avgexp = (double) total_exp / monster_cnt;
1004 1015
… …
1043 else 1054 else
1044 darkness = new_level; 1055 darkness = new_level;
1045 1056
1046 /* All clients need to get re-updated for the change */ 1057 /* All clients need to get re-updated for the change */
1047 update_all_map_los (this); 1058 update_all_map_los (this);
1059
1048 return 1; 1060 return 1;
1049} 1061}
1050 1062
1051/* 1063/*
1052 * This function updates various attributes about a specific space 1064 * This function updates various attributes about a specific space
… …
1055 * through, etc) 1067 * through, etc)
1056 */ 1068 */
1057void 1069void
1058mapspace::update_ () 1070mapspace::update_ ()
1059{ 1071{
1060 object *tmp, *last = 0; 1072 object *last = 0;
1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1073 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1062 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1074 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1063 1075
1064 //object *middle = 0; 1076 //object *middle = 0;
1065 //object *top = 0; 1077 //object *top = 0;
… …
1067 // this seems to generate better code than using locals, above 1079 // this seems to generate better code than using locals, above
1068 object *&top = faces_obj[0] = 0; 1080 object *&top = faces_obj[0] = 0;
1069 object *&middle = faces_obj[1] = 0; 1081 object *&middle = faces_obj[1] = 0;
1070 object *&floor = faces_obj[2] = 0; 1082 object *&floor = faces_obj[2] = 0;
1071 1083
1072 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1084 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1073 { 1085 {
1074 /* This could be made additive I guess (two lights better than 1086 /* This could be made additive I guess (two lights better than
1075 * one). But if so, it shouldn't be a simple additive - 2 1087 * one). But if so, it shouldn't be a simple additive - 2
1076 * light bulbs do not illuminate twice as far as once since 1088 * light bulbs do not illuminate twice as far as once since
1077 * it is a dissapation factor that is cubed. 1089 * it is a dissapation factor that is cubed.
1078 */ 1090 */
1079 if (tmp->glow_radius > light)
1080 light = tmp->glow_radius; 1091 light = max (light, tmp->glow_radius);
1081 1092
1082 /* This call is needed in order to update objects the player 1093 /* This call is needed in order to update objects the player
1083 * is standing in that have animations (ie, grass, fire, etc). 1094 * is standing in that have animations (ie, grass, fire, etc).
1084 * However, it also causes the look window to be re-drawn 1095 * However, it also causes the look window to be re-drawn
1085 * 3 times each time the player moves, because many of the 1096 * 3 times each time the player moves, because many of the
… …
1104 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1115 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1105 { 1116 {
1106 middle = tmp; 1117 middle = tmp;
1107 anywhere = 1; 1118 anywhere = 1;
1108 } 1119 }
1120
1109 /* Find the highest visible face around. If equal 1121 /* Find the highest visible face around. If equal
1110 * visibilities, we still want the one nearer to the 1122 * visibilities, we still want the one nearer to the
1111 * top 1123 * top
1112 */ 1124 */
1113 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1125 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1162 * 1) top face is set, need middle to be set. 1174 * 1) top face is set, need middle to be set.
1163 * 2) middle is set, need to set top. 1175 * 2) middle is set, need to set top.
1164 * 3) neither middle or top is set - need to set both. 1176 * 3) neither middle or top is set - need to set both.
1165 */ 1177 */
1166 1178
1167 for (tmp = last; tmp; tmp = tmp->below) 1179 for (object *tmp = last; tmp; tmp = tmp->below)
1168 { 1180 {
1169 /* Once we get to a floor, stop, since we already have a floor object */ 1181 /* Once we get to a floor, stop, since we already have a floor object */
1170 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1182 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1171 break; 1183 break;
1172 1184
… …
1224 vol += op->volume (); 1236 vol += op->volume ();
1225 1237
1226 return vol; 1238 return vol;
1227} 1239}
1228 1240
1229/* this updates the orig_map->tile_map[tile_num] value after finding 1241bool
1230 * the map. It also takes care of linking back the freshly found 1242maptile::tile_available (int dir, bool load)
1231 * maps tile_map values if it tiles back to this one. It returns
1232 * the value of orig_map->tile_map[tile_num].
1233 */
1234static inline maptile *
1235find_and_link (maptile *orig_map, int tile_num)
1236{ 1243{
1237 maptile *mp = orig_map->tile_map [tile_num]; 1244 if (!tile_path[dir])
1245 return 0;
1238 1246
1239 if (!mp) 1247 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1240 { 1248 return 1;
1241 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1242 1249
1243 if (!mp) 1250 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1244 { 1251 return 1;
1245 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1246 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1247 &orig_map->tile_path[tile_num], &orig_map->path);
1248 mp = new maptile (1, 1);
1249 mp->alloc ();
1250 mp->in_memory = MAP_IN_MEMORY;
1251 }
1252 }
1253 1252
1254 int dest_tile = (tile_num + 2) % 4;
1255
1256 orig_map->tile_map [tile_num] = mp;
1257
1258 // optimisation: back-link map to origin map if euclidean
1259 //TODO: non-euclidean maps MUST GO
1260 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1261 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1262
1263 return mp; 1253 return 0;
1264}
1265
1266static inline void
1267load_and_link (maptile *orig_map, int tile_num)
1268{
1269 find_and_link (orig_map, tile_num)->load_sync ();
1270} 1254}
1271 1255
1272/* this returns TRUE if the coordinates (x,y) are out of 1256/* this returns TRUE if the coordinates (x,y) are out of
1273 * map m. This function also takes into account any 1257 * map m. This function also takes into account any
1274 * tiling considerations, loading adjacant maps as needed. 1258 * tiling considerations, loading adjacant maps as needed.
… …
1287 if (!m) 1271 if (!m)
1288 return 0; 1272 return 0;
1289 1273
1290 if (x < 0) 1274 if (x < 0)
1291 { 1275 {
1292 if (!m->tile_path[3]) 1276 if (!m->tile_available (3))
1293 return 1; 1277 return 1;
1294 1278
1295 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1296 find_and_link (m, 3);
1297
1298 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1279 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1299 } 1280 }
1300 1281
1301 if (x >= m->width) 1282 if (x >= m->width)
1302 { 1283 {
1303 if (!m->tile_path[1]) 1284 if (!m->tile_available (1))
1304 return 1; 1285 return 1;
1305 1286
1306 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1307 find_and_link (m, 1);
1308
1309 return out_of_map (m->tile_map[1], x - m->width, y); 1287 return out_of_map (m->tile_map[1], x - m->width, y);
1310 } 1288 }
1311 1289
1312 if (y < 0) 1290 if (y < 0)
1313 { 1291 {
1314 if (!m->tile_path[0]) 1292 if (!m->tile_available (0))
1315 return 1; 1293 return 1;
1316 1294
1317 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1318 find_and_link (m, 0);
1319
1320 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1295 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1321 } 1296 }
1322 1297
1323 if (y >= m->height) 1298 if (y >= m->height)
1324 { 1299 {
1325 if (!m->tile_path[2]) 1300 if (!m->tile_available (2))
1326 return 1; 1301 return 1;
1327
1328 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1329 find_and_link (m, 2);
1330 1302
1331 return out_of_map (m->tile_map[2], x, y - m->height); 1303 return out_of_map (m->tile_map[2], x, y - m->height);
1332 } 1304 }
1333 1305
1334 /* Simple case - coordinates are within this local 1306 /* Simple case - coordinates are within this local
… …
1348maptile * 1320maptile *
1349maptile::xy_find (sint16 &x, sint16 &y) 1321maptile::xy_find (sint16 &x, sint16 &y)
1350{ 1322{
1351 if (x < 0) 1323 if (x < 0)
1352 { 1324 {
1353 if (!tile_path[3]) 1325 if (!tile_available (3))
1354 return 0; 1326 return 0;
1355 1327
1356 find_and_link (this, 3);
1357 x += tile_map[3]->width; 1328 x += tile_map[3]->width;
1358 return tile_map[3]->xy_find (x, y); 1329 return tile_map[3]->xy_find (x, y);
1359 } 1330 }
1360 1331
1361 if (x >= width) 1332 if (x >= width)
1362 { 1333 {
1363 if (!tile_path[1]) 1334 if (!tile_available (1))
1364 return 0; 1335 return 0;
1365 1336
1366 find_and_link (this, 1);
1367 x -= width; 1337 x -= width;
1368 return tile_map[1]->xy_find (x, y); 1338 return tile_map[1]->xy_find (x, y);
1369 } 1339 }
1370 1340
1371 if (y < 0) 1341 if (y < 0)
1372 { 1342 {
1373 if (!tile_path[0]) 1343 if (!tile_available (0))
1374 return 0; 1344 return 0;
1375 1345
1376 find_and_link (this, 0);
1377 y += tile_map[0]->height; 1346 y += tile_map[0]->height;
1378 return tile_map[0]->xy_find (x, y); 1347 return tile_map[0]->xy_find (x, y);
1379 } 1348 }
1380 1349
1381 if (y >= height) 1350 if (y >= height)
1382 { 1351 {
1383 if (!tile_path[2]) 1352 if (!tile_available (2))
1384 return 0; 1353 return 0;
1385 1354
1386 find_and_link (this, 2);
1387 y -= height; 1355 y -= height;
1388 return tile_map[2]->xy_find (x, y); 1356 return tile_map[2]->xy_find (x, y);
1389 } 1357 }
1390 1358
1391 /* Simple case - coordinates are within this local 1359 /* Simple case - coordinates are within this local
… …
1402adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1370adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1403{ 1371{
1404 if (!map1 || !map2) 1372 if (!map1 || !map2)
1405 return 0; 1373 return 0;
1406 1374
1407 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1375 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1408 //fix: compare paths instead (this is likely faster, too!) 1376 //fix: compare paths instead (this is likely faster, too!)
1409 if (map1 == map2) 1377 if (map1 == map2)
1410 { 1378 {
1411 *dx = 0; 1379 *dx = 0;
1412 *dy = 0; 1380 *dy = 0;
… …
1619} 1587}
1620 1588
1621object * 1589object *
1622maptile::insert (object *op, int x, int y, object *originator, int flags) 1590maptile::insert (object *op, int x, int y, object *originator, int flags)
1623{ 1591{
1624 if (!op->flag [FLAG_REMOVED])
1625 op->remove ();
1626
1627 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1592 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1628} 1593}
1629 1594
1630region * 1595region *
1631maptile::region (int x, int y) const 1596maptile::region (int x, int y) const
… …
1641 1606
1642 return ::region::default_region (); 1607 return ::region::default_region ();
1643} 1608}
1644 1609
1645/* picks a random object from a style map. 1610/* picks a random object from a style map.
1646 * Redone by MSW so it should be faster and not use static
1647 * variables to generate tables.
1648 */ 1611 */
1649object * 1612object *
1650maptile::pick_random_object () const 1613maptile::pick_random_object (rand_gen &gen) const
1651{ 1614{
1652 /* while returning a null object will result in a crash, that 1615 /* while returning a null object will result in a crash, that
1653 * is actually preferable to an infinite loop. That is because 1616 * is actually preferable to an infinite loop. That is because
1654 * most servers will automatically restart in case of crash. 1617 * most servers will automatically restart in case of crash.
1655 * Change the logic on getting the random space - shouldn't make 1618 * Change the logic on getting the random space - shouldn't make
1656 * any difference, but this seems clearer to me. 1619 * any difference, but this seems clearer to me.
1657 */ 1620 */
1658 for (int i = 1000; --i;) 1621 for (int i = 1000; --i;)
1659 { 1622 {
1660 object *pick = at (rndm (width), rndm (height)).bot; 1623 object *pick = at (gen (width), gen (height)).bot;
1661 1624
1662 // do not prefer big monsters just because they are big. 1625 // do not prefer big monsters just because they are big.
1663 if (pick && pick->head_ () == pick) 1626 if (pick && pick->is_head ())
1664 return pick->head_ (); 1627 return pick->head_ ();
1665 } 1628 }
1666 1629
1667 // instead of crashing in the unlikely(?) case, try to return *something* 1630 // instead of crashing in the unlikely(?) case, try to return *something*
1668 return get_archetype ("blocked"); 1631 return archetype::find ("bug");
1669} 1632}
1670 1633
1671void 1634void
1672maptile::play_sound (faceidx sound, int x, int y) const 1635maptile::play_sound (faceidx sound, int x, int y) const
1673{ 1636{

Diff Legend

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