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.113 by root, Fri Jul 13 15:54:40 2007 UTC vs.
Revision 1.134 by root, Tue Apr 15 14:21:04 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
… …
388bool 307bool
389maptile::_load_objects (object_thawer &f) 308maptile::_load_objects (object_thawer &f)
390{ 309{
391 for (;;) 310 for (;;)
392 { 311 {
393 coroapi::cede_to_tick_every (100); // cede once in a while 312 coroapi::cede_to_tick (); // cede once in a while
394 313
395 switch (f.kw) 314 switch (f.kw)
396 { 315 {
397 case KW_arch: 316 case KW_arch:
398 if (object *op = object::read (f, this)) 317 if (object *op = object::read (f, this))
399 { 318 {
400 if (op->inv) 319 if (op->inv)
401 sum_weight (op); 320 sum_weight (op);
402 321
403 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 }
404 } 348 }
405 349
406 continue; 350 continue;
407 351
408 case KW_EOF: 352 case KW_EOF:
… …
421} 365}
422 366
423void 367void
424maptile::activate () 368maptile::activate ()
425{ 369{
426 active = true;
427
428 if (spaces) 370 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 371 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 372 for (object *op = ms->bot; op; op = op->above)
431 op->activate_recursive (); 373 op->activate_recursive ();
432} 374}
433 375
434void 376void
435maptile::deactivate () 377maptile::deactivate ()
436{ 378{
437 active = false;
438
439 if (spaces) 379 if (spaces)
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 380 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 381 for (object *op = ms->bot; op; op = op->above)
442 op->deactivate_recursive (); 382 op->deactivate_recursive ();
443} 383}
… …
453 if (!spaces) 393 if (!spaces)
454 return false; 394 return false;
455 395
456 for (int i = 0; i < size (); ++i) 396 for (int i = 0; i < size (); ++i)
457 { 397 {
458 int unique = 0; 398 bool unique = 0;
399
459 for (object *op = spaces [i].bot; op; op = op->above) 400 for (object *op = spaces [i].bot; op; op = op->above)
460 { 401 {
461 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 402 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
462 unique = 1;
463 403
464 if (!op->can_map_save ()) 404 if (expect_false (!op->can_map_save ()))
465 continue; 405 continue;
466 406
467 if (unique || op->flag [FLAG_UNIQUE]) 407 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
468 { 408 {
469 if (flags & IO_UNIQUES) 409 if (flags & IO_UNIQUES)
470 op->write (f); 410 op->write (f);
471 } 411 }
472 else if (flags & IO_OBJECTS) 412 else if (expect_true (flags & IO_OBJECTS))
473 op->write (f); 413 op->write (f);
474 } 414 }
475 } 415 }
476 416
477 coroapi::cede_to_tick (); 417 coroapi::cede_to_tick ();
478 418
479 return true; 419 return true;
480}
481
482bool
483maptile::_load_objects (const char *path, bool skip_header)
484{
485 object_thawer f (path);
486
487 if (!f)
488 return false;
489
490 f.next ();
491
492 if (skip_header)
493 for (;;)
494 {
495 keyword kw = f.kw;
496 f.skip ();
497 if (kw == KW_end)
498 break;
499 }
500
501 return _load_objects (f);
502} 420}
503 421
504bool 422bool
505maptile::_save_objects (const char *path, int flags) 423maptile::_save_objects (const char *path, int flags)
506{ 424{
… …
681bool 599bool
682maptile::_load_header (object_thawer &thawer) 600maptile::_load_header (object_thawer &thawer)
683{ 601{
684 for (;;) 602 for (;;)
685 { 603 {
686 thawer.next ();
687
688 switch (thawer.kw) 604 switch (thawer.kw)
689 { 605 {
690 case KW_msg: 606 case KW_msg:
691 thawer.get_ml (KW_endmsg, msg); 607 thawer.get_ml (KW_endmsg, msg);
692 break; 608 break;
… …
747 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
748 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
749 case KW_tile_path_4: thawer.get (tile_path [3]); break; 665 case KW_tile_path_4: thawer.get (tile_path [3]); break;
750 666
751 case KW_ERROR: 667 case KW_ERROR:
752 set_key (thawer.kw_str, thawer.value); 668 set_key_text (thawer.kw_str, thawer.value);
753 break; 669 break;
754 670
755 case KW_end: 671 case KW_end:
672 thawer.next ();
756 return true; 673 return true;
757 674
758 default: 675 default:
759 if (!thawer.parse_error ("map", 0)) 676 if (!thawer.parse_error ("map", 0))
760 return false; 677 return false;
761 break; 678 break;
762 } 679 }
680
681 thawer.next ();
763 } 682 }
764 683
765 abort (); 684 abort ();
766}
767
768bool
769maptile::_load_header (const char *path)
770{
771 object_thawer thawer (path);
772
773 if (!thawer)
774 return false;
775
776 return _load_header (thawer);
777} 685}
778 686
779/****************************************************************************** 687/******************************************************************************
780 * This is the start of unique map handling code 688 * This is the start of unique map handling code
781 *****************************************************************************/ 689 *****************************************************************************/
… …
880 * Remove and free all objects in the given map. 788 * Remove and free all objects in the given map.
881 */ 789 */
882void 790void
883maptile::clear () 791maptile::clear ()
884{ 792{
885 sfree (regions, size ()); regions = 0;
886 delete [] regionmap; regionmap = 0;
887
888 if (spaces) 793 if (spaces)
889 { 794 {
890 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 795 for (mapspace *ms = spaces + size (); ms-- > spaces; )
891 while (object *op = ms->bot) 796 while (object *op = ms->bot)
892 { 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
893 op = op->head_ (); 804 object *head = op->head_ ();
805 if (op == head)
806 {
894 op->destroy_inv (false); 807 op->destroy_inv (false);
895 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 }
896 } 815 }
897 816
898 sfree (spaces, size ()), spaces = 0; 817 sfree (spaces, size ()), spaces = 0;
899 } 818 }
900 819
901 if (buttons) 820 if (buttons)
902 free_objectlinkpt (buttons), buttons = 0; 821 free_objectlinkpt (buttons), buttons = 0;
822
823 sfree (regions, size ()); regions = 0;
824 delete [] regionmap; regionmap = 0;
903} 825}
904 826
905void 827void
906maptile::clear_header () 828maptile::clear_header ()
907{ 829{
… …
959 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))
960 break; 882 break;
961 883
962 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 884 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
963 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 885 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
964 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
965 || QUERY_FLAG (op, FLAG_UNIQUE) 886 || QUERY_FLAG (op, FLAG_UNIQUE)
966 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 887 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
967 || QUERY_FLAG (op, FLAG_UNPAID) 888 || QUERY_FLAG (op, FLAG_UNPAID)
968 || op->is_alive ()) 889 || op->is_alive ())
969 ; // do not decay 890 ; // do not decay
… …
1294 vol += op->volume (); 1215 vol += op->volume ();
1295 1216
1296 return vol; 1217 return vol;
1297} 1218}
1298 1219
1299/* this updates the orig_map->tile_map[tile_num] value after finding 1220bool
1300 * the map. It also takes care of linking back the freshly found 1221maptile::tile_available (int dir, bool load)
1301 * maps tile_map values if it tiles back to this one. It returns
1302 * the value of orig_map->tile_map[tile_num].
1303 */
1304static inline maptile *
1305find_and_link (maptile *orig_map, int tile_num)
1306{ 1222{
1307 maptile *mp = orig_map->tile_map [tile_num]; 1223 if (!tile_path[dir])
1224 return 0;
1308 1225
1309 if (!mp) 1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1310 { 1227 return 1;
1311 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1312 1228
1313 if (!mp) 1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1314 { 1230 return 1;
1315 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1316 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1317 &orig_map->tile_path[tile_num], &orig_map->path);
1318 mp = new maptile (1, 1);
1319 mp->alloc ();
1320 mp->in_memory = MAP_IN_MEMORY;
1321 }
1322 }
1323 1231
1324 int dest_tile = (tile_num + 2) % 4;
1325
1326 orig_map->tile_map [tile_num] = mp;
1327
1328 // optimisation: back-link map to origin map if euclidean
1329 //TODO: non-euclidean maps MUST GO
1330 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1331 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1332
1333 return mp; 1232 return 0;
1334}
1335
1336static inline void
1337load_and_link (maptile *orig_map, int tile_num)
1338{
1339 find_and_link (orig_map, tile_num)->load_sync ();
1340} 1233}
1341 1234
1342/* this returns TRUE if the coordinates (x,y) are out of 1235/* this returns TRUE if the coordinates (x,y) are out of
1343 * map m. This function also takes into account any 1236 * map m. This function also takes into account any
1344 * tiling considerations, loading adjacant maps as needed. 1237 * tiling considerations, loading adjacant maps as needed.
… …
1357 if (!m) 1250 if (!m)
1358 return 0; 1251 return 0;
1359 1252
1360 if (x < 0) 1253 if (x < 0)
1361 { 1254 {
1362 if (!m->tile_path[3]) 1255 if (!m->tile_available (3))
1363 return 1; 1256 return 1;
1364 1257
1365 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1366 find_and_link (m, 3);
1367
1368 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);
1369 } 1259 }
1370 1260
1371 if (x >= m->width) 1261 if (x >= m->width)
1372 { 1262 {
1373 if (!m->tile_path[1]) 1263 if (!m->tile_available (1))
1374 return 1; 1264 return 1;
1375 1265
1376 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1377 find_and_link (m, 1);
1378
1379 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);
1380 } 1267 }
1381 1268
1382 if (y < 0) 1269 if (y < 0)
1383 { 1270 {
1384 if (!m->tile_path[0]) 1271 if (!m->tile_available (0))
1385 return 1; 1272 return 1;
1386 1273
1387 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1388 find_and_link (m, 0);
1389
1390 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);
1391 } 1275 }
1392 1276
1393 if (y >= m->height) 1277 if (y >= m->height)
1394 { 1278 {
1395 if (!m->tile_path[2]) 1279 if (!m->tile_available (2))
1396 return 1; 1280 return 1;
1397
1398 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1399 find_and_link (m, 2);
1400 1281
1401 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);
1402 } 1283 }
1403 1284
1404 /* Simple case - coordinates are within this local 1285 /* Simple case - coordinates are within this local
… …
1418maptile * 1299maptile *
1419maptile::xy_find (sint16 &x, sint16 &y) 1300maptile::xy_find (sint16 &x, sint16 &y)
1420{ 1301{
1421 if (x < 0) 1302 if (x < 0)
1422 { 1303 {
1423 if (!tile_path[3]) 1304 if (!tile_available (3))
1424 return 0; 1305 return 0;
1425 1306
1426 find_and_link (this, 3);
1427 x += tile_map[3]->width; 1307 x += tile_map[3]->width;
1428 return tile_map[3]->xy_find (x, y); 1308 return tile_map[3]->xy_find (x, y);
1429 } 1309 }
1430 1310
1431 if (x >= width) 1311 if (x >= width)
1432 { 1312 {
1433 if (!tile_path[1]) 1313 if (!tile_available (1))
1434 return 0; 1314 return 0;
1435 1315
1436 find_and_link (this, 1);
1437 x -= width; 1316 x -= width;
1438 return tile_map[1]->xy_find (x, y); 1317 return tile_map[1]->xy_find (x, y);
1439 } 1318 }
1440 1319
1441 if (y < 0) 1320 if (y < 0)
1442 { 1321 {
1443 if (!tile_path[0]) 1322 if (!tile_available (0))
1444 return 0; 1323 return 0;
1445 1324
1446 find_and_link (this, 0);
1447 y += tile_map[0]->height; 1325 y += tile_map[0]->height;
1448 return tile_map[0]->xy_find (x, y); 1326 return tile_map[0]->xy_find (x, y);
1449 } 1327 }
1450 1328
1451 if (y >= height) 1329 if (y >= height)
1452 { 1330 {
1453 if (!tile_path[2]) 1331 if (!tile_available (2))
1454 return 0; 1332 return 0;
1455 1333
1456 find_and_link (this, 2);
1457 y -= height; 1334 y -= height;
1458 return tile_map[2]->xy_find (x, y); 1335 return tile_map[2]->xy_find (x, y);
1459 } 1336 }
1460 1337
1461 /* Simple case - coordinates are within this local 1338 /* Simple case - coordinates are within this local
… …
1472adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1349adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1473{ 1350{
1474 if (!map1 || !map2) 1351 if (!map1 || !map2)
1475 return 0; 1352 return 0;
1476 1353
1477 //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
1478 //fix: compare paths instead (this is likely faster, too!) 1355 //fix: compare paths instead (this is likely faster, too!)
1479 if (map1 == map2) 1356 if (map1 == map2)
1480 { 1357 {
1481 *dx = 0; 1358 *dx = 0;
1482 *dy = 0; 1359 *dy = 0;
… …
1736 1613
1737 // instead of crashing in the unlikely(?) case, try to return *something* 1614 // instead of crashing in the unlikely(?) case, try to return *something*
1738 return get_archetype ("blocked"); 1615 return get_archetype ("blocked");
1739} 1616}
1740 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