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.128 by root, Sun Sep 9 06:25:45 2007 UTC

… …
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
… …
355{ 289{
356 if (!spaces) 290 if (!spaces)
357 return; 291 return;
358 292
359 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 293 for (mapspace *ms = spaces + size (); ms-- > spaces; )
360 for (object *op = ms->bot; op; op = op->above) 294 {
295 object *op = ms->bot;
296 while (op)
361 { 297 {
362 /* already multipart - don't do anything more */ 298 /* already multipart - don't do anything more */
363 if (op->head_ () == op && !op->more && op->arch->more) 299 if (op->head_ () == op && !op->more && op->arch->more)
364 { 300 {
365 op->remove (); 301 op->remove ();
366 op->expand_tail (); 302 op->expand_tail ();
303
304 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
305 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
306 // 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); 307 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
308
309 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
310 // so we have to reset the iteration through the mapspace
368 } 311 }
312 else
313 op = op->above;
369 } 314 }
315 }
370} 316}
371 317
372/* 318/*
373 * Loads (ands parses) the objects into a given map from the specified 319 * Loads (ands parses) the objects into a given map from the specified
374 * file pointer. 320 * file pointer.
… …
409} 355}
410 356
411void 357void
412maptile::activate () 358maptile::activate ()
413{ 359{
414 active = true;
415
416 if (spaces) 360 if (spaces)
417 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 361 for (mapspace *ms = spaces + size (); ms-- > spaces; )
418 for (object *op = ms->bot; op; op = op->above) 362 for (object *op = ms->bot; op; op = op->above)
419 op->activate_recursive (); 363 op->activate_recursive ();
420} 364}
421 365
422void 366void
423maptile::deactivate () 367maptile::deactivate ()
424{ 368{
425 active = false;
426
427 if (spaces) 369 if (spaces)
428 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
429 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
430 op->deactivate_recursive (); 372 op->deactivate_recursive ();
431} 373}
… …
441 if (!spaces) 383 if (!spaces)
442 return false; 384 return false;
443 385
444 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
445 { 387 {
446 int unique = 0; 388 bool unique = 0;
389
447 for (object *op = spaces [i].bot; op; op = op->above) 390 for (object *op = spaces [i].bot; op; op = op->above)
448 { 391 {
449 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 392 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
450 unique = 1;
451 393
452 if (!op->can_map_save ()) 394 if (expect_false (!op->can_map_save ()))
453 continue; 395 continue;
454 396
455 if (unique || op->flag [FLAG_UNIQUE]) 397 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
456 { 398 {
457 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
458 op->write (f); 400 op->write (f);
459 } 401 }
460 else if (flags & IO_OBJECTS) 402 else if (expect_true (flags & IO_OBJECTS))
461 op->write (f); 403 op->write (f);
462 } 404 }
463 } 405 }
464 406
465 coroapi::cede_to_tick (); 407 coroapi::cede_to_tick ();
466 408
467 return true; 409 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} 410}
491 411
492bool 412bool
493maptile::_save_objects (const char *path, int flags) 413maptile::_save_objects (const char *path, int flags)
494{ 414{
… …
669bool 589bool
670maptile::_load_header (object_thawer &thawer) 590maptile::_load_header (object_thawer &thawer)
671{ 591{
672 for (;;) 592 for (;;)
673 { 593 {
674 thawer.next ();
675
676 switch (thawer.kw) 594 switch (thawer.kw)
677 { 595 {
678 case KW_msg: 596 case KW_msg:
679 thawer.get_ml (KW_endmsg, msg); 597 thawer.get_ml (KW_endmsg, msg);
680 break; 598 break;
… …
734 case KW_tile_path_1: thawer.get (tile_path [0]); break; 652 case KW_tile_path_1: thawer.get (tile_path [0]); break;
735 case KW_tile_path_2: thawer.get (tile_path [1]); break; 653 case KW_tile_path_2: thawer.get (tile_path [1]); break;
736 case KW_tile_path_3: thawer.get (tile_path [2]); break; 654 case KW_tile_path_3: thawer.get (tile_path [2]); break;
737 case KW_tile_path_4: thawer.get (tile_path [3]); break; 655 case KW_tile_path_4: thawer.get (tile_path [3]); break;
738 656
657 case KW_ERROR:
658 set_key_text (thawer.kw_str, thawer.value);
659 break;
660
739 case KW_end: 661 case KW_end:
662 thawer.next ();
740 return true; 663 return true;
741 664
742 default: 665 default:
743 if (!thawer.parse_error ("map", 0)) 666 if (!thawer.parse_error ("map", 0))
744 return false; 667 return false;
745 break; 668 break;
746 } 669 }
670
671 thawer.next ();
747 } 672 }
748 673
749 abort (); 674 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} 675}
762 676
763/****************************************************************************** 677/******************************************************************************
764 * This is the start of unique map handling code 678 * This is the start of unique map handling code
765 *****************************************************************************/ 679 *****************************************************************************/
… …
864 * Remove and free all objects in the given map. 778 * Remove and free all objects in the given map.
865 */ 779 */
866void 780void
867maptile::clear () 781maptile::clear ()
868{ 782{
869 sfree (regions, size ()), regions = 0;
870 free (regionmap), regionmap = 0;
871
872 if (spaces) 783 if (spaces)
873 { 784 {
874 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 785 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 while (object *op = ms->bot) 786 while (object *op = ms->bot)
876 { 787 {
788 // manually remove, as to not trigger anything
789 if (ms->bot = op->above)
790 ms->bot->below = 0;
791
792 op->flag [FLAG_REMOVED] = true;
793
877 op = op->head_ (); 794 object *head = op->head_ ();
795 if (op == head)
796 {
878 op->destroy_inv (false); 797 op->destroy_inv (false);
879 op->destroy (); 798 op->destroy ();
799 }
800 else if (head->map != op->map)
801 {
802 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
803 head->destroy ();
804 }
880 } 805 }
881 806
882 sfree (spaces, size ()), spaces = 0; 807 sfree (spaces, size ()), spaces = 0;
883 } 808 }
884 809
885 if (buttons) 810 if (buttons)
886 free_objectlinkpt (buttons), buttons = 0; 811 free_objectlinkpt (buttons), buttons = 0;
812
813 sfree (regions, size ()); regions = 0;
814 delete [] regionmap; regionmap = 0;
887} 815}
888 816
889void 817void
890maptile::clear_header () 818maptile::clear_header ()
891{ 819{
… …
943 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 871 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
944 break; 872 break;
945 873
946 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 874 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
947 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 875 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
948 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
949 || QUERY_FLAG (op, FLAG_UNIQUE) 876 || QUERY_FLAG (op, FLAG_UNIQUE)
950 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 877 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
951 || QUERY_FLAG (op, FLAG_UNPAID) 878 || QUERY_FLAG (op, FLAG_UNPAID)
952 || op->is_alive ()) 879 || op->is_alive ())
953 ; // do not decay 880 ; // do not decay
… …
1278 vol += op->volume (); 1205 vol += op->volume ();
1279 1206
1280 return vol; 1207 return vol;
1281} 1208}
1282 1209
1283/* this updates the orig_map->tile_map[tile_num] value after finding 1210bool
1284 * the map. It also takes care of linking back the freshly found 1211maptile::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{ 1212{
1291 maptile *mp = orig_map->tile_map [tile_num]; 1213 if (!tile_path[dir])
1214 return 0;
1292 1215
1293 if (!mp) 1216 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1294 { 1217 return 1;
1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1296 1218
1297 if (!mp) 1219 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1298 { 1220 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 1221
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; 1222 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} 1223}
1325 1224
1326/* this returns TRUE if the coordinates (x,y) are out of 1225/* this returns TRUE if the coordinates (x,y) are out of
1327 * map m. This function also takes into account any 1226 * map m. This function also takes into account any
1328 * tiling considerations, loading adjacant maps as needed. 1227 * tiling considerations, loading adjacant maps as needed.
… …
1341 if (!m) 1240 if (!m)
1342 return 0; 1241 return 0;
1343 1242
1344 if (x < 0) 1243 if (x < 0)
1345 { 1244 {
1346 if (!m->tile_path[3]) 1245 if (!m->tile_available (3))
1347 return 1; 1246 return 1;
1348 1247
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); 1248 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1353 } 1249 }
1354 1250
1355 if (x >= m->width) 1251 if (x >= m->width)
1356 { 1252 {
1357 if (!m->tile_path[1]) 1253 if (!m->tile_available (1))
1358 return 1; 1254 return 1;
1359 1255
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); 1256 return out_of_map (m->tile_map[1], x - m->width, y);
1364 } 1257 }
1365 1258
1366 if (y < 0) 1259 if (y < 0)
1367 { 1260 {
1368 if (!m->tile_path[0]) 1261 if (!m->tile_available (0))
1369 return 1; 1262 return 1;
1370 1263
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); 1264 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1375 } 1265 }
1376 1266
1377 if (y >= m->height) 1267 if (y >= m->height)
1378 { 1268 {
1379 if (!m->tile_path[2]) 1269 if (!m->tile_available (2))
1380 return 1; 1270 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 1271
1385 return out_of_map (m->tile_map[2], x, y - m->height); 1272 return out_of_map (m->tile_map[2], x, y - m->height);
1386 } 1273 }
1387 1274
1388 /* Simple case - coordinates are within this local 1275 /* Simple case - coordinates are within this local
… …
1402maptile * 1289maptile *
1403maptile::xy_find (sint16 &x, sint16 &y) 1290maptile::xy_find (sint16 &x, sint16 &y)
1404{ 1291{
1405 if (x < 0) 1292 if (x < 0)
1406 { 1293 {
1407 if (!tile_path[3]) 1294 if (!tile_available (3))
1408 return 0; 1295 return 0;
1409 1296
1410 find_and_link (this, 3);
1411 x += tile_map[3]->width; 1297 x += tile_map[3]->width;
1412 return tile_map[3]->xy_find (x, y); 1298 return tile_map[3]->xy_find (x, y);
1413 } 1299 }
1414 1300
1415 if (x >= width) 1301 if (x >= width)
1416 { 1302 {
1417 if (!tile_path[1]) 1303 if (!tile_available (1))
1418 return 0; 1304 return 0;
1419 1305
1420 find_and_link (this, 1);
1421 x -= width; 1306 x -= width;
1422 return tile_map[1]->xy_find (x, y); 1307 return tile_map[1]->xy_find (x, y);
1423 } 1308 }
1424 1309
1425 if (y < 0) 1310 if (y < 0)
1426 { 1311 {
1427 if (!tile_path[0]) 1312 if (!tile_available (0))
1428 return 0; 1313 return 0;
1429 1314
1430 find_and_link (this, 0);
1431 y += tile_map[0]->height; 1315 y += tile_map[0]->height;
1432 return tile_map[0]->xy_find (x, y); 1316 return tile_map[0]->xy_find (x, y);
1433 } 1317 }
1434 1318
1435 if (y >= height) 1319 if (y >= height)
1436 { 1320 {
1437 if (!tile_path[2]) 1321 if (!tile_available (2))
1438 return 0; 1322 return 0;
1439 1323
1440 find_and_link (this, 2);
1441 y -= height; 1324 y -= height;
1442 return tile_map[2]->xy_find (x, y); 1325 return tile_map[2]->xy_find (x, y);
1443 } 1326 }
1444 1327
1445 /* Simple case - coordinates are within this local 1328 /* Simple case - coordinates are within this local
… …
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1339adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1340{
1458 if (!map1 || !map2) 1341 if (!map1 || !map2)
1459 return 0; 1342 return 0;
1460 1343
1461 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1344 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1462 //fix: compare paths instead (this is likely faster, too!) 1345 //fix: compare paths instead (this is likely faster, too!)
1463 if (map1 == map2) 1346 if (map1 == map2)
1464 { 1347 {
1465 *dx = 0; 1348 *dx = 0;
1466 *dy = 0; 1349 *dy = 0;
… …
1720 1603
1721 // instead of crashing in the unlikely(?) case, try to return *something* 1604 // instead of crashing in the unlikely(?) case, try to return *something*
1722 return get_archetype ("blocked"); 1605 return get_archetype ("blocked");
1723} 1606}
1724 1607
1608void
1609maptile::play_sound (faceidx sound, int x, int y) const
1610{
1611 if (!sound)
1612 return;
1613
1614 for_all_players (pl)
1615 if (pl->observe->map == this)
1616 if (client *ns = pl->ns)
1617 {
1618 int dx = x - pl->observe->x;
1619 int dy = y - pl->observe->y;
1620
1621 int distance = idistance (dx, dy);
1622
1623 if (distance <= MAX_SOUND_DISTANCE)
1624 ns->play_sound (sound, dx, dy);
1625 }
1626}
1627

Diff Legend

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