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.110 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.133 by root, Wed Apr 2 11:13:52 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 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" 27#include "funcpoint.h"
28 28
29#include "loader.h" 29#include "loader.h"
30 30
31#include "path.h" 31#include "path.h"
32
33/*
34 * This makes a path absolute outside the world of Crossfire.
35 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
36 * and returns the pointer to a static array containing the result.
37 * it really should be called create_mapname
38 */
39const char *
40create_pathname (const char *name)
41{
42 static char buf[8192];
43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44 return buf;
45}
46
47/*
48 * This function checks if a file with the given path exists.
49 * -1 is returned if it fails, otherwise the mode of the file
50 * is returned.
51 * It tries out all the compression suffixes listed in the uncomp[] array.
52 *
53 * If prepend_dir is set, then we call create_pathname (which prepends
54 * libdir & mapdir). Otherwise, we assume the name given is fully
55 * complete.
56 * Only the editor actually cares about the writablity of this -
57 * the rest of the code only cares that the file is readable.
58 * when the editor goes away, the call to stat should probably be
59 * replaced by an access instead (similar to the windows one, but
60 * that seems to be missing the prepend_dir processing
61 */
62int
63check_path (const char *name, int prepend_dir)
64{
65 char buf[MAX_BUF];
66
67 char *endbuf;
68 struct stat statbuf;
69 int mode = 0;
70
71 if (prepend_dir)
72 assign (buf, create_pathname (name));
73 else
74 assign (buf, name);
75
76 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through
79 * all the names.
80 */
81 endbuf = buf + strlen (buf);
82
83 if (stat (buf, &statbuf))
84 return -1;
85 if (!S_ISREG (statbuf.st_mode))
86 return (-1);
87
88 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
89 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
90 mode |= 4;
91
92 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
93 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
94 mode |= 2;
95
96 return (mode);
97}
98 32
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
102 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
… …
232 } 166 }
233 return 0; 167 return 0;
234} 168}
235 169
236/* 170/*
237 * Returns true if the given object can't fit in the given spot. 171 * Returns qthe blocking object if the given object can't fit in the given
238 * This is meant for multi space objects - for single space objecs, 172 * spot. This is meant for multi space objects - for single space objecs,
239 * just calling get_map_blocked and checking that against movement type 173 * just calling get_map_blocked and checking that against movement type
240 * of object. This function goes through all the parts of the 174 * of object. This function goes through all the parts of the multipart
241 * multipart object and makes sure they can be inserted. 175 * object and makes sure they can be inserted.
242 * 176 *
243 * While this doesn't call out of map, the get_map_flags does. 177 * While this doesn't call out of map, the get_map_flags does.
244 * 178 *
245 * This function has been used to deprecate arch_out_of_map - 179 * This function has been used to deprecate arch_out_of_map -
246 * this function also does that check, and since in most cases, 180 * this function also does that check, and since in most cases,
… …
257 * 191 *
258 * Note this used to be arch_blocked, but with new movement 192 * Note this used to be arch_blocked, but with new movement
259 * code, we need to have actual object to check its move_type 193 * code, we need to have actual object to check its move_type
260 * against the move_block values. 194 * against the move_block values.
261 */ 195 */
262int 196bool
263ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 197object::blocked (maptile *m, int x, int y) const
264{ 198{
265 archetype *tmp; 199 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
266 int flag;
267 maptile *m1;
268 sint16 sx, sy;
269
270 if (!ob)
271 {
272 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
273 if (flag & P_OUT_OF_MAP)
274 return P_OUT_OF_MAP;
275
276 /* don't have object, so don't know what types would block */
277 return m1->at (sx, sy).move_block;
278 } 200 {
201 mapxy pos (m, x + tmp->x, y + tmp->y);
279 202
280 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 203 if (!pos.normalise ())
281 { 204 return 1;
282 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
283 205
284 if (flag & P_OUT_OF_MAP) 206 mapspace &ms = *pos;
285 return P_OUT_OF_MAP; 207
286 if (flag & P_IS_ALIVE) 208 if (ms.flags () & P_IS_ALIVE)
287 return P_IS_ALIVE; 209 return 1;
288 210
289 mapspace &ms = m1->at (sx, sy); 211 /* However, often ob doesn't have any move type
290 212 * (signifying non-moving objects)
291 /* find_first_free_spot() calls this function. However, often
292 * ob doesn't have any move type (when used to place exits)
293 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 213 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
294 */ 214 */
295
296 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 215 if (!move_type && ms.move_block != MOVE_ALL)
297 continue; 216 continue;
298 217
299 /* Note it is intentional that we check ob - the movement type of the 218 /* Note it is intentional that we check ob - the movement type of the
300 * head of the object should correspond for the entire object. 219 * head of the object should correspond for the entire object.
301 */ 220 */
302 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 221 if (ms.blocks (move_type))
303 return P_NO_PASS; 222 return 1;
304 } 223 }
305 224
306 return 0; 225 return 0;
307} 226}
308 227
… …
355{ 274{
356 if (!spaces) 275 if (!spaces)
357 return; 276 return;
358 277
359 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 278 for (mapspace *ms = spaces + size (); ms-- > spaces; )
360 for (object *op = ms->bot; op; op = op->above) 279 {
280 object *op = ms->bot;
281 while (op)
361 { 282 {
362 /* already multipart - don't do anything more */ 283 /* already multipart - don't do anything more */
363 if (op->head_ () == op && !op->more && op->arch->more) 284 if (op->head_ () == op && !op->more && op->arch->more)
364 { 285 {
365 op->remove (); 286 op->remove ();
366 op->expand_tail (); 287 op->expand_tail ();
288
289 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
290 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
291 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
367 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 292 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
293
294 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
295 // so we have to reset the iteration through the mapspace
368 } 296 }
297 else
298 op = op->above;
369 } 299 }
300 }
370} 301}
371 302
372/* 303/*
373 * Loads (ands parses) the objects into a given map from the specified 304 * Loads (ands parses) the objects into a given map from the specified
374 * file pointer. 305 * file pointer.
… …
376bool 307bool
377maptile::_load_objects (object_thawer &f) 308maptile::_load_objects (object_thawer &f)
378{ 309{
379 for (;;) 310 for (;;)
380 { 311 {
381 coroapi::cede_to_tick_every (100); // cede once in a while 312 coroapi::cede_to_tick (); // cede once in a while
382 313
383 switch (f.kw) 314 switch (f.kw)
384 { 315 {
385 case KW_arch: 316 case KW_arch:
386 if (object *op = object::read (f, this)) 317 if (object *op = object::read (f, this))
387 { 318 {
388 if (op->inv) 319 if (op->inv)
389 sum_weight (op); 320 sum_weight (op);
390 321
391 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 {
324 // we insert manually because
325 // a) its way faster
326 // b) we remove manually, too, and there are good reasons for that
327 // c) its correct
328 mapspace &ms = at (op->x, op->y);
329
330 op->flag [FLAG_REMOVED] = false;
331
332 op->above = 0;
333 op->below = ms.top;
334
335 if (ms.top)
336 ms.top->above = op;
337 else
338 ms.bot = op;
339
340 ms.top = op;
341 ms.flags_ = 0;
342 }
343 else
344 {
345 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
346 op->destroy ();
347 }
392 } 348 }
393 349
394 continue; 350 continue;
395 351
396 case KW_EOF: 352 case KW_EOF:
… …
409} 365}
410 366
411void 367void
412maptile::activate () 368maptile::activate ()
413{ 369{
414 active = true;
415
416 if (spaces) 370 if (spaces)
417 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 371 for (mapspace *ms = spaces + size (); ms-- > spaces; )
418 for (object *op = ms->bot; op; op = op->above) 372 for (object *op = ms->bot; op; op = op->above)
419 op->activate_recursive (); 373 op->activate_recursive ();
420} 374}
421 375
422void 376void
423maptile::deactivate () 377maptile::deactivate ()
424{ 378{
425 active = false;
426
427 if (spaces) 379 if (spaces)
428 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 380 for (mapspace *ms = spaces + size (); ms-- > spaces; )
429 for (object *op = ms->bot; op; op = op->above) 381 for (object *op = ms->bot; op; op = op->above)
430 op->deactivate_recursive (); 382 op->deactivate_recursive ();
431} 383}
… …
441 if (!spaces) 393 if (!spaces)
442 return false; 394 return false;
443 395
444 for (int i = 0; i < size (); ++i) 396 for (int i = 0; i < size (); ++i)
445 { 397 {
446 int unique = 0; 398 bool unique = 0;
399
447 for (object *op = spaces [i].bot; op; op = op->above) 400 for (object *op = spaces [i].bot; op; op = op->above)
448 { 401 {
449 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 402 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
450 unique = 1;
451 403
452 if (!op->can_map_save ()) 404 if (expect_false (!op->can_map_save ()))
453 continue; 405 continue;
454 406
455 if (unique || op->flag [FLAG_UNIQUE]) 407 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
456 { 408 {
457 if (flags & IO_UNIQUES) 409 if (flags & IO_UNIQUES)
458 op->write (f); 410 op->write (f);
459 } 411 }
460 else if (flags & IO_OBJECTS) 412 else if (expect_true (flags & IO_OBJECTS))
461 op->write (f); 413 op->write (f);
462 } 414 }
463 } 415 }
464 416
465 coroapi::cede_to_tick (); 417 coroapi::cede_to_tick ();
466 418
467 return true; 419 return true;
468}
469
470bool
471maptile::_load_objects (const char *path, bool skip_header)
472{
473 object_thawer f (path);
474
475 if (!f)
476 return false;
477
478 f.next ();
479
480 if (skip_header)
481 for (;;)
482 {
483 keyword kw = f.kw;
484 f.skip ();
485 if (kw == KW_end)
486 break;
487 }
488
489 return _load_objects (f);
490} 420}
491 421
492bool 422bool
493maptile::_save_objects (const char *path, int flags) 423maptile::_save_objects (const char *path, int flags)
494{ 424{
… …
669bool 599bool
670maptile::_load_header (object_thawer &thawer) 600maptile::_load_header (object_thawer &thawer)
671{ 601{
672 for (;;) 602 for (;;)
673 { 603 {
674 thawer.next ();
675
676 switch (thawer.kw) 604 switch (thawer.kw)
677 { 605 {
678 case KW_msg: 606 case KW_msg:
679 thawer.get_ml (KW_endmsg, msg); 607 thawer.get_ml (KW_endmsg, msg);
680 break; 608 break;
… …
734 case KW_tile_path_1: thawer.get (tile_path [0]); break; 662 case KW_tile_path_1: thawer.get (tile_path [0]); break;
735 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
736 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
737 case KW_tile_path_4: thawer.get (tile_path [3]); break; 665 case KW_tile_path_4: thawer.get (tile_path [3]); break;
738 666
667 case KW_ERROR:
668 set_key_text (thawer.kw_str, thawer.value);
669 break;
670
739 case KW_end: 671 case KW_end:
672 thawer.next ();
740 return true; 673 return true;
741 674
742 default: 675 default:
743 if (!thawer.parse_error ("map", 0)) 676 if (!thawer.parse_error ("map", 0))
744 return false; 677 return false;
745 break; 678 break;
746 } 679 }
680
681 thawer.next ();
747 } 682 }
748 683
749 abort (); 684 abort ();
750}
751
752bool
753maptile::_load_header (const char *path)
754{
755 object_thawer thawer (path);
756
757 if (!thawer)
758 return false;
759
760 return _load_header (thawer);
761} 685}
762 686
763/****************************************************************************** 687/******************************************************************************
764 * This is the start of unique map handling code 688 * This is the start of unique map handling code
765 *****************************************************************************/ 689 *****************************************************************************/
… …
864 * Remove and free all objects in the given map. 788 * Remove and free all objects in the given map.
865 */ 789 */
866void 790void
867maptile::clear () 791maptile::clear ()
868{ 792{
869 sfree (regions, size ()), regions = 0;
870 free (regionmap), regionmap = 0;
871
872 if (spaces) 793 if (spaces)
873 { 794 {
874 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 795 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 while (object *op = ms->bot) 796 while (object *op = ms->bot)
876 { 797 {
798 // manually remove, as to not trigger anything
799 if (ms->bot = op->above)
800 ms->bot->below = 0;
801
802 op->flag [FLAG_REMOVED] = true;
803
877 op = op->head_ (); 804 object *head = op->head_ ();
805 if (op == head)
806 {
878 op->destroy_inv (false); 807 op->destroy_inv (false);
879 op->destroy (); 808 op->destroy ();
809 }
810 else if (head->map != op->map)
811 {
812 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
813 head->destroy ();
814 }
880 } 815 }
881 816
882 sfree (spaces, size ()), spaces = 0; 817 sfree (spaces, size ()), spaces = 0;
883 } 818 }
884 819
885 if (buttons) 820 if (buttons)
886 free_objectlinkpt (buttons), buttons = 0; 821 free_objectlinkpt (buttons), buttons = 0;
822
823 sfree (regions, size ()); regions = 0;
824 delete [] regionmap; regionmap = 0;
887} 825}
888 826
889void 827void
890maptile::clear_header () 828maptile::clear_header ()
891{ 829{
… …
943 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 881 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
944 break; 882 break;
945 883
946 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 884 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
947 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 885 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
948 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
949 || QUERY_FLAG (op, FLAG_UNIQUE) 886 || QUERY_FLAG (op, FLAG_UNIQUE)
950 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 887 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
951 || QUERY_FLAG (op, FLAG_UNPAID) 888 || QUERY_FLAG (op, FLAG_UNPAID)
952 || op->is_alive ()) 889 || op->is_alive ())
953 ; // do not decay 890 ; // do not decay
… …
1278 vol += op->volume (); 1215 vol += op->volume ();
1279 1216
1280 return vol; 1217 return vol;
1281} 1218}
1282 1219
1283/* this updates the orig_map->tile_map[tile_num] value after finding 1220bool
1284 * the map. It also takes care of linking back the freshly found 1221maptile::tile_available (int dir, bool load)
1285 * maps tile_map values if it tiles back to this one. It returns
1286 * the value of orig_map->tile_map[tile_num].
1287 */
1288static inline maptile *
1289find_and_link (maptile *orig_map, int tile_num)
1290{ 1222{
1291 maptile *mp = orig_map->tile_map [tile_num]; 1223 if (!tile_path[dir])
1224 return 0;
1292 1225
1293 if (!mp) 1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1294 { 1227 return 1;
1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1296 1228
1297 if (!mp) 1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1298 { 1230 return 1;
1299 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1300 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1301 &orig_map->tile_path[tile_num], &orig_map->path);
1302 mp = new maptile (1, 1);
1303 mp->alloc ();
1304 mp->in_memory = MAP_IN_MEMORY;
1305 }
1306 }
1307 1231
1308 int dest_tile = (tile_num + 2) % 4;
1309
1310 orig_map->tile_map [tile_num] = mp;
1311
1312 // optimisation: back-link map to origin map if euclidean
1313 //TODO: non-euclidean maps MUST GO
1314 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1315 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1316
1317 return mp; 1232 return 0;
1318}
1319
1320static inline void
1321load_and_link (maptile *orig_map, int tile_num)
1322{
1323 find_and_link (orig_map, tile_num)->load_sync ();
1324} 1233}
1325 1234
1326/* this returns TRUE if the coordinates (x,y) are out of 1235/* this returns TRUE if the coordinates (x,y) are out of
1327 * map m. This function also takes into account any 1236 * map m. This function also takes into account any
1328 * tiling considerations, loading adjacant maps as needed. 1237 * tiling considerations, loading adjacant maps as needed.
… …
1341 if (!m) 1250 if (!m)
1342 return 0; 1251 return 0;
1343 1252
1344 if (x < 0) 1253 if (x < 0)
1345 { 1254 {
1346 if (!m->tile_path[3]) 1255 if (!m->tile_available (3))
1347 return 1; 1256 return 1;
1348 1257
1349 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1350 find_and_link (m, 3);
1351
1352 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1258 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1353 } 1259 }
1354 1260
1355 if (x >= m->width) 1261 if (x >= m->width)
1356 { 1262 {
1357 if (!m->tile_path[1]) 1263 if (!m->tile_available (1))
1358 return 1; 1264 return 1;
1359 1265
1360 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1361 find_and_link (m, 1);
1362
1363 return out_of_map (m->tile_map[1], x - m->width, y); 1266 return out_of_map (m->tile_map[1], x - m->width, y);
1364 } 1267 }
1365 1268
1366 if (y < 0) 1269 if (y < 0)
1367 { 1270 {
1368 if (!m->tile_path[0]) 1271 if (!m->tile_available (0))
1369 return 1; 1272 return 1;
1370 1273
1371 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1372 find_and_link (m, 0);
1373
1374 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1274 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1375 } 1275 }
1376 1276
1377 if (y >= m->height) 1277 if (y >= m->height)
1378 { 1278 {
1379 if (!m->tile_path[2]) 1279 if (!m->tile_available (2))
1380 return 1; 1280 return 1;
1381
1382 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1383 find_and_link (m, 2);
1384 1281
1385 return out_of_map (m->tile_map[2], x, y - m->height); 1282 return out_of_map (m->tile_map[2], x, y - m->height);
1386 } 1283 }
1387 1284
1388 /* Simple case - coordinates are within this local 1285 /* Simple case - coordinates are within this local
… …
1402maptile * 1299maptile *
1403maptile::xy_find (sint16 &x, sint16 &y) 1300maptile::xy_find (sint16 &x, sint16 &y)
1404{ 1301{
1405 if (x < 0) 1302 if (x < 0)
1406 { 1303 {
1407 if (!tile_path[3]) 1304 if (!tile_available (3))
1408 return 0; 1305 return 0;
1409 1306
1410 find_and_link (this, 3);
1411 x += tile_map[3]->width; 1307 x += tile_map[3]->width;
1412 return tile_map[3]->xy_find (x, y); 1308 return tile_map[3]->xy_find (x, y);
1413 } 1309 }
1414 1310
1415 if (x >= width) 1311 if (x >= width)
1416 { 1312 {
1417 if (!tile_path[1]) 1313 if (!tile_available (1))
1418 return 0; 1314 return 0;
1419 1315
1420 find_and_link (this, 1);
1421 x -= width; 1316 x -= width;
1422 return tile_map[1]->xy_find (x, y); 1317 return tile_map[1]->xy_find (x, y);
1423 } 1318 }
1424 1319
1425 if (y < 0) 1320 if (y < 0)
1426 { 1321 {
1427 if (!tile_path[0]) 1322 if (!tile_available (0))
1428 return 0; 1323 return 0;
1429 1324
1430 find_and_link (this, 0);
1431 y += tile_map[0]->height; 1325 y += tile_map[0]->height;
1432 return tile_map[0]->xy_find (x, y); 1326 return tile_map[0]->xy_find (x, y);
1433 } 1327 }
1434 1328
1435 if (y >= height) 1329 if (y >= height)
1436 { 1330 {
1437 if (!tile_path[2]) 1331 if (!tile_available (2))
1438 return 0; 1332 return 0;
1439 1333
1440 find_and_link (this, 2);
1441 y -= height; 1334 y -= height;
1442 return tile_map[2]->xy_find (x, y); 1335 return tile_map[2]->xy_find (x, y);
1443 } 1336 }
1444 1337
1445 /* Simple case - coordinates are within this local 1338 /* Simple case - coordinates are within this local
… …
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1349adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1350{
1458 if (!map1 || !map2) 1351 if (!map1 || !map2)
1459 return 0; 1352 return 0;
1460 1353
1461 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1354 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1462 //fix: compare paths instead (this is likely faster, too!) 1355 //fix: compare paths instead (this is likely faster, too!)
1463 if (map1 == map2) 1356 if (map1 == map2)
1464 { 1357 {
1465 *dx = 0; 1358 *dx = 0;
1466 *dy = 0; 1359 *dy = 0;
… …
1720 1613
1721 // instead of crashing in the unlikely(?) case, try to return *something* 1614 // instead of crashing in the unlikely(?) case, try to return *something*
1722 return get_archetype ("blocked"); 1615 return get_archetype ("blocked");
1723} 1616}
1724 1617
1618void
1619maptile::play_sound (faceidx sound, int x, int y) const
1620{
1621 if (!sound)
1622 return;
1623
1624 for_all_players (pl)
1625 if (pl->ob->map == this)
1626 if (client *ns = pl->ns)
1627 {
1628 int dx = x - pl->ob->x;
1629 int dy = y - pl->ob->y;
1630
1631 int distance = idistance (dx, dy);
1632
1633 if (distance <= MAX_SOUND_DISTANCE)
1634 ns->play_sound (sound, dx, dy);
1635 }
1636}
1637

Diff Legend

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