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.115 by root, Wed Aug 1 01:53:13 2007 UTC vs.
Revision 1.139 by root, Sun May 4 19:14:23 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 27
29#include "loader.h" 28#include "loader.h"
30 29
31#include "path.h" 30#include "path.h"
32 31
… …
166 } 165 }
167 return 0; 166 return 0;
168} 167}
169 168
170/* 169/*
171 * Returns true if the given object can't fit in the given spot. 170 * 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, 171 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
176 * 175 *
177 * While this doesn't call out of map, the get_map_flags does. 176 * While this doesn't call out of map, the get_map_flags does.
178 * 177 *
179 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
191 * 190 *
192 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 192 * code, we need to have actual object to check its move_type
194 * against the move_block values. 193 * against the move_block values.
195 */ 194 */
196int 195bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
198{ 197{
199 archetype *tmp; 198 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 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
213 201
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 202 if (!pos.normalise ())
215 { 203 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 204
218 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 206
220 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 208 return 1;
222 209
223 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
224 211 * (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. 212 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 213 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 215 continue;
232 216
233 /* Note it is intentional that we check ob - the movement type of the 217 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
235 */ 219 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
237 return P_NO_PASS; 221 return 1;
238 } 222 }
239 223
240 return 0; 224 return 0;
241} 225}
242 226
… …
260 244
261 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
262 tmp = next; 246 tmp = next;
263 } 247 }
264 248
265 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
266 * carrying. 250 //TODO: remove
267 */ 251 container->update_weight ();
268 sum_weight (container);
269} 252}
270 253
271void 254void
272maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
273{ 256{
… …
322bool 305bool
323maptile::_load_objects (object_thawer &f) 306maptile::_load_objects (object_thawer &f)
324{ 307{
325 for (;;) 308 for (;;)
326 { 309 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 310 coroapi::cede_to_tick (); // cede once in a while
328 311
329 switch (f.kw) 312 switch (f.kw)
330 { 313 {
331 case KW_arch: 314 case KW_arch:
332 if (object *op = object::read (f, this)) 315 if (object *op = object::read (f, this))
333 { 316 {
317 // TODO: why?
334 if (op->inv) 318 if (op->inv)
335 sum_weight (op); 319 op->update_weight ();
336 320
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322 {
323 // we insert manually because
324 // a) its way faster
325 // b) we remove manually, too, and there are good reasons for that
326 // c) its correct
327 mapspace &ms = at (op->x, op->y);
328
329 op->flag [FLAG_REMOVED] = false;
330
331 op->above = 0;
332 op->below = ms.top;
333
334 if (ms.top)
335 ms.top->above = op;
336 else
337 ms.bot = op;
338
339 ms.top = op;
340 ms.flags_ = 0;
341 }
342 else
343 {
344 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
345 op->destroy ();
346 }
338 } 347 }
339 348
340 continue; 349 continue;
341 350
342 case KW_EOF: 351 case KW_EOF:
… …
355} 364}
356 365
357void 366void
358maptile::activate () 367maptile::activate ()
359{ 368{
360 active = true;
361
362 if (spaces) 369 if (spaces)
363 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
364 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
365 op->activate_recursive (); 372 op->activate_recursive ();
366} 373}
367 374
368void 375void
369maptile::deactivate () 376maptile::deactivate ()
370{ 377{
371 active = false;
372
373 if (spaces) 378 if (spaces)
374 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 379 for (mapspace *ms = spaces + size (); ms-- > spaces; )
375 for (object *op = ms->bot; op; op = op->above) 380 for (object *op = ms->bot; op; op = op->above)
376 op->deactivate_recursive (); 381 op->deactivate_recursive ();
377} 382}
… …
387 if (!spaces) 392 if (!spaces)
388 return false; 393 return false;
389 394
390 for (int i = 0; i < size (); ++i) 395 for (int i = 0; i < size (); ++i)
391 { 396 {
392 int unique = 0; 397 bool unique = 0;
398
393 for (object *op = spaces [i].bot; op; op = op->above) 399 for (object *op = spaces [i].bot; op; op = op->above)
394 { 400 {
395 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 401 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
396 unique = 1;
397 402
398 if (!op->can_map_save ()) 403 if (expect_false (!op->can_map_save ()))
399 continue; 404 continue;
400 405
401 if (unique || op->flag [FLAG_UNIQUE]) 406 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
402 { 407 {
403 if (flags & IO_UNIQUES) 408 if (flags & IO_UNIQUES)
404 op->write (f); 409 op->write (f);
405 } 410 }
406 else if (flags & IO_OBJECTS) 411 else if (expect_true (flags & IO_OBJECTS))
407 op->write (f); 412 op->write (f);
408 } 413 }
409 } 414 }
410 415
411 coroapi::cede_to_tick (); 416 coroapi::cede_to_tick ();
412 417
413 return true; 418 return true;
414}
415
416bool
417maptile::_load_objects (const char *path, bool skip_header)
418{
419 object_thawer f (path);
420
421 if (!f)
422 return false;
423
424 f.next ();
425
426 if (skip_header)
427 for (;;)
428 {
429 keyword kw = f.kw;
430 f.skip ();
431 if (kw == KW_end)
432 break;
433 }
434
435 return _load_objects (f);
436} 419}
437 420
438bool 421bool
439maptile::_save_objects (const char *path, int flags) 422maptile::_save_objects (const char *path, int flags)
440{ 423{
… …
615bool 598bool
616maptile::_load_header (object_thawer &thawer) 599maptile::_load_header (object_thawer &thawer)
617{ 600{
618 for (;;) 601 for (;;)
619 { 602 {
620 thawer.next ();
621
622 switch (thawer.kw) 603 switch (thawer.kw)
623 { 604 {
624 case KW_msg: 605 case KW_msg:
625 thawer.get_ml (KW_endmsg, msg); 606 thawer.get_ml (KW_endmsg, msg);
626 break; 607 break;
… …
681 case KW_tile_path_2: thawer.get (tile_path [1]); break; 662 case KW_tile_path_2: thawer.get (tile_path [1]); break;
682 case KW_tile_path_3: thawer.get (tile_path [2]); break; 663 case KW_tile_path_3: thawer.get (tile_path [2]); break;
683 case KW_tile_path_4: thawer.get (tile_path [3]); break; 664 case KW_tile_path_4: thawer.get (tile_path [3]); break;
684 665
685 case KW_ERROR: 666 case KW_ERROR:
686 set_key (thawer.kw_str, thawer.value); 667 set_key_text (thawer.kw_str, thawer.value);
687 break; 668 break;
688 669
689 case KW_end: 670 case KW_end:
671 thawer.next ();
690 return true; 672 return true;
691 673
692 default: 674 default:
693 if (!thawer.parse_error ("map", 0)) 675 if (!thawer.parse_error ("map", 0))
694 return false; 676 return false;
695 break; 677 break;
696 } 678 }
679
680 thawer.next ();
697 } 681 }
698 682
699 abort (); 683 abort ();
700}
701
702bool
703maptile::_load_header (const char *path)
704{
705 object_thawer thawer (path);
706
707 if (!thawer)
708 return false;
709
710 return _load_header (thawer);
711} 684}
712 685
713/****************************************************************************** 686/******************************************************************************
714 * This is the start of unique map handling code 687 * This is the start of unique map handling code
715 *****************************************************************************/ 688 *****************************************************************************/
… …
814 * Remove and free all objects in the given map. 787 * Remove and free all objects in the given map.
815 */ 788 */
816void 789void
817maptile::clear () 790maptile::clear ()
818{ 791{
819 sfree (regions, size ()); regions = 0;
820 delete [] regionmap; regionmap = 0;
821
822 if (spaces) 792 if (spaces)
823 { 793 {
824 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 794 for (mapspace *ms = spaces + size (); ms-- > spaces; )
825 while (object *op = ms->bot) 795 while (object *op = ms->bot)
826 { 796 {
797 // manually remove, as to not trigger anything
798 if (ms->bot = op->above)
799 ms->bot->below = 0;
800
801 op->flag [FLAG_REMOVED] = true;
802
827 op = op->head_ (); 803 object *head = op->head_ ();
804 if (op == head)
805 {
828 op->destroy_inv (false); 806 op->destroy_inv (false);
829 op->destroy (); 807 op->destroy ();
808 }
809 else if (head->map != op->map)
810 {
811 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
812 head->destroy ();
813 }
830 } 814 }
831 815
832 sfree (spaces, size ()), spaces = 0; 816 sfree0 (spaces, size ());
833 } 817 }
834 818
835 if (buttons) 819 if (buttons)
836 free_objectlinkpt (buttons), buttons = 0; 820 free_objectlinkpt (buttons), buttons = 0;
821
822 sfree0 (regions, size ());
823 delete [] regionmap; regionmap = 0;
837} 824}
838 825
839void 826void
840maptile::clear_header () 827maptile::clear_header ()
841{ 828{
… …
893 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 880 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
894 break; 881 break;
895 882
896 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 883 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
897 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 884 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
898 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
899 || QUERY_FLAG (op, FLAG_UNIQUE) 885 || QUERY_FLAG (op, FLAG_UNIQUE)
900 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 886 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
901 || QUERY_FLAG (op, FLAG_UNPAID) 887 || QUERY_FLAG (op, FLAG_UNPAID)
902 || op->is_alive ()) 888 || op->is_alive ())
903 ; // do not decay 889 ; // do not decay
… …
1078 /* This could be made additive I guess (two lights better than 1064 /* This could be made additive I guess (two lights better than
1079 * one). But if so, it shouldn't be a simple additive - 2 1065 * one). But if so, it shouldn't be a simple additive - 2
1080 * light bulbs do not illuminate twice as far as once since 1066 * light bulbs do not illuminate twice as far as once since
1081 * it is a dissapation factor that is cubed. 1067 * it is a dissapation factor that is cubed.
1082 */ 1068 */
1083 if (tmp->glow_radius > light)
1084 light = tmp->glow_radius; 1069 light = max (light, tmp->glow_radius);
1085 1070
1086 /* This call is needed in order to update objects the player 1071 /* This call is needed in order to update objects the player
1087 * is standing in that have animations (ie, grass, fire, etc). 1072 * is standing in that have animations (ie, grass, fire, etc).
1088 * However, it also causes the look window to be re-drawn 1073 * However, it also causes the look window to be re-drawn
1089 * 3 times each time the player moves, because many of the 1074 * 3 times each time the player moves, because many of the
… …
1228 vol += op->volume (); 1213 vol += op->volume ();
1229 1214
1230 return vol; 1215 return vol;
1231} 1216}
1232 1217
1233/* this updates the orig_map->tile_map[tile_num] value after finding 1218bool
1234 * the map. It also takes care of linking back the freshly found 1219maptile::tile_available (int dir, bool load)
1235 * maps tile_map values if it tiles back to this one. It returns
1236 * the value of orig_map->tile_map[tile_num].
1237 */
1238static inline maptile *
1239find_and_link (maptile *orig_map, int tile_num)
1240{ 1220{
1241 maptile *mp = orig_map->tile_map [tile_num]; 1221 if (!tile_path[dir])
1222 return 0;
1242 1223
1243 if (!mp) 1224 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1244 { 1225 return 1;
1245 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1246 1226
1247 if (!mp) 1227 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1248 { 1228 return 1;
1249 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1250 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1251 &orig_map->tile_path[tile_num], &orig_map->path);
1252 mp = new maptile (1, 1);
1253 mp->alloc ();
1254 mp->in_memory = MAP_IN_MEMORY;
1255 }
1256 }
1257 1229
1258 int dest_tile = (tile_num + 2) % 4;
1259
1260 orig_map->tile_map [tile_num] = mp;
1261
1262 // optimisation: back-link map to origin map if euclidean
1263 //TODO: non-euclidean maps MUST GO
1264 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1265 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1266
1267 return mp; 1230 return 0;
1268}
1269
1270static inline void
1271load_and_link (maptile *orig_map, int tile_num)
1272{
1273 find_and_link (orig_map, tile_num)->load_sync ();
1274} 1231}
1275 1232
1276/* this returns TRUE if the coordinates (x,y) are out of 1233/* this returns TRUE if the coordinates (x,y) are out of
1277 * map m. This function also takes into account any 1234 * map m. This function also takes into account any
1278 * tiling considerations, loading adjacant maps as needed. 1235 * tiling considerations, loading adjacant maps as needed.
… …
1291 if (!m) 1248 if (!m)
1292 return 0; 1249 return 0;
1293 1250
1294 if (x < 0) 1251 if (x < 0)
1295 { 1252 {
1296 if (!m->tile_path[3]) 1253 if (!m->tile_available (3))
1297 return 1; 1254 return 1;
1298 1255
1299 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1300 find_and_link (m, 3);
1301
1302 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1256 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1303 } 1257 }
1304 1258
1305 if (x >= m->width) 1259 if (x >= m->width)
1306 { 1260 {
1307 if (!m->tile_path[1]) 1261 if (!m->tile_available (1))
1308 return 1; 1262 return 1;
1309 1263
1310 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1311 find_and_link (m, 1);
1312
1313 return out_of_map (m->tile_map[1], x - m->width, y); 1264 return out_of_map (m->tile_map[1], x - m->width, y);
1314 } 1265 }
1315 1266
1316 if (y < 0) 1267 if (y < 0)
1317 { 1268 {
1318 if (!m->tile_path[0]) 1269 if (!m->tile_available (0))
1319 return 1; 1270 return 1;
1320 1271
1321 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1322 find_and_link (m, 0);
1323
1324 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1272 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1325 } 1273 }
1326 1274
1327 if (y >= m->height) 1275 if (y >= m->height)
1328 { 1276 {
1329 if (!m->tile_path[2]) 1277 if (!m->tile_available (2))
1330 return 1; 1278 return 1;
1331
1332 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1333 find_and_link (m, 2);
1334 1279
1335 return out_of_map (m->tile_map[2], x, y - m->height); 1280 return out_of_map (m->tile_map[2], x, y - m->height);
1336 } 1281 }
1337 1282
1338 /* Simple case - coordinates are within this local 1283 /* Simple case - coordinates are within this local
… …
1352maptile * 1297maptile *
1353maptile::xy_find (sint16 &x, sint16 &y) 1298maptile::xy_find (sint16 &x, sint16 &y)
1354{ 1299{
1355 if (x < 0) 1300 if (x < 0)
1356 { 1301 {
1357 if (!tile_path[3]) 1302 if (!tile_available (3))
1358 return 0; 1303 return 0;
1359 1304
1360 find_and_link (this, 3);
1361 x += tile_map[3]->width; 1305 x += tile_map[3]->width;
1362 return tile_map[3]->xy_find (x, y); 1306 return tile_map[3]->xy_find (x, y);
1363 } 1307 }
1364 1308
1365 if (x >= width) 1309 if (x >= width)
1366 { 1310 {
1367 if (!tile_path[1]) 1311 if (!tile_available (1))
1368 return 0; 1312 return 0;
1369 1313
1370 find_and_link (this, 1);
1371 x -= width; 1314 x -= width;
1372 return tile_map[1]->xy_find (x, y); 1315 return tile_map[1]->xy_find (x, y);
1373 } 1316 }
1374 1317
1375 if (y < 0) 1318 if (y < 0)
1376 { 1319 {
1377 if (!tile_path[0]) 1320 if (!tile_available (0))
1378 return 0; 1321 return 0;
1379 1322
1380 find_and_link (this, 0);
1381 y += tile_map[0]->height; 1323 y += tile_map[0]->height;
1382 return tile_map[0]->xy_find (x, y); 1324 return tile_map[0]->xy_find (x, y);
1383 } 1325 }
1384 1326
1385 if (y >= height) 1327 if (y >= height)
1386 { 1328 {
1387 if (!tile_path[2]) 1329 if (!tile_available (2))
1388 return 0; 1330 return 0;
1389 1331
1390 find_and_link (this, 2);
1391 y -= height; 1332 y -= height;
1392 return tile_map[2]->xy_find (x, y); 1333 return tile_map[2]->xy_find (x, y);
1393 } 1334 }
1394 1335
1395 /* Simple case - coordinates are within this local 1336 /* Simple case - coordinates are within this local
… …
1406adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1347adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1407{ 1348{
1408 if (!map1 || !map2) 1349 if (!map1 || !map2)
1409 return 0; 1350 return 0;
1410 1351
1411 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1352 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1412 //fix: compare paths instead (this is likely faster, too!) 1353 //fix: compare paths instead (this is likely faster, too!)
1413 if (map1 == map2) 1354 if (map1 == map2)
1414 { 1355 {
1415 *dx = 0; 1356 *dx = 0;
1416 *dy = 0; 1357 *dy = 0;
… …
1645 1586
1646 return ::region::default_region (); 1587 return ::region::default_region ();
1647} 1588}
1648 1589
1649/* picks a random object from a style map. 1590/* picks a random object from a style map.
1650 * Redone by MSW so it should be faster and not use static
1651 * variables to generate tables.
1652 */ 1591 */
1653object * 1592object *
1654maptile::pick_random_object () const 1593maptile::pick_random_object (rand_gen &gen) const
1655{ 1594{
1656 /* while returning a null object will result in a crash, that 1595 /* while returning a null object will result in a crash, that
1657 * is actually preferable to an infinite loop. That is because 1596 * is actually preferable to an infinite loop. That is because
1658 * most servers will automatically restart in case of crash. 1597 * most servers will automatically restart in case of crash.
1659 * Change the logic on getting the random space - shouldn't make 1598 * Change the logic on getting the random space - shouldn't make
1660 * any difference, but this seems clearer to me. 1599 * any difference, but this seems clearer to me.
1661 */ 1600 */
1662 for (int i = 1000; --i;) 1601 for (int i = 1000; --i;)
1663 { 1602 {
1664 object *pick = at (rndm (width), rndm (height)).bot; 1603 object *pick = at (gen (width), gen (height)).bot;
1665 1604
1666 // do not prefer big monsters just because they are big. 1605 // do not prefer big monsters just because they are big.
1667 if (pick && pick->head_ () == pick) 1606 if (pick && pick->is_head ())
1668 return pick->head_ (); 1607 return pick->head_ ();
1669 } 1608 }
1670 1609
1671 // instead of crashing in the unlikely(?) case, try to return *something* 1610 // instead of crashing in the unlikely(?) case, try to return *something*
1672 return get_archetype ("blocked"); 1611 return archetype::find ("bug");
1673} 1612}
1674 1613
1675void 1614void
1676maptile::play_sound (faceidx sound, int x, int y) const 1615maptile::play_sound (faceidx sound, int x, int y) const
1677{ 1616{

Diff Legend

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