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.115 by root, Wed Aug 1 01:53:13 2007 UTC vs.
Revision 1.128 by root, Sun Sep 9 06:25:45 2007 UTC

… …
355} 355}
356 356
357void 357void
358maptile::activate () 358maptile::activate ()
359{ 359{
360 active = true;
361
362 if (spaces) 360 if (spaces)
363 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 361 for (mapspace *ms = spaces + size (); ms-- > spaces; )
364 for (object *op = ms->bot; op; op = op->above) 362 for (object *op = ms->bot; op; op = op->above)
365 op->activate_recursive (); 363 op->activate_recursive ();
366} 364}
367 365
368void 366void
369maptile::deactivate () 367maptile::deactivate ()
370{ 368{
371 active = false;
372
373 if (spaces) 369 if (spaces)
374 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
375 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
376 op->deactivate_recursive (); 372 op->deactivate_recursive ();
377} 373}
… …
387 if (!spaces) 383 if (!spaces)
388 return false; 384 return false;
389 385
390 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
391 { 387 {
392 int unique = 0; 388 bool unique = 0;
389
393 for (object *op = spaces [i].bot; op; op = op->above) 390 for (object *op = spaces [i].bot; op; op = op->above)
394 { 391 {
395 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 392 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
396 unique = 1;
397 393
398 if (!op->can_map_save ()) 394 if (expect_false (!op->can_map_save ()))
399 continue; 395 continue;
400 396
401 if (unique || op->flag [FLAG_UNIQUE]) 397 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
402 { 398 {
403 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
404 op->write (f); 400 op->write (f);
405 } 401 }
406 else if (flags & IO_OBJECTS) 402 else if (expect_true (flags & IO_OBJECTS))
407 op->write (f); 403 op->write (f);
408 } 404 }
409 } 405 }
410 406
411 coroapi::cede_to_tick (); 407 coroapi::cede_to_tick ();
412 408
413 return true; 409 return true;
414}
415
416bool
417maptile::_load_objects (const char *path, bool skip_header)
418{
419 object_thawer f (path);
420
421 if (!f)
422 return false;
423
424 f.next ();
425
426 if (skip_header)
427 for (;;)
428 {
429 keyword kw = f.kw;
430 f.skip ();
431 if (kw == KW_end)
432 break;
433 }
434
435 return _load_objects (f);
436} 410}
437 411
438bool 412bool
439maptile::_save_objects (const char *path, int flags) 413maptile::_save_objects (const char *path, int flags)
440{ 414{
… …
615bool 589bool
616maptile::_load_header (object_thawer &thawer) 590maptile::_load_header (object_thawer &thawer)
617{ 591{
618 for (;;) 592 for (;;)
619 { 593 {
620 thawer.next ();
621
622 switch (thawer.kw) 594 switch (thawer.kw)
623 { 595 {
624 case KW_msg: 596 case KW_msg:
625 thawer.get_ml (KW_endmsg, msg); 597 thawer.get_ml (KW_endmsg, msg);
626 break; 598 break;
… …
681 case KW_tile_path_2: thawer.get (tile_path [1]); break; 653 case KW_tile_path_2: thawer.get (tile_path [1]); break;
682 case KW_tile_path_3: thawer.get (tile_path [2]); break; 654 case KW_tile_path_3: thawer.get (tile_path [2]); break;
683 case KW_tile_path_4: thawer.get (tile_path [3]); break; 655 case KW_tile_path_4: thawer.get (tile_path [3]); break;
684 656
685 case KW_ERROR: 657 case KW_ERROR:
686 set_key (thawer.kw_str, thawer.value); 658 set_key_text (thawer.kw_str, thawer.value);
687 break; 659 break;
688 660
689 case KW_end: 661 case KW_end:
662 thawer.next ();
690 return true; 663 return true;
691 664
692 default: 665 default:
693 if (!thawer.parse_error ("map", 0)) 666 if (!thawer.parse_error ("map", 0))
694 return false; 667 return false;
695 break; 668 break;
696 } 669 }
670
671 thawer.next ();
697 } 672 }
698 673
699 abort (); 674 abort ();
700}
701
702bool
703maptile::_load_header (const char *path)
704{
705 object_thawer thawer (path);
706
707 if (!thawer)
708 return false;
709
710 return _load_header (thawer);
711} 675}
712 676
713/****************************************************************************** 677/******************************************************************************
714 * This is the start of unique map handling code 678 * This is the start of unique map handling code
715 *****************************************************************************/ 679 *****************************************************************************/
… …
814 * Remove and free all objects in the given map. 778 * Remove and free all objects in the given map.
815 */ 779 */
816void 780void
817maptile::clear () 781maptile::clear ()
818{ 782{
819 sfree (regions, size ()); regions = 0;
820 delete [] regionmap; regionmap = 0;
821
822 if (spaces) 783 if (spaces)
823 { 784 {
824 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 785 for (mapspace *ms = spaces + size (); ms-- > spaces; )
825 while (object *op = ms->bot) 786 while (object *op = ms->bot)
826 { 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
827 op = op->head_ (); 794 object *head = op->head_ ();
795 if (op == head)
796 {
828 op->destroy_inv (false); 797 op->destroy_inv (false);
829 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 }
830 } 805 }
831 806
832 sfree (spaces, size ()), spaces = 0; 807 sfree (spaces, size ()), spaces = 0;
833 } 808 }
834 809
835 if (buttons) 810 if (buttons)
836 free_objectlinkpt (buttons), buttons = 0; 811 free_objectlinkpt (buttons), buttons = 0;
812
813 sfree (regions, size ()); regions = 0;
814 delete [] regionmap; regionmap = 0;
837} 815}
838 816
839void 817void
840maptile::clear_header () 818maptile::clear_header ()
841{ 819{
… …
893 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))
894 break; 872 break;
895 873
896 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 874 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
897 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 875 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
898 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
899 || QUERY_FLAG (op, FLAG_UNIQUE) 876 || QUERY_FLAG (op, FLAG_UNIQUE)
900 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 877 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
901 || QUERY_FLAG (op, FLAG_UNPAID) 878 || QUERY_FLAG (op, FLAG_UNPAID)
902 || op->is_alive ()) 879 || op->is_alive ())
903 ; // do not decay 880 ; // do not decay
… …
1228 vol += op->volume (); 1205 vol += op->volume ();
1229 1206
1230 return vol; 1207 return vol;
1231} 1208}
1232 1209
1233/* this updates the orig_map->tile_map[tile_num] value after finding 1210bool
1234 * the map. It also takes care of linking back the freshly found 1211maptile::tile_available (int dir, bool load)
1235 * maps tile_map values if it tiles back to this one. It returns
1236 * the value of orig_map->tile_map[tile_num].
1237 */
1238static inline maptile *
1239find_and_link (maptile *orig_map, int tile_num)
1240{ 1212{
1241 maptile *mp = orig_map->tile_map [tile_num]; 1213 if (!tile_path[dir])
1214 return 0;
1242 1215
1243 if (!mp) 1216 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1244 { 1217 return 1;
1245 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1246 1218
1247 if (!mp) 1219 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1248 { 1220 return 1;
1249 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1250 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1251 &orig_map->tile_path[tile_num], &orig_map->path);
1252 mp = new maptile (1, 1);
1253 mp->alloc ();
1254 mp->in_memory = MAP_IN_MEMORY;
1255 }
1256 }
1257 1221
1258 int dest_tile = (tile_num + 2) % 4;
1259
1260 orig_map->tile_map [tile_num] = mp;
1261
1262 // optimisation: back-link map to origin map if euclidean
1263 //TODO: non-euclidean maps MUST GO
1264 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1265 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1266
1267 return mp; 1222 return 0;
1268}
1269
1270static inline void
1271load_and_link (maptile *orig_map, int tile_num)
1272{
1273 find_and_link (orig_map, tile_num)->load_sync ();
1274} 1223}
1275 1224
1276/* this returns TRUE if the coordinates (x,y) are out of 1225/* this returns TRUE if the coordinates (x,y) are out of
1277 * map m. This function also takes into account any 1226 * map m. This function also takes into account any
1278 * tiling considerations, loading adjacant maps as needed. 1227 * tiling considerations, loading adjacant maps as needed.
… …
1291 if (!m) 1240 if (!m)
1292 return 0; 1241 return 0;
1293 1242
1294 if (x < 0) 1243 if (x < 0)
1295 { 1244 {
1296 if (!m->tile_path[3]) 1245 if (!m->tile_available (3))
1297 return 1; 1246 return 1;
1298 1247
1299 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1300 find_and_link (m, 3);
1301
1302 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);
1303 } 1249 }
1304 1250
1305 if (x >= m->width) 1251 if (x >= m->width)
1306 { 1252 {
1307 if (!m->tile_path[1]) 1253 if (!m->tile_available (1))
1308 return 1; 1254 return 1;
1309 1255
1310 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1311 find_and_link (m, 1);
1312
1313 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);
1314 } 1257 }
1315 1258
1316 if (y < 0) 1259 if (y < 0)
1317 { 1260 {
1318 if (!m->tile_path[0]) 1261 if (!m->tile_available (0))
1319 return 1; 1262 return 1;
1320 1263
1321 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1322 find_and_link (m, 0);
1323
1324 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);
1325 } 1265 }
1326 1266
1327 if (y >= m->height) 1267 if (y >= m->height)
1328 { 1268 {
1329 if (!m->tile_path[2]) 1269 if (!m->tile_available (2))
1330 return 1; 1270 return 1;
1331
1332 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1333 find_and_link (m, 2);
1334 1271
1335 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);
1336 } 1273 }
1337 1274
1338 /* Simple case - coordinates are within this local 1275 /* Simple case - coordinates are within this local
… …
1352maptile * 1289maptile *
1353maptile::xy_find (sint16 &x, sint16 &y) 1290maptile::xy_find (sint16 &x, sint16 &y)
1354{ 1291{
1355 if (x < 0) 1292 if (x < 0)
1356 { 1293 {
1357 if (!tile_path[3]) 1294 if (!tile_available (3))
1358 return 0; 1295 return 0;
1359 1296
1360 find_and_link (this, 3);
1361 x += tile_map[3]->width; 1297 x += tile_map[3]->width;
1362 return tile_map[3]->xy_find (x, y); 1298 return tile_map[3]->xy_find (x, y);
1363 } 1299 }
1364 1300
1365 if (x >= width) 1301 if (x >= width)
1366 { 1302 {
1367 if (!tile_path[1]) 1303 if (!tile_available (1))
1368 return 0; 1304 return 0;
1369 1305
1370 find_and_link (this, 1);
1371 x -= width; 1306 x -= width;
1372 return tile_map[1]->xy_find (x, y); 1307 return tile_map[1]->xy_find (x, y);
1373 } 1308 }
1374 1309
1375 if (y < 0) 1310 if (y < 0)
1376 { 1311 {
1377 if (!tile_path[0]) 1312 if (!tile_available (0))
1378 return 0; 1313 return 0;
1379 1314
1380 find_and_link (this, 0);
1381 y += tile_map[0]->height; 1315 y += tile_map[0]->height;
1382 return tile_map[0]->xy_find (x, y); 1316 return tile_map[0]->xy_find (x, y);
1383 } 1317 }
1384 1318
1385 if (y >= height) 1319 if (y >= height)
1386 { 1320 {
1387 if (!tile_path[2]) 1321 if (!tile_available (2))
1388 return 0; 1322 return 0;
1389 1323
1390 find_and_link (this, 2);
1391 y -= height; 1324 y -= height;
1392 return tile_map[2]->xy_find (x, y); 1325 return tile_map[2]->xy_find (x, y);
1393 } 1326 }
1394 1327
1395 /* Simple case - coordinates are within this local 1328 /* Simple case - coordinates are within this local
… …
1406adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1339adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1407{ 1340{
1408 if (!map1 || !map2) 1341 if (!map1 || !map2)
1409 return 0; 1342 return 0;
1410 1343
1411 //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
1412 //fix: compare paths instead (this is likely faster, too!) 1345 //fix: compare paths instead (this is likely faster, too!)
1413 if (map1 == map2) 1346 if (map1 == map2)
1414 { 1347 {
1415 *dx = 0; 1348 *dx = 0;
1416 *dy = 0; 1349 *dy = 0;
… …
1677{ 1610{
1678 if (!sound) 1611 if (!sound)
1679 return; 1612 return;
1680 1613
1681 for_all_players (pl) 1614 for_all_players (pl)
1682 if (pl->ob->map == this) 1615 if (pl->observe->map == this)
1683 if (client *ns = pl->ns) 1616 if (client *ns = pl->ns)
1684 { 1617 {
1685 int dx = x - pl->ob->x; 1618 int dx = x - pl->observe->x;
1686 int dy = y - pl->ob->y; 1619 int dy = y - pl->observe->y;
1687 1620
1688 int distance = idistance (dx, dy); 1621 int distance = idistance (dx, dy);
1689 1622
1690 if (distance <= MAX_SOUND_DISTANCE) 1623 if (distance <= MAX_SOUND_DISTANCE)
1691 ns->play_sound (sound, dx, dy); 1624 ns->play_sound (sound, dx, dy);

Diff Legend

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