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.137 by root, Wed Apr 30 16:26:28 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
27#include "funcpoint.h"
28 27
29#include "loader.h" 28#include "loader.h"
30 29
31#include "path.h" 30#include "path.h"
32
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 31
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 32/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 33 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 34 * it will also do map translation for tiled maps, returning
102 * 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
… …
232 } 165 }
233 return 0; 166 return 0;
234} 167}
235 168
236/* 169/*
237 * 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
238 * This is meant for multi space objects - for single space objecs, 171 * spot. This is meant for multi space objects - for single space objecs,
239 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
240 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
241 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
242 * 175 *
243 * 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.
244 * 177 *
245 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
246 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
257 * 190 *
258 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
259 * 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
260 * against the move_block values. 193 * against the move_block values.
261 */ 194 */
262int 195bool
263ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
264{ 197{
265 archetype *tmp; 198 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 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
279 201
280 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 202 if (!pos.normalise ())
281 { 203 return 1;
282 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
283 204
284 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
285 return P_OUT_OF_MAP; 206
286 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
287 return P_IS_ALIVE; 208 return 1;
288 209
289 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
290 211 * (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. 212 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
294 */ 213 */
295
296 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
297 continue; 215 continue;
298 216
299 /* 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
300 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
301 */ 219 */
302 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
303 return P_NO_PASS; 221 return 1;
304 } 222 }
305 223
306 return 0; 224 return 0;
307} 225}
308 226
… …
326 244
327 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
328 tmp = next; 246 tmp = next;
329 } 247 }
330 248
331 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
332 * carrying. 250 //TODO: remove
333 */ 251 container->update_weight ();
334 sum_weight (container);
335} 252}
336 253
337void 254void
338maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
339{ 256{
… …
355{ 272{
356 if (!spaces) 273 if (!spaces)
357 return; 274 return;
358 275
359 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 276 for (mapspace *ms = spaces + size (); ms-- > spaces; )
360 for (object *op = ms->bot; op; op = op->above) 277 {
278 object *op = ms->bot;
279 while (op)
361 { 280 {
362 /* already multipart - don't do anything more */ 281 /* already multipart - don't do anything more */
363 if (op->head_ () == op && !op->more && op->arch->more) 282 if (op->head_ () == op && !op->more && op->arch->more)
364 { 283 {
365 op->remove (); 284 op->remove ();
366 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
367 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
368 } 294 }
295 else
296 op = op->above;
369 } 297 }
298 }
370} 299}
371 300
372/* 301/*
373 * 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
374 * file pointer. 303 * file pointer.
… …
376bool 305bool
377maptile::_load_objects (object_thawer &f) 306maptile::_load_objects (object_thawer &f)
378{ 307{
379 for (;;) 308 for (;;)
380 { 309 {
381 coroapi::cede_to_tick_every (100); // cede once in a while 310 coroapi::cede_to_tick (); // cede once in a while
382 311
383 switch (f.kw) 312 switch (f.kw)
384 { 313 {
385 case KW_arch: 314 case KW_arch:
386 if (object *op = object::read (f, this)) 315 if (object *op = object::read (f, this))
387 { 316 {
317 // TODO: why?
388 if (op->inv) 318 if (op->inv)
389 sum_weight (op); 319 op->update_weight ();
390 320
391 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 }
392 } 347 }
393 348
394 continue; 349 continue;
395 350
396 case KW_EOF: 351 case KW_EOF:
… …
409} 364}
410 365
411void 366void
412maptile::activate () 367maptile::activate ()
413{ 368{
414 active = true;
415
416 if (spaces) 369 if (spaces)
417 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
418 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
419 op->activate_recursive (); 372 op->activate_recursive ();
420} 373}
421 374
422void 375void
423maptile::deactivate () 376maptile::deactivate ()
424{ 377{
425 active = false;
426
427 if (spaces) 378 if (spaces)
428 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 379 for (mapspace *ms = spaces + size (); ms-- > spaces; )
429 for (object *op = ms->bot; op; op = op->above) 380 for (object *op = ms->bot; op; op = op->above)
430 op->deactivate_recursive (); 381 op->deactivate_recursive ();
431} 382}
… …
441 if (!spaces) 392 if (!spaces)
442 return false; 393 return false;
443 394
444 for (int i = 0; i < size (); ++i) 395 for (int i = 0; i < size (); ++i)
445 { 396 {
446 int unique = 0; 397 bool unique = 0;
398
447 for (object *op = spaces [i].bot; op; op = op->above) 399 for (object *op = spaces [i].bot; op; op = op->above)
448 { 400 {
449 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 401 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
450 unique = 1;
451 402
452 if (!op->can_map_save ()) 403 if (expect_false (!op->can_map_save ()))
453 continue; 404 continue;
454 405
455 if (unique || op->flag [FLAG_UNIQUE]) 406 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
456 { 407 {
457 if (flags & IO_UNIQUES) 408 if (flags & IO_UNIQUES)
458 op->write (f); 409 op->write (f);
459 } 410 }
460 else if (flags & IO_OBJECTS) 411 else if (expect_true (flags & IO_OBJECTS))
461 op->write (f); 412 op->write (f);
462 } 413 }
463 } 414 }
464 415
465 coroapi::cede_to_tick (); 416 coroapi::cede_to_tick ();
466 417
467 return true; 418 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} 419}
491 420
492bool 421bool
493maptile::_save_objects (const char *path, int flags) 422maptile::_save_objects (const char *path, int flags)
494{ 423{
… …
669bool 598bool
670maptile::_load_header (object_thawer &thawer) 599maptile::_load_header (object_thawer &thawer)
671{ 600{
672 for (;;) 601 for (;;)
673 { 602 {
674 thawer.next ();
675
676 switch (thawer.kw) 603 switch (thawer.kw)
677 { 604 {
678 case KW_msg: 605 case KW_msg:
679 thawer.get_ml (KW_endmsg, msg); 606 thawer.get_ml (KW_endmsg, msg);
680 break; 607 break;
… …
734 case KW_tile_path_1: thawer.get (tile_path [0]); break; 661 case KW_tile_path_1: thawer.get (tile_path [0]); break;
735 case KW_tile_path_2: thawer.get (tile_path [1]); break; 662 case KW_tile_path_2: thawer.get (tile_path [1]); break;
736 case KW_tile_path_3: thawer.get (tile_path [2]); break; 663 case KW_tile_path_3: thawer.get (tile_path [2]); break;
737 case KW_tile_path_4: thawer.get (tile_path [3]); break; 664 case KW_tile_path_4: thawer.get (tile_path [3]); break;
738 665
666 case KW_ERROR:
667 set_key_text (thawer.kw_str, thawer.value);
668 break;
669
739 case KW_end: 670 case KW_end:
671 thawer.next ();
740 return true; 672 return true;
741 673
742 default: 674 default:
743 if (!thawer.parse_error ("map", 0)) 675 if (!thawer.parse_error ("map", 0))
744 return false; 676 return false;
745 break; 677 break;
746 } 678 }
679
680 thawer.next ();
747 } 681 }
748 682
749 abort (); 683 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} 684}
762 685
763/****************************************************************************** 686/******************************************************************************
764 * This is the start of unique map handling code 687 * This is the start of unique map handling code
765 *****************************************************************************/ 688 *****************************************************************************/
… …
864 * Remove and free all objects in the given map. 787 * Remove and free all objects in the given map.
865 */ 788 */
866void 789void
867maptile::clear () 790maptile::clear ()
868{ 791{
869 sfree (regions, size ()), regions = 0;
870 free (regionmap), regionmap = 0;
871
872 if (spaces) 792 if (spaces)
873 { 793 {
874 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 794 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 while (object *op = ms->bot) 795 while (object *op = ms->bot)
876 { 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
877 op = op->head_ (); 803 object *head = op->head_ ();
804 if (op == head)
805 {
878 op->destroy_inv (false); 806 op->destroy_inv (false);
879 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 }
880 } 814 }
881 815
882 sfree (spaces, size ()), spaces = 0; 816 sfree0 (spaces, size ());
883 } 817 }
884 818
885 if (buttons) 819 if (buttons)
886 free_objectlinkpt (buttons), buttons = 0; 820 free_objectlinkpt (buttons), buttons = 0;
821
822 sfree0 (regions, size ());
823 delete [] regionmap; regionmap = 0;
887} 824}
888 825
889void 826void
890maptile::clear_header () 827maptile::clear_header ()
891{ 828{
… …
943 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))
944 break; 881 break;
945 882
946 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 883 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
947 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 884 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
948 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
949 || QUERY_FLAG (op, FLAG_UNIQUE) 885 || QUERY_FLAG (op, FLAG_UNIQUE)
950 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 886 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
951 || QUERY_FLAG (op, FLAG_UNPAID) 887 || QUERY_FLAG (op, FLAG_UNPAID)
952 || op->is_alive ()) 888 || op->is_alive ())
953 ; // do not decay 889 ; // do not decay
… …
1278 vol += op->volume (); 1214 vol += op->volume ();
1279 1215
1280 return vol; 1216 return vol;
1281} 1217}
1282 1218
1283/* this updates the orig_map->tile_map[tile_num] value after finding 1219bool
1284 * the map. It also takes care of linking back the freshly found 1220maptile::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{ 1221{
1291 maptile *mp = orig_map->tile_map [tile_num]; 1222 if (!tile_path[dir])
1223 return 0;
1292 1224
1293 if (!mp) 1225 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1294 { 1226 return 1;
1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1296 1227
1297 if (!mp) 1228 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1298 { 1229 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 1230
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; 1231 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} 1232}
1325 1233
1326/* this returns TRUE if the coordinates (x,y) are out of 1234/* this returns TRUE if the coordinates (x,y) are out of
1327 * map m. This function also takes into account any 1235 * map m. This function also takes into account any
1328 * tiling considerations, loading adjacant maps as needed. 1236 * tiling considerations, loading adjacant maps as needed.
… …
1341 if (!m) 1249 if (!m)
1342 return 0; 1250 return 0;
1343 1251
1344 if (x < 0) 1252 if (x < 0)
1345 { 1253 {
1346 if (!m->tile_path[3]) 1254 if (!m->tile_available (3))
1347 return 1; 1255 return 1;
1348 1256
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); 1257 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1353 } 1258 }
1354 1259
1355 if (x >= m->width) 1260 if (x >= m->width)
1356 { 1261 {
1357 if (!m->tile_path[1]) 1262 if (!m->tile_available (1))
1358 return 1; 1263 return 1;
1359 1264
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); 1265 return out_of_map (m->tile_map[1], x - m->width, y);
1364 } 1266 }
1365 1267
1366 if (y < 0) 1268 if (y < 0)
1367 { 1269 {
1368 if (!m->tile_path[0]) 1270 if (!m->tile_available (0))
1369 return 1; 1271 return 1;
1370 1272
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); 1273 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1375 } 1274 }
1376 1275
1377 if (y >= m->height) 1276 if (y >= m->height)
1378 { 1277 {
1379 if (!m->tile_path[2]) 1278 if (!m->tile_available (2))
1380 return 1; 1279 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 1280
1385 return out_of_map (m->tile_map[2], x, y - m->height); 1281 return out_of_map (m->tile_map[2], x, y - m->height);
1386 } 1282 }
1387 1283
1388 /* Simple case - coordinates are within this local 1284 /* Simple case - coordinates are within this local
… …
1402maptile * 1298maptile *
1403maptile::xy_find (sint16 &x, sint16 &y) 1299maptile::xy_find (sint16 &x, sint16 &y)
1404{ 1300{
1405 if (x < 0) 1301 if (x < 0)
1406 { 1302 {
1407 if (!tile_path[3]) 1303 if (!tile_available (3))
1408 return 0; 1304 return 0;
1409 1305
1410 find_and_link (this, 3);
1411 x += tile_map[3]->width; 1306 x += tile_map[3]->width;
1412 return tile_map[3]->xy_find (x, y); 1307 return tile_map[3]->xy_find (x, y);
1413 } 1308 }
1414 1309
1415 if (x >= width) 1310 if (x >= width)
1416 { 1311 {
1417 if (!tile_path[1]) 1312 if (!tile_available (1))
1418 return 0; 1313 return 0;
1419 1314
1420 find_and_link (this, 1);
1421 x -= width; 1315 x -= width;
1422 return tile_map[1]->xy_find (x, y); 1316 return tile_map[1]->xy_find (x, y);
1423 } 1317 }
1424 1318
1425 if (y < 0) 1319 if (y < 0)
1426 { 1320 {
1427 if (!tile_path[0]) 1321 if (!tile_available (0))
1428 return 0; 1322 return 0;
1429 1323
1430 find_and_link (this, 0);
1431 y += tile_map[0]->height; 1324 y += tile_map[0]->height;
1432 return tile_map[0]->xy_find (x, y); 1325 return tile_map[0]->xy_find (x, y);
1433 } 1326 }
1434 1327
1435 if (y >= height) 1328 if (y >= height)
1436 { 1329 {
1437 if (!tile_path[2]) 1330 if (!tile_available (2))
1438 return 0; 1331 return 0;
1439 1332
1440 find_and_link (this, 2);
1441 y -= height; 1333 y -= height;
1442 return tile_map[2]->xy_find (x, y); 1334 return tile_map[2]->xy_find (x, y);
1443 } 1335 }
1444 1336
1445 /* Simple case - coordinates are within this local 1337 /* Simple case - coordinates are within this local
… …
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1348adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1349{
1458 if (!map1 || !map2) 1350 if (!map1 || !map2)
1459 return 0; 1351 return 0;
1460 1352
1461 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1353 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1462 //fix: compare paths instead (this is likely faster, too!) 1354 //fix: compare paths instead (this is likely faster, too!)
1463 if (map1 == map2) 1355 if (map1 == map2)
1464 { 1356 {
1465 *dx = 0; 1357 *dx = 0;
1466 *dy = 0; 1358 *dy = 0;
… …
1720 1612
1721 // instead of crashing in the unlikely(?) case, try to return *something* 1613 // instead of crashing in the unlikely(?) case, try to return *something*
1722 return get_archetype ("blocked"); 1614 return get_archetype ("blocked");
1723} 1615}
1724 1616
1617void
1618maptile::play_sound (faceidx sound, int x, int y) const
1619{
1620 if (!sound)
1621 return;
1622
1623 for_all_players (pl)
1624 if (pl->ob->map == this)
1625 if (client *ns = pl->ns)
1626 {
1627 int dx = x - pl->ob->x;
1628 int dy = y - pl->ob->y;
1629
1630 int distance = idistance (dx, dy);
1631
1632 if (distance <= MAX_SOUND_DISTANCE)
1633 ns->play_sound (sound, dx, dy);
1634 }
1635}
1636

Diff Legend

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