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.117 by root, Fri Aug 24 00:26:09 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
… …
1227} 1194}
1228 1195
1229bool 1196bool
1230maptile::tile_available (int dir, bool load) 1197maptile::tile_available (int dir, bool load)
1231{ 1198{
1199 if (!tile_path[dir])
1200 return 0;
1201
1232 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1202 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1233 return 1; 1203 return 1;
1234
1235 if (!tile_path[dir])
1236 return 0;
1237 1204
1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1205 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1239 return 1; 1206 return 1;
1240 1207
1241 return 0; 1208 return 0;
… …
1259 if (!m) 1226 if (!m)
1260 return 0; 1227 return 0;
1261 1228
1262 if (x < 0) 1229 if (x < 0)
1263 { 1230 {
1264 if (!m->tile_available (3, 0)) 1231 if (!m->tile_available (3))
1265 return 1; 1232 return 1;
1266 1233
1267 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);
1268 } 1235 }
1269 1236
1270 if (x >= m->width) 1237 if (x >= m->width)
1271 { 1238 {
1272 if (!m->tile_available (1, 0)) 1239 if (!m->tile_available (1))
1273 return 1; 1240 return 1;
1274 1241
1275 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);
1276 } 1243 }
1277 1244
1278 if (y < 0) 1245 if (y < 0)
1279 { 1246 {
1280 if (!m->tile_available (0, 0)) 1247 if (!m->tile_available (0))
1281 return 1; 1248 return 1;
1282 1249
1283 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);
1284 } 1251 }
1285 1252
1286 if (y >= m->height) 1253 if (y >= m->height)
1287 { 1254 {
1288 if (!m->tile_available (2, 0)) 1255 if (!m->tile_available (2))
1289 return 1; 1256 return 1;
1290 1257
1291 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);
1292 } 1259 }
1293 1260
… …
1308maptile * 1275maptile *
1309maptile::xy_find (sint16 &x, sint16 &y) 1276maptile::xy_find (sint16 &x, sint16 &y)
1310{ 1277{
1311 if (x < 0) 1278 if (x < 0)
1312 { 1279 {
1313 if (!tile_available (3, 1)) 1280 if (!tile_available (3))
1314 return 0; 1281 return 0;
1315 1282
1316 x += tile_map[3]->width; 1283 x += tile_map[3]->width;
1317 return tile_map[3]->xy_find (x, y); 1284 return tile_map[3]->xy_find (x, y);
1318 } 1285 }
1319 1286
1320 if (x >= width) 1287 if (x >= width)
1321 { 1288 {
1322 if (!tile_available (1, 1)) 1289 if (!tile_available (1))
1323 return 0; 1290 return 0;
1324 1291
1325 x -= width; 1292 x -= width;
1326 return tile_map[1]->xy_find (x, y); 1293 return tile_map[1]->xy_find (x, y);
1327 } 1294 }
1328 1295
1329 if (y < 0) 1296 if (y < 0)
1330 { 1297 {
1331 if (!tile_available (0, 1)) 1298 if (!tile_available (0))
1332 return 0; 1299 return 0;
1333 1300
1334 y += tile_map[0]->height; 1301 y += tile_map[0]->height;
1335 return tile_map[0]->xy_find (x, y); 1302 return tile_map[0]->xy_find (x, y);
1336 } 1303 }
1337 1304
1338 if (y >= height) 1305 if (y >= height)
1339 { 1306 {
1340 if (!tile_available (2, 1)) 1307 if (!tile_available (2))
1341 return 0; 1308 return 0;
1342 1309
1343 y -= height; 1310 y -= height;
1344 return tile_map[2]->xy_find (x, y); 1311 return tile_map[2]->xy_find (x, y);
1345 } 1312 }
… …
1358adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1325adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1359{ 1326{
1360 if (!map1 || !map2) 1327 if (!map1 || !map2)
1361 return 0; 1328 return 0;
1362 1329
1363 //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
1364 //fix: compare paths instead (this is likely faster, too!) 1331 //fix: compare paths instead (this is likely faster, too!)
1365 if (map1 == map2) 1332 if (map1 == map2)
1366 { 1333 {
1367 *dx = 0; 1334 *dx = 0;
1368 *dy = 0; 1335 *dy = 0;
… …
1629{ 1596{
1630 if (!sound) 1597 if (!sound)
1631 return; 1598 return;
1632 1599
1633 for_all_players (pl) 1600 for_all_players (pl)
1634 if (pl->ob->map == this) 1601 if (pl->observe->map == this)
1635 if (client *ns = pl->ns) 1602 if (client *ns = pl->ns)
1636 { 1603 {
1637 int dx = x - pl->ob->x; 1604 int dx = x - pl->ob->x;
1638 int dy = y - pl->ob->y; 1605 int dy = y - pl->ob->y;
1639 1606

Diff Legend

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