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.109 by root, Thu Jun 7 19:12:22 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 Multiplayer Online Role Playing Game. 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 it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25#include <unistd.h> 24#include <unistd.h>
26 25
27#include "global.h" 26#include "global.h"
28#include "funcpoint.h"
29 27
30#include "loader.h" 28#include "loader.h"
31 29
32#include "path.h" 30#include "path.h"
33
34/*
35 * This makes a path absolute outside the world of Crossfire.
36 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
37 * and returns the pointer to a static array containing the result.
38 * it really should be called create_mapname
39 */
40const char *
41create_pathname (const char *name)
42{
43 static char buf[8192];
44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
45 return buf;
46}
47
48/*
49 * This function checks if a file with the given path exists.
50 * -1 is returned if it fails, otherwise the mode of the file
51 * is returned.
52 * It tries out all the compression suffixes listed in the uncomp[] array.
53 *
54 * If prepend_dir is set, then we call create_pathname (which prepends
55 * libdir & mapdir). Otherwise, we assume the name given is fully
56 * complete.
57 * Only the editor actually cares about the writablity of this -
58 * the rest of the code only cares that the file is readable.
59 * when the editor goes away, the call to stat should probably be
60 * replaced by an access instead (similar to the windows one, but
61 * that seems to be missing the prepend_dir processing
62 */
63int
64check_path (const char *name, int prepend_dir)
65{
66 char buf[MAX_BUF];
67
68 char *endbuf;
69 struct stat statbuf;
70 int mode = 0;
71
72 if (prepend_dir)
73 assign (buf, create_pathname (name));
74 else
75 assign (buf, name);
76
77 /* old method (strchr(buf, '\0')) seemd very odd to me -
78 * this method should be equivalant and is clearer.
79 * Can not use strcat because we need to cycle through
80 * all the names.
81 */
82 endbuf = buf + strlen (buf);
83
84 if (stat (buf, &statbuf))
85 return -1;
86 if (!S_ISREG (statbuf.st_mode))
87 return (-1);
88
89 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
90 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
91 mode |= 4;
92
93 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
94 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
95 mode |= 2;
96
97 return (mode);
98}
99 31
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 32/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 33 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 34 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 35 * new values into newmap, nx, and ny. Any and all of those
… …
233 } 165 }
234 return 0; 166 return 0;
235} 167}
236 168
237/* 169/*
238 * 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
239 * This is meant for multi space objects - for single space objecs, 171 * spot. This is meant for multi space objects - for single space objecs,
240 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
241 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
242 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
243 * 175 *
244 * 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.
245 * 177 *
246 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
247 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
258 * 190 *
259 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
260 * 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
261 * against the move_block values. 193 * against the move_block values.
262 */ 194 */
263int 195bool
264ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
265{ 197{
266 archetype *tmp; 198 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
267 int flag;
268 maptile *m1;
269 sint16 sx, sy;
270
271 if (!ob)
272 {
273 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
274 if (flag & P_OUT_OF_MAP)
275 return P_OUT_OF_MAP;
276
277 /* don't have object, so don't know what types would block */
278 return m1->at (sx, sy).move_block;
279 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
280 201
281 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 202 if (!pos.normalise ())
282 { 203 return 1;
283 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
284 204
285 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
286 return P_OUT_OF_MAP; 206
287 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
288 return P_IS_ALIVE; 208 return 1;
289 209
290 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
291 211 * (signifying non-moving objects)
292 /* find_first_free_spot() calls this function. However, often
293 * ob doesn't have any move type (when used to place exits)
294 * 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.
295 */ 213 */
296
297 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
298 continue; 215 continue;
299 216
300 /* 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
301 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
302 */ 219 */
303 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
304 return P_NO_PASS; 221 return 1;
305 } 222 }
306 223
307 return 0; 224 return 0;
308} 225}
309 226
… …
327 244
328 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
329 tmp = next; 246 tmp = next;
330 } 247 }
331 248
332 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
333 * carrying. 250 //TODO: remove
334 */ 251 container->update_weight ();
335 sum_weight (container);
336} 252}
337 253
338void 254void
339maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
340{ 256{
… …
356{ 272{
357 if (!spaces) 273 if (!spaces)
358 return; 274 return;
359 275
360 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 276 for (mapspace *ms = spaces + size (); ms-- > spaces; )
361 for (object *op = ms->bot; op; op = op->above) 277 {
278 object *op = ms->bot;
279 while (op)
362 { 280 {
363 /* already multipart - don't do anything more */ 281 /* already multipart - don't do anything more */
364 if (op->head_ () == op && !op->more && op->arch->more) 282 if (op->head_ () == op && !op->more && op->arch->more)
365 { 283 {
366 op->remove (); 284 op->remove ();
367 op->expand_tail (); 285 op->expand_tail ();
286
287 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
288 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
289 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
368 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 290 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
291
292 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
293 // so we have to reset the iteration through the mapspace
369 } 294 }
295 else
296 op = op->above;
370 } 297 }
298 }
371} 299}
372 300
373/* 301/*
374 * Loads (ands parses) the objects into a given map from the specified 302 * Loads (ands parses) the objects into a given map from the specified
375 * file pointer. 303 * file pointer.
… …
377bool 305bool
378maptile::_load_objects (object_thawer &f) 306maptile::_load_objects (object_thawer &f)
379{ 307{
380 for (;;) 308 for (;;)
381 { 309 {
382 coroapi::cede_to_tick_every (100); // cede once in a while 310 coroapi::cede_to_tick (); // cede once in a while
383 311
384 switch (f.kw) 312 switch (f.kw)
385 { 313 {
386 case KW_arch: 314 case KW_arch:
387 if (object *op = object::read (f, this)) 315 if (object *op = object::read (f, this))
388 { 316 {
317 // TODO: why?
389 if (op->inv) 318 if (op->inv)
390 sum_weight (op); 319 op->update_weight ();
391 320
392 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 }
393 } 347 }
394 348
395 continue; 349 continue;
396 350
397 case KW_EOF: 351 case KW_EOF:
… …
410} 364}
411 365
412void 366void
413maptile::activate () 367maptile::activate ()
414{ 368{
415 active = true;
416
417 if (spaces) 369 if (spaces)
418 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
419 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
420 op->activate_recursive (); 372 op->activate_recursive ();
421} 373}
422 374
423void 375void
424maptile::deactivate () 376maptile::deactivate ()
425{ 377{
426 active = false;
427
428 if (spaces) 378 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 379 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 380 for (object *op = ms->bot; op; op = op->above)
431 op->deactivate_recursive (); 381 op->deactivate_recursive ();
432} 382}
… …
442 if (!spaces) 392 if (!spaces)
443 return false; 393 return false;
444 394
445 for (int i = 0; i < size (); ++i) 395 for (int i = 0; i < size (); ++i)
446 { 396 {
447 int unique = 0; 397 bool unique = 0;
398
448 for (object *op = spaces [i].bot; op; op = op->above) 399 for (object *op = spaces [i].bot; op; op = op->above)
449 { 400 {
450 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 401 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
451 unique = 1;
452 402
453 if (!op->can_map_save ()) 403 if (expect_false (!op->can_map_save ()))
454 continue; 404 continue;
455 405
456 if (unique || op->flag [FLAG_UNIQUE]) 406 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
457 { 407 {
458 if (flags & IO_UNIQUES) 408 if (flags & IO_UNIQUES)
459 op->write (f); 409 op->write (f);
460 } 410 }
461 else if (flags & IO_OBJECTS) 411 else if (expect_true (flags & IO_OBJECTS))
462 op->write (f); 412 op->write (f);
463 } 413 }
464 } 414 }
465 415
466 coroapi::cede_to_tick (); 416 coroapi::cede_to_tick ();
467 417
468 return true; 418 return true;
469}
470
471bool
472maptile::_load_objects (const char *path, bool skip_header)
473{
474 object_thawer f (path);
475
476 if (!f)
477 return false;
478
479 f.next ();
480
481 if (skip_header)
482 for (;;)
483 {
484 keyword kw = f.kw;
485 f.skip ();
486 if (kw == KW_end)
487 break;
488 }
489
490 return _load_objects (f);
491} 419}
492 420
493bool 421bool
494maptile::_save_objects (const char *path, int flags) 422maptile::_save_objects (const char *path, int flags)
495{ 423{
… …
670bool 598bool
671maptile::_load_header (object_thawer &thawer) 599maptile::_load_header (object_thawer &thawer)
672{ 600{
673 for (;;) 601 for (;;)
674 { 602 {
675 thawer.next ();
676
677 switch (thawer.kw) 603 switch (thawer.kw)
678 { 604 {
679 case KW_msg: 605 case KW_msg:
680 thawer.get_ml (KW_endmsg, msg); 606 thawer.get_ml (KW_endmsg, msg);
681 break; 607 break;
… …
735 case KW_tile_path_1: thawer.get (tile_path [0]); break; 661 case KW_tile_path_1: thawer.get (tile_path [0]); break;
736 case KW_tile_path_2: thawer.get (tile_path [1]); break; 662 case KW_tile_path_2: thawer.get (tile_path [1]); break;
737 case KW_tile_path_3: thawer.get (tile_path [2]); break; 663 case KW_tile_path_3: thawer.get (tile_path [2]); break;
738 case KW_tile_path_4: thawer.get (tile_path [3]); break; 664 case KW_tile_path_4: thawer.get (tile_path [3]); break;
739 665
666 case KW_ERROR:
667 set_key_text (thawer.kw_str, thawer.value);
668 break;
669
740 case KW_end: 670 case KW_end:
671 thawer.next ();
741 return true; 672 return true;
742 673
743 default: 674 default:
744 if (!thawer.parse_error ("map", 0)) 675 if (!thawer.parse_error ("map", 0))
745 return false; 676 return false;
746 break; 677 break;
747 } 678 }
679
680 thawer.next ();
748 } 681 }
749 682
750 abort (); 683 abort ();
751}
752
753bool
754maptile::_load_header (const char *path)
755{
756 object_thawer thawer (path);
757
758 if (!thawer)
759 return false;
760
761 return _load_header (thawer);
762} 684}
763 685
764/****************************************************************************** 686/******************************************************************************
765 * This is the start of unique map handling code 687 * This is the start of unique map handling code
766 *****************************************************************************/ 688 *****************************************************************************/
… …
865 * Remove and free all objects in the given map. 787 * Remove and free all objects in the given map.
866 */ 788 */
867void 789void
868maptile::clear () 790maptile::clear ()
869{ 791{
870 sfree (regions, size ()), regions = 0;
871 free (regionmap), regionmap = 0;
872
873 if (spaces) 792 if (spaces)
874 { 793 {
875 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 794 for (mapspace *ms = spaces + size (); ms-- > spaces; )
876 while (object *op = ms->bot) 795 while (object *op = ms->bot)
877 { 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
878 op = op->head_ (); 803 object *head = op->head_ ();
804 if (op == head)
805 {
879 op->destroy_inv (false); 806 op->destroy_inv (false);
880 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 }
881 } 814 }
882 815
883 sfree (spaces, size ()), spaces = 0; 816 sfree0 (spaces, size ());
884 } 817 }
885 818
886 if (buttons) 819 if (buttons)
887 free_objectlinkpt (buttons), buttons = 0; 820 free_objectlinkpt (buttons), buttons = 0;
821
822 sfree0 (regions, size ());
823 delete [] regionmap; regionmap = 0;
888} 824}
889 825
890void 826void
891maptile::clear_header () 827maptile::clear_header ()
892{ 828{
… …
944 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))
945 break; 881 break;
946 882
947 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 883 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
948 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 884 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
949 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
950 || QUERY_FLAG (op, FLAG_UNIQUE) 885 || QUERY_FLAG (op, FLAG_UNIQUE)
951 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 886 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
952 || QUERY_FLAG (op, FLAG_UNPAID) 887 || QUERY_FLAG (op, FLAG_UNPAID)
953 || op->is_alive ()) 888 || op->is_alive ())
954 ; // do not decay 889 ; // do not decay
… …
1129 /* This could be made additive I guess (two lights better than 1064 /* This could be made additive I guess (two lights better than
1130 * 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
1131 * light bulbs do not illuminate twice as far as once since 1066 * light bulbs do not illuminate twice as far as once since
1132 * it is a dissapation factor that is cubed. 1067 * it is a dissapation factor that is cubed.
1133 */ 1068 */
1134 if (tmp->glow_radius > light)
1135 light = tmp->glow_radius; 1069 light = max (light, tmp->glow_radius);
1136 1070
1137 /* This call is needed in order to update objects the player 1071 /* This call is needed in order to update objects the player
1138 * is standing in that have animations (ie, grass, fire, etc). 1072 * is standing in that have animations (ie, grass, fire, etc).
1139 * However, it also causes the look window to be re-drawn 1073 * However, it also causes the look window to be re-drawn
1140 * 3 times each time the player moves, because many of the 1074 * 3 times each time the player moves, because many of the
… …
1279 vol += op->volume (); 1213 vol += op->volume ();
1280 1214
1281 return vol; 1215 return vol;
1282} 1216}
1283 1217
1284/* this updates the orig_map->tile_map[tile_num] value after finding 1218bool
1285 * the map. It also takes care of linking back the freshly found 1219maptile::tile_available (int dir, bool load)
1286 * maps tile_map values if it tiles back to this one. It returns
1287 * the value of orig_map->tile_map[tile_num].
1288 */
1289static inline maptile *
1290find_and_link (maptile *orig_map, int tile_num)
1291{ 1220{
1292 maptile *mp = orig_map->tile_map [tile_num]; 1221 if (!tile_path[dir])
1222 return 0;
1293 1223
1294 if (!mp) 1224 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1295 { 1225 return 1;
1296 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1297 1226
1298 if (!mp) 1227 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1299 { 1228 return 1;
1300 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1301 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1302 &orig_map->tile_path[tile_num], &orig_map->path);
1303 mp = new maptile (1, 1);
1304 mp->alloc ();
1305 mp->in_memory = MAP_IN_MEMORY;
1306 }
1307 }
1308 1229
1309 int dest_tile = (tile_num + 2) % 4;
1310
1311 orig_map->tile_map [tile_num] = mp;
1312
1313 // optimisation: back-link map to origin map if euclidean
1314 //TODO: non-euclidean maps MUST GO
1315 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1316 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1317
1318 return mp; 1230 return 0;
1319}
1320
1321static inline void
1322load_and_link (maptile *orig_map, int tile_num)
1323{
1324 find_and_link (orig_map, tile_num)->load_sync ();
1325} 1231}
1326 1232
1327/* this returns TRUE if the coordinates (x,y) are out of 1233/* this returns TRUE if the coordinates (x,y) are out of
1328 * map m. This function also takes into account any 1234 * map m. This function also takes into account any
1329 * tiling considerations, loading adjacant maps as needed. 1235 * tiling considerations, loading adjacant maps as needed.
… …
1342 if (!m) 1248 if (!m)
1343 return 0; 1249 return 0;
1344 1250
1345 if (x < 0) 1251 if (x < 0)
1346 { 1252 {
1347 if (!m->tile_path[3]) 1253 if (!m->tile_available (3))
1348 return 1; 1254 return 1;
1349 1255
1350 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1351 find_and_link (m, 3);
1352
1353 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);
1354 } 1257 }
1355 1258
1356 if (x >= m->width) 1259 if (x >= m->width)
1357 { 1260 {
1358 if (!m->tile_path[1]) 1261 if (!m->tile_available (1))
1359 return 1; 1262 return 1;
1360 1263
1361 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1362 find_and_link (m, 1);
1363
1364 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);
1365 } 1265 }
1366 1266
1367 if (y < 0) 1267 if (y < 0)
1368 { 1268 {
1369 if (!m->tile_path[0]) 1269 if (!m->tile_available (0))
1370 return 1; 1270 return 1;
1371 1271
1372 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1373 find_and_link (m, 0);
1374
1375 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);
1376 } 1273 }
1377 1274
1378 if (y >= m->height) 1275 if (y >= m->height)
1379 { 1276 {
1380 if (!m->tile_path[2]) 1277 if (!m->tile_available (2))
1381 return 1; 1278 return 1;
1382
1383 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1384 find_and_link (m, 2);
1385 1279
1386 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);
1387 } 1281 }
1388 1282
1389 /* Simple case - coordinates are within this local 1283 /* Simple case - coordinates are within this local
… …
1403maptile * 1297maptile *
1404maptile::xy_find (sint16 &x, sint16 &y) 1298maptile::xy_find (sint16 &x, sint16 &y)
1405{ 1299{
1406 if (x < 0) 1300 if (x < 0)
1407 { 1301 {
1408 if (!tile_path[3]) 1302 if (!tile_available (3))
1409 return 0; 1303 return 0;
1410 1304
1411 find_and_link (this, 3);
1412 x += tile_map[3]->width; 1305 x += tile_map[3]->width;
1413 return tile_map[3]->xy_find (x, y); 1306 return tile_map[3]->xy_find (x, y);
1414 } 1307 }
1415 1308
1416 if (x >= width) 1309 if (x >= width)
1417 { 1310 {
1418 if (!tile_path[1]) 1311 if (!tile_available (1))
1419 return 0; 1312 return 0;
1420 1313
1421 find_and_link (this, 1);
1422 x -= width; 1314 x -= width;
1423 return tile_map[1]->xy_find (x, y); 1315 return tile_map[1]->xy_find (x, y);
1424 } 1316 }
1425 1317
1426 if (y < 0) 1318 if (y < 0)
1427 { 1319 {
1428 if (!tile_path[0]) 1320 if (!tile_available (0))
1429 return 0; 1321 return 0;
1430 1322
1431 find_and_link (this, 0);
1432 y += tile_map[0]->height; 1323 y += tile_map[0]->height;
1433 return tile_map[0]->xy_find (x, y); 1324 return tile_map[0]->xy_find (x, y);
1434 } 1325 }
1435 1326
1436 if (y >= height) 1327 if (y >= height)
1437 { 1328 {
1438 if (!tile_path[2]) 1329 if (!tile_available (2))
1439 return 0; 1330 return 0;
1440 1331
1441 find_and_link (this, 2);
1442 y -= height; 1332 y -= height;
1443 return tile_map[2]->xy_find (x, y); 1333 return tile_map[2]->xy_find (x, y);
1444 } 1334 }
1445 1335
1446 /* Simple case - coordinates are within this local 1336 /* Simple case - coordinates are within this local
… …
1457adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1347adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1458{ 1348{
1459 if (!map1 || !map2) 1349 if (!map1 || !map2)
1460 return 0; 1350 return 0;
1461 1351
1462 //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
1463 //fix: compare paths instead (this is likely faster, too!) 1353 //fix: compare paths instead (this is likely faster, too!)
1464 if (map1 == map2) 1354 if (map1 == map2)
1465 { 1355 {
1466 *dx = 0; 1356 *dx = 0;
1467 *dy = 0; 1357 *dy = 0;
… …
1696 1586
1697 return ::region::default_region (); 1587 return ::region::default_region ();
1698} 1588}
1699 1589
1700/* picks a random object from a style map. 1590/* picks a random object from a style map.
1701 * Redone by MSW so it should be faster and not use static
1702 * variables to generate tables.
1703 */ 1591 */
1704object * 1592object *
1705maptile::pick_random_object () const 1593maptile::pick_random_object (rand_gen &gen) const
1706{ 1594{
1707 /* while returning a null object will result in a crash, that 1595 /* while returning a null object will result in a crash, that
1708 * is actually preferable to an infinite loop. That is because 1596 * is actually preferable to an infinite loop. That is because
1709 * most servers will automatically restart in case of crash. 1597 * most servers will automatically restart in case of crash.
1710 * Change the logic on getting the random space - shouldn't make 1598 * Change the logic on getting the random space - shouldn't make
1711 * any difference, but this seems clearer to me. 1599 * any difference, but this seems clearer to me.
1712 */ 1600 */
1713 for (int i = 1000; --i;) 1601 for (int i = 1000; --i;)
1714 { 1602 {
1715 object *pick = at (rndm (width), rndm (height)).bot; 1603 object *pick = at (gen (width), gen (height)).bot;
1716 1604
1717 // do not prefer big monsters just because they are big. 1605 // do not prefer big monsters just because they are big.
1718 if (pick && pick->head_ () == pick) 1606 if (pick && pick->is_head ())
1719 return pick->head_ (); 1607 return pick->head_ ();
1720 } 1608 }
1721 1609
1722 // instead of crashing in the unlikely(?) case, try to return *something* 1610 // instead of crashing in the unlikely(?) case, try to return *something*
1723 return get_archetype ("blocked"); 1611 return archetype::find ("bug");
1724} 1612}
1725 1613
1614void
1615maptile::play_sound (faceidx sound, int x, int y) const
1616{
1617 if (!sound)
1618 return;
1619
1620 for_all_players (pl)
1621 if (pl->ob->map == this)
1622 if (client *ns = pl->ns)
1623 {
1624 int dx = x - pl->ob->x;
1625 int dy = y - pl->ob->y;
1626
1627 int distance = idistance (dx, dy);
1628
1629 if (distance <= MAX_SOUND_DISTANCE)
1630 ns->play_sound (sound, dx, dy);
1631 }
1632}
1633

Diff Legend

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