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.112 by root, Thu Jul 12 18:48:20 2007 UTC vs.
Revision 1.129 by root, Wed Sep 12 11:10:09 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
… …
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
… …
421} 340}
422 341
423void 342void
424maptile::activate () 343maptile::activate ()
425{ 344{
426 active = true;
427
428 if (spaces) 345 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 346 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 347 for (object *op = ms->bot; op; op = op->above)
431 op->activate_recursive (); 348 op->activate_recursive ();
432} 349}
433 350
434void 351void
435maptile::deactivate () 352maptile::deactivate ()
436{ 353{
437 active = false;
438
439 if (spaces) 354 if (spaces)
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 355 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 356 for (object *op = ms->bot; op; op = op->above)
442 op->deactivate_recursive (); 357 op->deactivate_recursive ();
443} 358}
… …
453 if (!spaces) 368 if (!spaces)
454 return false; 369 return false;
455 370
456 for (int i = 0; i < size (); ++i) 371 for (int i = 0; i < size (); ++i)
457 { 372 {
458 int unique = 0; 373 bool unique = 0;
374
459 for (object *op = spaces [i].bot; op; op = op->above) 375 for (object *op = spaces [i].bot; op; op = op->above)
460 { 376 {
461 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 377 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
462 unique = 1;
463 378
464 if (!op->can_map_save ()) 379 if (expect_false (!op->can_map_save ()))
465 continue; 380 continue;
466 381
467 if (unique || op->flag [FLAG_UNIQUE]) 382 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
468 { 383 {
469 if (flags & IO_UNIQUES) 384 if (flags & IO_UNIQUES)
470 op->write (f); 385 op->write (f);
471 } 386 }
472 else if (flags & IO_OBJECTS) 387 else if (expect_true (flags & IO_OBJECTS))
473 op->write (f); 388 op->write (f);
474 } 389 }
475 } 390 }
476 391
477 coroapi::cede_to_tick (); 392 coroapi::cede_to_tick ();
478 393
479 return true; 394 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} 395}
503 396
504bool 397bool
505maptile::_save_objects (const char *path, int flags) 398maptile::_save_objects (const char *path, int flags)
506{ 399{
… …
681bool 574bool
682maptile::_load_header (object_thawer &thawer) 575maptile::_load_header (object_thawer &thawer)
683{ 576{
684 for (;;) 577 for (;;)
685 { 578 {
686 thawer.next ();
687
688 switch (thawer.kw) 579 switch (thawer.kw)
689 { 580 {
690 case KW_msg: 581 case KW_msg:
691 thawer.get_ml (KW_endmsg, msg); 582 thawer.get_ml (KW_endmsg, msg);
692 break; 583 break;
… …
747 case KW_tile_path_2: thawer.get (tile_path [1]); break; 638 case KW_tile_path_2: thawer.get (tile_path [1]); break;
748 case KW_tile_path_3: thawer.get (tile_path [2]); break; 639 case KW_tile_path_3: thawer.get (tile_path [2]); break;
749 case KW_tile_path_4: thawer.get (tile_path [3]); break; 640 case KW_tile_path_4: thawer.get (tile_path [3]); break;
750 641
751 case KW_ERROR: 642 case KW_ERROR:
752 set_key (thawer.kw_str, thawer.value); 643 set_key_text (thawer.kw_str, thawer.value);
753 break; 644 break;
754 645
755 case KW_end: 646 case KW_end:
647 thawer.next ();
756 return true; 648 return true;
757 649
758 default: 650 default:
759 if (!thawer.parse_error ("map", 0)) 651 if (!thawer.parse_error ("map", 0))
760 return false; 652 return false;
761 break; 653 break;
762 } 654 }
655
656 thawer.next ();
763 } 657 }
764 658
765 abort (); 659 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} 660}
778 661
779/****************************************************************************** 662/******************************************************************************
780 * This is the start of unique map handling code 663 * This is the start of unique map handling code
781 *****************************************************************************/ 664 *****************************************************************************/
… …
880 * Remove and free all objects in the given map. 763 * Remove and free all objects in the given map.
881 */ 764 */
882void 765void
883maptile::clear () 766maptile::clear ()
884{ 767{
885 sfree (regions, size ()), regions = 0;
886 free (regionmap), regionmap = 0;
887
888 if (spaces) 768 if (spaces)
889 { 769 {
890 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 770 for (mapspace *ms = spaces + size (); ms-- > spaces; )
891 while (object *op = ms->bot) 771 while (object *op = ms->bot)
892 { 772 {
773 // manually remove, as to not trigger anything
774 if (ms->bot = op->above)
775 ms->bot->below = 0;
776
777 op->flag [FLAG_REMOVED] = true;
778
893 op = op->head_ (); 779 object *head = op->head_ ();
780 if (op == head)
781 {
894 op->destroy_inv (false); 782 op->destroy_inv (false);
895 op->destroy (); 783 op->destroy ();
784 }
785 else if (head->map != op->map)
786 {
787 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
788 head->destroy ();
789 }
896 } 790 }
897 791
898 sfree (spaces, size ()), spaces = 0; 792 sfree (spaces, size ()), spaces = 0;
899 } 793 }
900 794
901 if (buttons) 795 if (buttons)
902 free_objectlinkpt (buttons), buttons = 0; 796 free_objectlinkpt (buttons), buttons = 0;
797
798 sfree (regions, size ()); regions = 0;
799 delete [] regionmap; regionmap = 0;
903} 800}
904 801
905void 802void
906maptile::clear_header () 803maptile::clear_header ()
907{ 804{
… …
959 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 856 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
960 break; 857 break;
961 858
962 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 859 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
963 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 860 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
964 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
965 || QUERY_FLAG (op, FLAG_UNIQUE) 861 || QUERY_FLAG (op, FLAG_UNIQUE)
966 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 862 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
967 || QUERY_FLAG (op, FLAG_UNPAID) 863 || QUERY_FLAG (op, FLAG_UNPAID)
968 || op->is_alive ()) 864 || op->is_alive ())
969 ; // do not decay 865 ; // do not decay
… …
1294 vol += op->volume (); 1190 vol += op->volume ();
1295 1191
1296 return vol; 1192 return vol;
1297} 1193}
1298 1194
1299/* this updates the orig_map->tile_map[tile_num] value after finding 1195bool
1300 * the map. It also takes care of linking back the freshly found 1196maptile::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{ 1197{
1307 maptile *mp = orig_map->tile_map [tile_num]; 1198 if (!tile_path[dir])
1199 return 0;
1308 1200
1309 if (!mp) 1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1310 { 1202 return 1;
1311 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1312 1203
1313 if (!mp) 1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1314 { 1205 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 1206
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; 1207 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} 1208}
1341 1209
1342/* this returns TRUE if the coordinates (x,y) are out of 1210/* this returns TRUE if the coordinates (x,y) are out of
1343 * map m. This function also takes into account any 1211 * map m. This function also takes into account any
1344 * tiling considerations, loading adjacant maps as needed. 1212 * tiling considerations, loading adjacant maps as needed.
… …
1357 if (!m) 1225 if (!m)
1358 return 0; 1226 return 0;
1359 1227
1360 if (x < 0) 1228 if (x < 0)
1361 { 1229 {
1362 if (!m->tile_path[3]) 1230 if (!m->tile_available (3))
1363 return 1; 1231 return 1;
1364 1232
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); 1233 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1369 } 1234 }
1370 1235
1371 if (x >= m->width) 1236 if (x >= m->width)
1372 { 1237 {
1373 if (!m->tile_path[1]) 1238 if (!m->tile_available (1))
1374 return 1; 1239 return 1;
1375 1240
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); 1241 return out_of_map (m->tile_map[1], x - m->width, y);
1380 } 1242 }
1381 1243
1382 if (y < 0) 1244 if (y < 0)
1383 { 1245 {
1384 if (!m->tile_path[0]) 1246 if (!m->tile_available (0))
1385 return 1; 1247 return 1;
1386 1248
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); 1249 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1391 } 1250 }
1392 1251
1393 if (y >= m->height) 1252 if (y >= m->height)
1394 { 1253 {
1395 if (!m->tile_path[2]) 1254 if (!m->tile_available (2))
1396 return 1; 1255 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 1256
1401 return out_of_map (m->tile_map[2], x, y - m->height); 1257 return out_of_map (m->tile_map[2], x, y - m->height);
1402 } 1258 }
1403 1259
1404 /* Simple case - coordinates are within this local 1260 /* Simple case - coordinates are within this local
… …
1418maptile * 1274maptile *
1419maptile::xy_find (sint16 &x, sint16 &y) 1275maptile::xy_find (sint16 &x, sint16 &y)
1420{ 1276{
1421 if (x < 0) 1277 if (x < 0)
1422 { 1278 {
1423 if (!tile_path[3]) 1279 if (!tile_available (3))
1424 return 0; 1280 return 0;
1425 1281
1426 find_and_link (this, 3);
1427 x += tile_map[3]->width; 1282 x += tile_map[3]->width;
1428 return tile_map[3]->xy_find (x, y); 1283 return tile_map[3]->xy_find (x, y);
1429 } 1284 }
1430 1285
1431 if (x >= width) 1286 if (x >= width)
1432 { 1287 {
1433 if (!tile_path[1]) 1288 if (!tile_available (1))
1434 return 0; 1289 return 0;
1435 1290
1436 find_and_link (this, 1);
1437 x -= width; 1291 x -= width;
1438 return tile_map[1]->xy_find (x, y); 1292 return tile_map[1]->xy_find (x, y);
1439 } 1293 }
1440 1294
1441 if (y < 0) 1295 if (y < 0)
1442 { 1296 {
1443 if (!tile_path[0]) 1297 if (!tile_available (0))
1444 return 0; 1298 return 0;
1445 1299
1446 find_and_link (this, 0);
1447 y += tile_map[0]->height; 1300 y += tile_map[0]->height;
1448 return tile_map[0]->xy_find (x, y); 1301 return tile_map[0]->xy_find (x, y);
1449 } 1302 }
1450 1303
1451 if (y >= height) 1304 if (y >= height)
1452 { 1305 {
1453 if (!tile_path[2]) 1306 if (!tile_available (2))
1454 return 0; 1307 return 0;
1455 1308
1456 find_and_link (this, 2);
1457 y -= height; 1309 y -= height;
1458 return tile_map[2]->xy_find (x, y); 1310 return tile_map[2]->xy_find (x, y);
1459 } 1311 }
1460 1312
1461 /* Simple case - coordinates are within this local 1313 /* Simple case - coordinates are within this local
… …
1472adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1324adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1473{ 1325{
1474 if (!map1 || !map2) 1326 if (!map1 || !map2)
1475 return 0; 1327 return 0;
1476 1328
1477 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1329 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1478 //fix: compare paths instead (this is likely faster, too!) 1330 //fix: compare paths instead (this is likely faster, too!)
1479 if (map1 == map2) 1331 if (map1 == map2)
1480 { 1332 {
1481 *dx = 0; 1333 *dx = 0;
1482 *dy = 0; 1334 *dy = 0;
… …
1736 1588
1737 // instead of crashing in the unlikely(?) case, try to return *something* 1589 // instead of crashing in the unlikely(?) case, try to return *something*
1738 return get_archetype ("blocked"); 1590 return get_archetype ("blocked");
1739} 1591}
1740 1592
1593void
1594maptile::play_sound (faceidx sound, int x, int y) const
1595{
1596 if (!sound)
1597 return;
1598
1599 for_all_players (pl)
1600 if (pl->observe->map == this)
1601 if (client *ns = pl->ns)
1602 {
1603 int dx = x - pl->observe->x;
1604 int dy = y - pl->observe->y;
1605
1606 int distance = idistance (dx, dy);
1607
1608 if (distance <= MAX_SOUND_DISTANCE)
1609 ns->play_sound (sound, dx, dy);
1610 }
1611}
1612

Diff Legend

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