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.134 by root, Tue Apr 15 14:21:04 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 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" 27#include "funcpoint.h"
29 28
30#include "loader.h" 29#include "loader.h"
31 30
32#include "path.h" 31#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 32
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
103 * 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
… …
233 } 166 }
234 return 0; 167 return 0;
235} 168}
236 169
237/* 170/*
238 * 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
239 * This is meant for multi space objects - for single space objecs, 172 * spot. This is meant for multi space objects - for single space objecs,
240 * just calling get_map_blocked and checking that against movement type 173 * just calling get_map_blocked and checking that against movement type
241 * of object. This function goes through all the parts of the 174 * of object. This function goes through all the parts of the multipart
242 * multipart object and makes sure they can be inserted. 175 * object and makes sure they can be inserted.
243 * 176 *
244 * 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.
245 * 178 *
246 * This function has been used to deprecate arch_out_of_map - 179 * This function has been used to deprecate arch_out_of_map -
247 * this function also does that check, and since in most cases, 180 * this function also does that check, and since in most cases,
… …
258 * 191 *
259 * Note this used to be arch_blocked, but with new movement 192 * Note this used to be arch_blocked, but with new movement
260 * 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
261 * against the move_block values. 194 * against the move_block values.
262 */ 195 */
263int 196bool
264ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 197object::blocked (maptile *m, int x, int y) const
265{ 198{
266 archetype *tmp; 199 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 } 200 {
201 mapxy pos (m, x + tmp->x, y + tmp->y);
280 202
281 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 203 if (!pos.normalise ())
282 { 204 return 1;
283 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
284 205
285 if (flag & P_OUT_OF_MAP) 206 mapspace &ms = *pos;
286 return P_OUT_OF_MAP; 207
287 if (flag & P_IS_ALIVE) 208 if (ms.flags () & P_IS_ALIVE)
288 return P_IS_ALIVE; 209 return 1;
289 210
290 mapspace &ms = m1->at (sx, sy); 211 /* However, often ob doesn't have any move type
291 212 * (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. 213 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
295 */ 214 */
296
297 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 215 if (!move_type && ms.move_block != MOVE_ALL)
298 continue; 216 continue;
299 217
300 /* 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
301 * head of the object should correspond for the entire object. 219 * head of the object should correspond for the entire object.
302 */ 220 */
303 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 221 if (ms.blocks (move_type))
304 return P_NO_PASS; 222 return 1;
305 } 223 }
306 224
307 return 0; 225 return 0;
308} 226}
309 227
… …
356{ 274{
357 if (!spaces) 275 if (!spaces)
358 return; 276 return;
359 277
360 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 278 for (mapspace *ms = spaces + size (); ms-- > spaces; )
361 for (object *op = ms->bot; op; op = op->above) 279 {
280 object *op = ms->bot;
281 while (op)
362 { 282 {
363 /* already multipart - don't do anything more */ 283 /* already multipart - don't do anything more */
364 if (op->head_ () == op && !op->more && op->arch->more) 284 if (op->head_ () == op && !op->more && op->arch->more)
365 { 285 {
366 op->remove (); 286 op->remove ();
367 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
368 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
369 } 296 }
297 else
298 op = op->above;
370 } 299 }
300 }
371} 301}
372 302
373/* 303/*
374 * 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
375 * file pointer. 305 * file pointer.
… …
377bool 307bool
378maptile::_load_objects (object_thawer &f) 308maptile::_load_objects (object_thawer &f)
379{ 309{
380 for (;;) 310 for (;;)
381 { 311 {
382 coroapi::cede_to_tick_every (100); // cede once in a while 312 coroapi::cede_to_tick (); // cede once in a while
383 313
384 switch (f.kw) 314 switch (f.kw)
385 { 315 {
386 case KW_arch: 316 case KW_arch:
387 if (object *op = object::read (f, this)) 317 if (object *op = object::read (f, this))
388 { 318 {
389 if (op->inv) 319 if (op->inv)
390 sum_weight (op); 320 sum_weight (op);
391 321
392 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 }
393 } 348 }
394 349
395 continue; 350 continue;
396 351
397 case KW_EOF: 352 case KW_EOF:
… …
410} 365}
411 366
412void 367void
413maptile::activate () 368maptile::activate ()
414{ 369{
415 active = true;
416
417 if (spaces) 370 if (spaces)
418 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 371 for (mapspace *ms = spaces + size (); ms-- > spaces; )
419 for (object *op = ms->bot; op; op = op->above) 372 for (object *op = ms->bot; op; op = op->above)
420 op->activate_recursive (); 373 op->activate_recursive ();
421} 374}
422 375
423void 376void
424maptile::deactivate () 377maptile::deactivate ()
425{ 378{
426 active = false;
427
428 if (spaces) 379 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 380 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 381 for (object *op = ms->bot; op; op = op->above)
431 op->deactivate_recursive (); 382 op->deactivate_recursive ();
432} 383}
… …
442 if (!spaces) 393 if (!spaces)
443 return false; 394 return false;
444 395
445 for (int i = 0; i < size (); ++i) 396 for (int i = 0; i < size (); ++i)
446 { 397 {
447 int unique = 0; 398 bool unique = 0;
399
448 for (object *op = spaces [i].bot; op; op = op->above) 400 for (object *op = spaces [i].bot; op; op = op->above)
449 { 401 {
450 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 402 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
451 unique = 1;
452 403
453 if (!op->can_map_save ()) 404 if (expect_false (!op->can_map_save ()))
454 continue; 405 continue;
455 406
456 if (unique || op->flag [FLAG_UNIQUE]) 407 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
457 { 408 {
458 if (flags & IO_UNIQUES) 409 if (flags & IO_UNIQUES)
459 op->write (f); 410 op->write (f);
460 } 411 }
461 else if (flags & IO_OBJECTS) 412 else if (expect_true (flags & IO_OBJECTS))
462 op->write (f); 413 op->write (f);
463 } 414 }
464 } 415 }
465 416
466 coroapi::cede_to_tick (); 417 coroapi::cede_to_tick ();
467 418
468 return true; 419 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} 420}
492 421
493bool 422bool
494maptile::_save_objects (const char *path, int flags) 423maptile::_save_objects (const char *path, int flags)
495{ 424{
… …
670bool 599bool
671maptile::_load_header (object_thawer &thawer) 600maptile::_load_header (object_thawer &thawer)
672{ 601{
673 for (;;) 602 for (;;)
674 { 603 {
675 thawer.next ();
676
677 switch (thawer.kw) 604 switch (thawer.kw)
678 { 605 {
679 case KW_msg: 606 case KW_msg:
680 thawer.get_ml (KW_endmsg, msg); 607 thawer.get_ml (KW_endmsg, msg);
681 break; 608 break;
… …
735 case KW_tile_path_1: thawer.get (tile_path [0]); break; 662 case KW_tile_path_1: thawer.get (tile_path [0]); break;
736 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
737 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
738 case KW_tile_path_4: thawer.get (tile_path [3]); break; 665 case KW_tile_path_4: thawer.get (tile_path [3]); break;
739 666
667 case KW_ERROR:
668 set_key_text (thawer.kw_str, thawer.value);
669 break;
670
740 case KW_end: 671 case KW_end:
672 thawer.next ();
741 return true; 673 return true;
742 674
743 default: 675 default:
744 if (!thawer.parse_error ("map", 0)) 676 if (!thawer.parse_error ("map", 0))
745 return false; 677 return false;
746 break; 678 break;
747 } 679 }
680
681 thawer.next ();
748 } 682 }
749 683
750 abort (); 684 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} 685}
763 686
764/****************************************************************************** 687/******************************************************************************
765 * This is the start of unique map handling code 688 * This is the start of unique map handling code
766 *****************************************************************************/ 689 *****************************************************************************/
… …
865 * Remove and free all objects in the given map. 788 * Remove and free all objects in the given map.
866 */ 789 */
867void 790void
868maptile::clear () 791maptile::clear ()
869{ 792{
870 sfree (regions, size ()), regions = 0;
871 free (regionmap), regionmap = 0;
872
873 if (spaces) 793 if (spaces)
874 { 794 {
875 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 795 for (mapspace *ms = spaces + size (); ms-- > spaces; )
876 while (object *op = ms->bot) 796 while (object *op = ms->bot)
877 { 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
878 op = op->head_ (); 804 object *head = op->head_ ();
805 if (op == head)
806 {
879 op->destroy_inv (false); 807 op->destroy_inv (false);
880 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 }
881 } 815 }
882 816
883 sfree (spaces, size ()), spaces = 0; 817 sfree (spaces, size ()), spaces = 0;
884 } 818 }
885 819
886 if (buttons) 820 if (buttons)
887 free_objectlinkpt (buttons), buttons = 0; 821 free_objectlinkpt (buttons), buttons = 0;
822
823 sfree (regions, size ()); regions = 0;
824 delete [] regionmap; regionmap = 0;
888} 825}
889 826
890void 827void
891maptile::clear_header () 828maptile::clear_header ()
892{ 829{
… …
944 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))
945 break; 882 break;
946 883
947 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 884 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
948 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 885 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
949 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
950 || QUERY_FLAG (op, FLAG_UNIQUE) 886 || QUERY_FLAG (op, FLAG_UNIQUE)
951 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 887 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
952 || QUERY_FLAG (op, FLAG_UNPAID) 888 || QUERY_FLAG (op, FLAG_UNPAID)
953 || op->is_alive ()) 889 || op->is_alive ())
954 ; // do not decay 890 ; // do not decay
… …
1279 vol += op->volume (); 1215 vol += op->volume ();
1280 1216
1281 return vol; 1217 return vol;
1282} 1218}
1283 1219
1284/* this updates the orig_map->tile_map[tile_num] value after finding 1220bool
1285 * the map. It also takes care of linking back the freshly found 1221maptile::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{ 1222{
1292 maptile *mp = orig_map->tile_map [tile_num]; 1223 if (!tile_path[dir])
1224 return 0;
1293 1225
1294 if (!mp) 1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1295 { 1227 return 1;
1296 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1297 1228
1298 if (!mp) 1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1299 { 1230 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 1231
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; 1232 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} 1233}
1326 1234
1327/* this returns TRUE if the coordinates (x,y) are out of 1235/* this returns TRUE if the coordinates (x,y) are out of
1328 * map m. This function also takes into account any 1236 * map m. This function also takes into account any
1329 * tiling considerations, loading adjacant maps as needed. 1237 * tiling considerations, loading adjacant maps as needed.
… …
1342 if (!m) 1250 if (!m)
1343 return 0; 1251 return 0;
1344 1252
1345 if (x < 0) 1253 if (x < 0)
1346 { 1254 {
1347 if (!m->tile_path[3]) 1255 if (!m->tile_available (3))
1348 return 1; 1256 return 1;
1349 1257
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); 1258 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1354 } 1259 }
1355 1260
1356 if (x >= m->width) 1261 if (x >= m->width)
1357 { 1262 {
1358 if (!m->tile_path[1]) 1263 if (!m->tile_available (1))
1359 return 1; 1264 return 1;
1360 1265
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); 1266 return out_of_map (m->tile_map[1], x - m->width, y);
1365 } 1267 }
1366 1268
1367 if (y < 0) 1269 if (y < 0)
1368 { 1270 {
1369 if (!m->tile_path[0]) 1271 if (!m->tile_available (0))
1370 return 1; 1272 return 1;
1371 1273
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); 1274 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1376 } 1275 }
1377 1276
1378 if (y >= m->height) 1277 if (y >= m->height)
1379 { 1278 {
1380 if (!m->tile_path[2]) 1279 if (!m->tile_available (2))
1381 return 1; 1280 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 1281
1386 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);
1387 } 1283 }
1388 1284
1389 /* Simple case - coordinates are within this local 1285 /* Simple case - coordinates are within this local
… …
1403maptile * 1299maptile *
1404maptile::xy_find (sint16 &x, sint16 &y) 1300maptile::xy_find (sint16 &x, sint16 &y)
1405{ 1301{
1406 if (x < 0) 1302 if (x < 0)
1407 { 1303 {
1408 if (!tile_path[3]) 1304 if (!tile_available (3))
1409 return 0; 1305 return 0;
1410 1306
1411 find_and_link (this, 3);
1412 x += tile_map[3]->width; 1307 x += tile_map[3]->width;
1413 return tile_map[3]->xy_find (x, y); 1308 return tile_map[3]->xy_find (x, y);
1414 } 1309 }
1415 1310
1416 if (x >= width) 1311 if (x >= width)
1417 { 1312 {
1418 if (!tile_path[1]) 1313 if (!tile_available (1))
1419 return 0; 1314 return 0;
1420 1315
1421 find_and_link (this, 1);
1422 x -= width; 1316 x -= width;
1423 return tile_map[1]->xy_find (x, y); 1317 return tile_map[1]->xy_find (x, y);
1424 } 1318 }
1425 1319
1426 if (y < 0) 1320 if (y < 0)
1427 { 1321 {
1428 if (!tile_path[0]) 1322 if (!tile_available (0))
1429 return 0; 1323 return 0;
1430 1324
1431 find_and_link (this, 0);
1432 y += tile_map[0]->height; 1325 y += tile_map[0]->height;
1433 return tile_map[0]->xy_find (x, y); 1326 return tile_map[0]->xy_find (x, y);
1434 } 1327 }
1435 1328
1436 if (y >= height) 1329 if (y >= height)
1437 { 1330 {
1438 if (!tile_path[2]) 1331 if (!tile_available (2))
1439 return 0; 1332 return 0;
1440 1333
1441 find_and_link (this, 2);
1442 y -= height; 1334 y -= height;
1443 return tile_map[2]->xy_find (x, y); 1335 return tile_map[2]->xy_find (x, y);
1444 } 1336 }
1445 1337
1446 /* Simple case - coordinates are within this local 1338 /* Simple case - coordinates are within this local
… …
1457adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1349adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1458{ 1350{
1459 if (!map1 || !map2) 1351 if (!map1 || !map2)
1460 return 0; 1352 return 0;
1461 1353
1462 //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
1463 //fix: compare paths instead (this is likely faster, too!) 1355 //fix: compare paths instead (this is likely faster, too!)
1464 if (map1 == map2) 1356 if (map1 == map2)
1465 { 1357 {
1466 *dx = 0; 1358 *dx = 0;
1467 *dy = 0; 1359 *dy = 0;
… …
1721 1613
1722 // instead of crashing in the unlikely(?) case, try to return *something* 1614 // instead of crashing in the unlikely(?) case, try to return *something*
1723 return get_archetype ("blocked"); 1615 return get_archetype ("blocked");
1724} 1616}
1725 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