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.116 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.125 by root, Thu Sep 6 06:53:05 2007 UTC

… …
383 if (!spaces) 383 if (!spaces)
384 return false; 384 return false;
385 385
386 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
387 { 387 {
388 int unique = 0; 388 bool unique = 0;
389
389 for (object *op = spaces [i].bot; op; op = op->above) 390 for (object *op = spaces [i].bot; op; op = op->above)
390 { 391 {
391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 392 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392 unique = 1;
393 393
394 if (!op->can_map_save ()) 394 if (expect_false (!op->can_map_save ()))
395 continue; 395 continue;
396 396
397 if (unique || op->flag [FLAG_UNIQUE]) 397 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
398 { 398 {
399 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
400 op->write (f); 400 op->write (f);
401 } 401 }
402 else if (flags & IO_OBJECTS) 402 else if (expect_true (flags & IO_OBJECTS))
403 op->write (f); 403 op->write (f);
404 } 404 }
405 } 405 }
406 406
407 coroapi::cede_to_tick (); 407 coroapi::cede_to_tick ();
408 408
409 return true; 409 return true;
410}
411
412bool
413maptile::_load_objects (const char *path, bool skip_header)
414{
415 object_thawer f (path);
416
417 if (!f)
418 return false;
419
420 f.next ();
421
422 if (skip_header)
423 for (;;)
424 {
425 keyword kw = f.kw;
426 f.skip ();
427 if (kw == KW_end)
428 break;
429 }
430
431 return _load_objects (f);
432} 410}
433 411
434bool 412bool
435maptile::_save_objects (const char *path, int flags) 413maptile::_save_objects (const char *path, int flags)
436{ 414{
… …
611bool 589bool
612maptile::_load_header (object_thawer &thawer) 590maptile::_load_header (object_thawer &thawer)
613{ 591{
614 for (;;) 592 for (;;)
615 { 593 {
616 thawer.next ();
617
618 switch (thawer.kw) 594 switch (thawer.kw)
619 { 595 {
620 case KW_msg: 596 case KW_msg:
621 thawer.get_ml (KW_endmsg, msg); 597 thawer.get_ml (KW_endmsg, msg);
622 break; 598 break;
… …
677 case KW_tile_path_2: thawer.get (tile_path [1]); break; 653 case KW_tile_path_2: thawer.get (tile_path [1]); break;
678 case KW_tile_path_3: thawer.get (tile_path [2]); break; 654 case KW_tile_path_3: thawer.get (tile_path [2]); break;
679 case KW_tile_path_4: thawer.get (tile_path [3]); break; 655 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 656
681 case KW_ERROR: 657 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value); 658 set_key_text (thawer.kw_str, thawer.value);
683 break; 659 break;
684 660
685 case KW_end: 661 case KW_end:
662 thawer.next ();
686 return true; 663 return true;
687 664
688 default: 665 default:
689 if (!thawer.parse_error ("map", 0)) 666 if (!thawer.parse_error ("map", 0))
690 return false; 667 return false;
691 break; 668 break;
692 } 669 }
670
671 thawer.next ();
693 } 672 }
694 673
695 abort (); 674 abort ();
696}
697
698bool
699maptile::_load_header (const char *path)
700{
701 object_thawer thawer (path);
702
703 if (!thawer)
704 return false;
705
706 return _load_header (thawer);
707} 675}
708 676
709/****************************************************************************** 677/******************************************************************************
710 * This is the start of unique map handling code 678 * This is the start of unique map handling code
711 *****************************************************************************/ 679 *****************************************************************************/
… …
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 857 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break; 858 break;
891 859
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 860 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 861 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE) 862 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 863 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID) 864 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ()) 865 || op->is_alive ())
899 ; // do not decay 866 ; // do not decay
… …
1224 vol += op->volume (); 1191 vol += op->volume ();
1225 1192
1226 return vol; 1193 return vol;
1227} 1194}
1228 1195
1229/* this updates the orig_map->tile_map[tile_num] value after finding 1196bool
1230 * the map. It also takes care of linking back the freshly found 1197maptile::tile_available (int dir, bool load)
1231 * maps tile_map values if it tiles back to this one. It returns
1232 * the value of orig_map->tile_map[tile_num].
1233 */
1234static inline maptile *
1235find_and_link (maptile *orig_map, int tile_num)
1236{ 1198{
1237 maptile *mp = orig_map->tile_map [tile_num]; 1199 if (!tile_path[dir])
1200 return 0;
1238 1201
1239 if (!mp) 1202 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1240 { 1203 return 1;
1241 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1242 1204
1243 if (!mp) 1205 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1244 { 1206 return 1;
1245 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1246 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1247 &orig_map->tile_path[tile_num], &orig_map->path);
1248 mp = new maptile (1, 1);
1249 mp->alloc ();
1250 mp->in_memory = MAP_IN_MEMORY;
1251 }
1252 }
1253 1207
1254 int dest_tile = (tile_num + 2) % 4;
1255
1256 orig_map->tile_map [tile_num] = mp;
1257
1258 // optimisation: back-link map to origin map if euclidean
1259 //TODO: non-euclidean maps MUST GO
1260 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1261 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1262
1263 return mp; 1208 return 0;
1264}
1265
1266static inline void
1267load_and_link (maptile *orig_map, int tile_num)
1268{
1269 find_and_link (orig_map, tile_num)->load_sync ();
1270} 1209}
1271 1210
1272/* this returns TRUE if the coordinates (x,y) are out of 1211/* this returns TRUE if the coordinates (x,y) are out of
1273 * map m. This function also takes into account any 1212 * map m. This function also takes into account any
1274 * tiling considerations, loading adjacant maps as needed. 1213 * tiling considerations, loading adjacant maps as needed.
… …
1287 if (!m) 1226 if (!m)
1288 return 0; 1227 return 0;
1289 1228
1290 if (x < 0) 1229 if (x < 0)
1291 { 1230 {
1292 if (!m->tile_path[3]) 1231 if (!m->tile_available (3))
1293 return 1; 1232 return 1;
1294 1233
1295 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1296 find_and_link (m, 3);
1297
1298 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1234 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1299 } 1235 }
1300 1236
1301 if (x >= m->width) 1237 if (x >= m->width)
1302 { 1238 {
1303 if (!m->tile_path[1]) 1239 if (!m->tile_available (1))
1304 return 1; 1240 return 1;
1305 1241
1306 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1307 find_and_link (m, 1);
1308
1309 return out_of_map (m->tile_map[1], x - m->width, y); 1242 return out_of_map (m->tile_map[1], x - m->width, y);
1310 } 1243 }
1311 1244
1312 if (y < 0) 1245 if (y < 0)
1313 { 1246 {
1314 if (!m->tile_path[0]) 1247 if (!m->tile_available (0))
1315 return 1; 1248 return 1;
1316 1249
1317 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1318 find_and_link (m, 0);
1319
1320 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1250 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1321 } 1251 }
1322 1252
1323 if (y >= m->height) 1253 if (y >= m->height)
1324 { 1254 {
1325 if (!m->tile_path[2]) 1255 if (!m->tile_available (2))
1326 return 1; 1256 return 1;
1327
1328 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1329 find_and_link (m, 2);
1330 1257
1331 return out_of_map (m->tile_map[2], x, y - m->height); 1258 return out_of_map (m->tile_map[2], x, y - m->height);
1332 } 1259 }
1333 1260
1334 /* Simple case - coordinates are within this local 1261 /* Simple case - coordinates are within this local
… …
1348maptile * 1275maptile *
1349maptile::xy_find (sint16 &x, sint16 &y) 1276maptile::xy_find (sint16 &x, sint16 &y)
1350{ 1277{
1351 if (x < 0) 1278 if (x < 0)
1352 { 1279 {
1353 if (!tile_path[3]) 1280 if (!tile_available (3))
1354 return 0; 1281 return 0;
1355 1282
1356 find_and_link (this, 3);
1357 x += tile_map[3]->width; 1283 x += tile_map[3]->width;
1358 return tile_map[3]->xy_find (x, y); 1284 return tile_map[3]->xy_find (x, y);
1359 } 1285 }
1360 1286
1361 if (x >= width) 1287 if (x >= width)
1362 { 1288 {
1363 if (!tile_path[1]) 1289 if (!tile_available (1))
1364 return 0; 1290 return 0;
1365 1291
1366 find_and_link (this, 1);
1367 x -= width; 1292 x -= width;
1368 return tile_map[1]->xy_find (x, y); 1293 return tile_map[1]->xy_find (x, y);
1369 } 1294 }
1370 1295
1371 if (y < 0) 1296 if (y < 0)
1372 { 1297 {
1373 if (!tile_path[0]) 1298 if (!tile_available (0))
1374 return 0; 1299 return 0;
1375 1300
1376 find_and_link (this, 0);
1377 y += tile_map[0]->height; 1301 y += tile_map[0]->height;
1378 return tile_map[0]->xy_find (x, y); 1302 return tile_map[0]->xy_find (x, y);
1379 } 1303 }
1380 1304
1381 if (y >= height) 1305 if (y >= height)
1382 { 1306 {
1383 if (!tile_path[2]) 1307 if (!tile_available (2))
1384 return 0; 1308 return 0;
1385 1309
1386 find_and_link (this, 2);
1387 y -= height; 1310 y -= height;
1388 return tile_map[2]->xy_find (x, y); 1311 return tile_map[2]->xy_find (x, y);
1389 } 1312 }
1390 1313
1391 /* Simple case - coordinates are within this local 1314 /* Simple case - coordinates are within this local
… …
1402adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1325adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1403{ 1326{
1404 if (!map1 || !map2) 1327 if (!map1 || !map2)
1405 return 0; 1328 return 0;
1406 1329
1407 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1330 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1408 //fix: compare paths instead (this is likely faster, too!) 1331 //fix: compare paths instead (this is likely faster, too!)
1409 if (map1 == map2) 1332 if (map1 == map2)
1410 { 1333 {
1411 *dx = 0; 1334 *dx = 0;
1412 *dy = 0; 1335 *dy = 0;
… …
1673{ 1596{
1674 if (!sound) 1597 if (!sound)
1675 return; 1598 return;
1676 1599
1677 for_all_players (pl) 1600 for_all_players (pl)
1678 if (pl->ob->map == this) 1601 if (pl->observe->map == this)
1679 if (client *ns = pl->ns) 1602 if (client *ns = pl->ns)
1680 { 1603 {
1681 int dx = x - pl->ob->x; 1604 int dx = x - pl->ob->x;
1682 int dy = y - pl->ob->y; 1605 int dy = y - pl->ob->y;
1683 1606

Diff Legend

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