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.119 by root, Fri Aug 24 00:53:54 2007 UTC vs.
Revision 1.146 by root, Sun Aug 17 22:46:26 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 ();
357 }
338 } 358 }
339 359
340 continue; 360 continue;
341 361
342 case KW_EOF: 362 case KW_EOF:
… …
383 if (!spaces) 403 if (!spaces)
384 return false; 404 return false;
385 405
386 for (int i = 0; i < size (); ++i) 406 for (int i = 0; i < size (); ++i)
387 { 407 {
388 int unique = 0; 408 bool unique = 0;
409
389 for (object *op = spaces [i].bot; op; op = op->above) 410 for (object *op = spaces [i].bot; op; op = op->above)
390 { 411 {
391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 412 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392 unique = 1;
393 413
394 if (!op->can_map_save ()) 414 if (expect_false (!op->can_map_save ()))
395 continue; 415 continue;
396 416
397 if (unique || op->flag [FLAG_UNIQUE]) 417 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
398 { 418 {
399 if (flags & IO_UNIQUES) 419 if (flags & IO_UNIQUES)
400 op->write (f); 420 op->write (f);
401 } 421 }
402 else if (flags & IO_OBJECTS) 422 else if (expect_true (flags & IO_OBJECTS))
403 op->write (f); 423 op->write (f);
404 } 424 }
405 } 425 }
406 426
407 coroapi::cede_to_tick (); 427 coroapi::cede_to_tick ();
408 428
409 return true; 429 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} 430}
433 431
434bool 432bool
435maptile::_save_objects (const char *path, int flags) 433maptile::_save_objects (const char *path, int flags)
436{ 434{
… …
611bool 609bool
612maptile::_load_header (object_thawer &thawer) 610maptile::_load_header (object_thawer &thawer)
613{ 611{
614 for (;;) 612 for (;;)
615 { 613 {
616 thawer.next ();
617
618 switch (thawer.kw) 614 switch (thawer.kw)
619 { 615 {
620 case KW_msg: 616 case KW_msg:
621 thawer.get_ml (KW_endmsg, msg); 617 thawer.get_ml (KW_endmsg, msg);
622 break; 618 break;
… …
656 case KW_sky: thawer.get (sky); break; 652 case KW_sky: thawer.get (sky); break;
657 653
658 case KW_per_player: thawer.get (per_player); break; 654 case KW_per_player: thawer.get (per_player); break;
659 case KW_per_party: thawer.get (per_party); break; 655 case KW_per_party: thawer.get (per_party); break;
660 case KW_no_reset: thawer.get (no_reset); break; 656 case KW_no_reset: thawer.get (no_reset); break;
657 case KW_no_drop: thawer.get (no_drop); break;
661 658
662 case KW_region: default_region = region::find (thawer.get_str ()); break; 659 case KW_region: default_region = region::find (thawer.get_str ()); break;
663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 660 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
664 661
665 // old names new names 662 // old names new names
… …
677 case KW_tile_path_2: thawer.get (tile_path [1]); break; 674 case KW_tile_path_2: thawer.get (tile_path [1]); break;
678 case KW_tile_path_3: thawer.get (tile_path [2]); break; 675 case KW_tile_path_3: thawer.get (tile_path [2]); break;
679 case KW_tile_path_4: thawer.get (tile_path [3]); break; 676 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 677
681 case KW_ERROR: 678 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value); 679 set_key_text (thawer.kw_str, thawer.value);
683 break; 680 break;
684 681
685 case KW_end: 682 case KW_end:
683 thawer.next ();
686 return true; 684 return true;
687 685
688 default: 686 default:
689 if (!thawer.parse_error ("map", 0)) 687 if (!thawer.parse_error ("map", 0))
690 return false; 688 return false;
691 break; 689 break;
692 } 690 }
691
692 thawer.next ();
693 } 693 }
694 694
695 abort (); 695 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} 696}
708 697
709/****************************************************************************** 698/******************************************************************************
710 * This is the start of unique map handling code 699 * This is the start of unique map handling code
711 *****************************************************************************/ 700 *****************************************************************************/
… …
747 MAP_OUT (swap_time); 736 MAP_OUT (swap_time);
748 MAP_OUT (reset_time); 737 MAP_OUT (reset_time);
749 MAP_OUT (reset_timeout); 738 MAP_OUT (reset_timeout);
750 MAP_OUT (fixed_resettime); 739 MAP_OUT (fixed_resettime);
751 MAP_OUT (no_reset); 740 MAP_OUT (no_reset);
741 MAP_OUT (no_drop);
752 MAP_OUT (difficulty); 742 MAP_OUT (difficulty);
753 743
754 if (default_region) MAP_OUT2 (region, default_region->name); 744 if (default_region) MAP_OUT2 (region, default_region->name);
755 745
756 if (shopitems) 746 if (shopitems)
… …
810 * Remove and free all objects in the given map. 800 * Remove and free all objects in the given map.
811 */ 801 */
812void 802void
813maptile::clear () 803maptile::clear ()
814{ 804{
815 sfree (regions, size ()); regions = 0;
816 delete [] regionmap; regionmap = 0;
817
818 if (spaces) 805 if (spaces)
819 { 806 {
820 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 807 for (mapspace *ms = spaces + size (); ms-- > spaces; )
821 while (object *op = ms->bot) 808 while (object *op = ms->bot)
822 { 809 {
810 // manually remove, as to not trigger anything
811 if (ms->bot = op->above)
812 ms->bot->below = 0;
813
814 op->flag [FLAG_REMOVED] = true;
815
823 op = op->head_ (); 816 object *head = op->head_ ();
817 if (op == head)
818 {
824 op->destroy_inv (false); 819 op->destroy_inv (false);
825 op->destroy (); 820 op->destroy ();
821 }
822 else if (head->map != op->map)
823 {
824 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
825 head->destroy ();
826 }
826 } 827 }
827 828
828 sfree (spaces, size ()), spaces = 0; 829 sfree0 (spaces, size ());
829 } 830 }
830 831
831 if (buttons) 832 if (buttons)
832 free_objectlinkpt (buttons), buttons = 0; 833 free_objectlinkpt (buttons), buttons = 0;
834
835 sfree0 (regions, size ());
836 delete [] regionmap; regionmap = 0;
833} 837}
834 838
835void 839void
836maptile::clear_header () 840maptile::clear_header ()
837{ 841{
… …
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 893 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break; 894 break;
891 895
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 896 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 897 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE) 898 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 899 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID) 900 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ()) 901 || op->is_alive ())
899 ; // do not decay 902 ; // do not decay
… …
991 994
992 if (QUERY_FLAG (op, FLAG_GENERATOR)) 995 if (QUERY_FLAG (op, FLAG_GENERATOR))
993 { 996 {
994 total_exp += op->stats.exp; 997 total_exp += op->stats.exp;
995 998
996 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 999 if (archetype *at = op->other_arch)
1000 {
997 total_exp += at->stats.exp * 8; 1001 total_exp += at->stats.exp * 8;
998
999 monster_cnt++; 1002 monster_cnt++;
1003 }
1004
1005 for (object *inv = op->inv; inv; inv = inv->below)
1006 {
1007 total_exp += op->stats.exp * 8;
1008 monster_cnt++;
1009 }
1000 } 1010 }
1001 } 1011 }
1002 1012
1003 avgexp = (double) total_exp / monster_cnt; 1013 avgexp = (double) total_exp / monster_cnt;
1004 1014
… …
1043 else 1053 else
1044 darkness = new_level; 1054 darkness = new_level;
1045 1055
1046 /* All clients need to get re-updated for the change */ 1056 /* All clients need to get re-updated for the change */
1047 update_all_map_los (this); 1057 update_all_map_los (this);
1058
1048 return 1; 1059 return 1;
1049} 1060}
1050 1061
1051/* 1062/*
1052 * This function updates various attributes about a specific space 1063 * This function updates various attributes about a specific space
… …
1055 * through, etc) 1066 * through, etc)
1056 */ 1067 */
1057void 1068void
1058mapspace::update_ () 1069mapspace::update_ ()
1059{ 1070{
1060 object *tmp, *last = 0; 1071 object *last = 0;
1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1072 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; 1073 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1063 1074
1064 //object *middle = 0; 1075 //object *middle = 0;
1065 //object *top = 0; 1076 //object *top = 0;
… …
1067 // this seems to generate better code than using locals, above 1078 // this seems to generate better code than using locals, above
1068 object *&top = faces_obj[0] = 0; 1079 object *&top = faces_obj[0] = 0;
1069 object *&middle = faces_obj[1] = 0; 1080 object *&middle = faces_obj[1] = 0;
1070 object *&floor = faces_obj[2] = 0; 1081 object *&floor = faces_obj[2] = 0;
1071 1082
1072 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1083 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1073 { 1084 {
1074 /* This could be made additive I guess (two lights better than 1085 /* This could be made additive I guess (two lights better than
1075 * one). But if so, it shouldn't be a simple additive - 2 1086 * one). But if so, it shouldn't be a simple additive - 2
1076 * light bulbs do not illuminate twice as far as once since 1087 * light bulbs do not illuminate twice as far as once since
1077 * it is a dissapation factor that is cubed. 1088 * it is a dissapation factor that is cubed.
1078 */ 1089 */
1079 if (tmp->glow_radius > light)
1080 light = tmp->glow_radius; 1090 light = max (light, tmp->glow_radius);
1081 1091
1082 /* This call is needed in order to update objects the player 1092 /* This call is needed in order to update objects the player
1083 * is standing in that have animations (ie, grass, fire, etc). 1093 * is standing in that have animations (ie, grass, fire, etc).
1084 * However, it also causes the look window to be re-drawn 1094 * However, it also causes the look window to be re-drawn
1085 * 3 times each time the player moves, because many of the 1095 * 3 times each time the player moves, because many of the
… …
1104 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1114 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1105 { 1115 {
1106 middle = tmp; 1116 middle = tmp;
1107 anywhere = 1; 1117 anywhere = 1;
1108 } 1118 }
1119
1109 /* Find the highest visible face around. If equal 1120 /* Find the highest visible face around. If equal
1110 * visibilities, we still want the one nearer to the 1121 * visibilities, we still want the one nearer to the
1111 * top 1122 * top
1112 */ 1123 */
1113 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1124 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1162 * 1) top face is set, need middle to be set. 1173 * 1) top face is set, need middle to be set.
1163 * 2) middle is set, need to set top. 1174 * 2) middle is set, need to set top.
1164 * 3) neither middle or top is set - need to set both. 1175 * 3) neither middle or top is set - need to set both.
1165 */ 1176 */
1166 1177
1167 for (tmp = last; tmp; tmp = tmp->below) 1178 for (object *tmp = last; tmp; tmp = tmp->below)
1168 { 1179 {
1169 /* Once we get to a floor, stop, since we already have a floor object */ 1180 /* Once we get to a floor, stop, since we already have a floor object */
1170 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1181 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1171 break; 1182 break;
1172 1183
… …
1230maptile::tile_available (int dir, bool load) 1241maptile::tile_available (int dir, bool load)
1231{ 1242{
1232 if (!tile_path[dir]) 1243 if (!tile_path[dir])
1233 return 0; 1244 return 0;
1234 1245
1235 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1246 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1236 return 1; 1247 return 1;
1237 1248
1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1249 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1239 return 1; 1250 return 1;
1240 1251
… …
1358adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1369adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1359{ 1370{
1360 if (!map1 || !map2) 1371 if (!map1 || !map2)
1361 return 0; 1372 return 0;
1362 1373
1363 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1374 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1364 //fix: compare paths instead (this is likely faster, too!) 1375 //fix: compare paths instead (this is likely faster, too!)
1365 if (map1 == map2) 1376 if (map1 == map2)
1366 { 1377 {
1367 *dx = 0; 1378 *dx = 0;
1368 *dy = 0; 1379 *dy = 0;
… …
1575} 1586}
1576 1587
1577object * 1588object *
1578maptile::insert (object *op, int x, int y, object *originator, int flags) 1589maptile::insert (object *op, int x, int y, object *originator, int flags)
1579{ 1590{
1580 if (!op->flag [FLAG_REMOVED])
1581 op->remove ();
1582
1583 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1591 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1584} 1592}
1585 1593
1586region * 1594region *
1587maptile::region (int x, int y) const 1595maptile::region (int x, int y) const
… …
1597 1605
1598 return ::region::default_region (); 1606 return ::region::default_region ();
1599} 1607}
1600 1608
1601/* picks a random object from a style map. 1609/* picks a random object from a style map.
1602 * Redone by MSW so it should be faster and not use static
1603 * variables to generate tables.
1604 */ 1610 */
1605object * 1611object *
1606maptile::pick_random_object () const 1612maptile::pick_random_object (rand_gen &gen) const
1607{ 1613{
1608 /* while returning a null object will result in a crash, that 1614 /* while returning a null object will result in a crash, that
1609 * is actually preferable to an infinite loop. That is because 1615 * is actually preferable to an infinite loop. That is because
1610 * most servers will automatically restart in case of crash. 1616 * most servers will automatically restart in case of crash.
1611 * Change the logic on getting the random space - shouldn't make 1617 * Change the logic on getting the random space - shouldn't make
1612 * any difference, but this seems clearer to me. 1618 * any difference, but this seems clearer to me.
1613 */ 1619 */
1614 for (int i = 1000; --i;) 1620 for (int i = 1000; --i;)
1615 { 1621 {
1616 object *pick = at (rndm (width), rndm (height)).bot; 1622 object *pick = at (gen (width), gen (height)).bot;
1617 1623
1618 // do not prefer big monsters just because they are big. 1624 // do not prefer big monsters just because they are big.
1619 if (pick && pick->head_ () == pick) 1625 if (pick && pick->is_head ())
1620 return pick->head_ (); 1626 return pick->head_ ();
1621 } 1627 }
1622 1628
1623 // instead of crashing in the unlikely(?) case, try to return *something* 1629 // instead of crashing in the unlikely(?) case, try to return *something*
1624 return get_archetype ("blocked"); 1630 return archetype::find ("bug");
1625} 1631}
1626 1632
1627void 1633void
1628maptile::play_sound (faceidx sound, int x, int y) const 1634maptile::play_sound (faceidx sound, int x, int y) const
1629{ 1635{

Diff Legend

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