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.201 by root, Sat Jul 10 21:07:47 2010 UTC vs.
Revision 1.206 by root, Wed May 4 16:12:15 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
361} 361}
362 362
363void 363void
364maptile::activate () 364maptile::activate ()
365{ 365{
366 if (spaces) 366 if (state != MAP_INACTIVE)
367 return;
368
367 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 369 for (mapspace *ms = spaces + size (); ms-- > spaces; )
368 for (object *op = ms->bot; op; op = op->above) 370 for (object *op = ms->bot; op; op = op->above)
369 op->activate_recursive (); 371 op->activate_recursive ();
372
373 state = MAP_ACTIVE;
370} 374}
371 375
372void 376void
373maptile::deactivate () 377maptile::deactivate ()
374{ 378{
375 if (spaces) 379 if (state != MAP_ACTIVE)
380 return;
381
376 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
377 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
378 op->deactivate_recursive (); 384 op->deactivate_recursive ();
385
386 state = MAP_INACTIVE;
379} 387}
380 388
381bool 389bool
382maptile::_save_objects (object_freezer &f, int flags) 390maptile::_save_objects (object_freezer &f, int flags)
383{ 391{
… …
427} 435}
428 436
429void 437void
430maptile::init () 438maptile::init ()
431{ 439{
432 in_memory = MAP_SWAPPED; 440 state = MAP_SWAPPED;
433 441
434 /* The maps used to pick up default x and y values from the 442 /* The maps used to pick up default x and y values from the
435 * map archetype. Mimic that behaviour. 443 * map archetype. Mimic that behaviour.
436 */ 444 */
437 width = 16; 445 width = 16;
… …
665 673
666 case KW_tile_path_1: thawer.get (tile_path [0]); break; 674 case KW_tile_path_1: thawer.get (tile_path [0]); break;
667 case KW_tile_path_2: thawer.get (tile_path [1]); break; 675 case KW_tile_path_2: thawer.get (tile_path [1]); break;
668 case KW_tile_path_3: thawer.get (tile_path [2]); break; 676 case KW_tile_path_3: thawer.get (tile_path [2]); break;
669 case KW_tile_path_4: thawer.get (tile_path [3]); break; 677 case KW_tile_path_4: thawer.get (tile_path [3]); break;
678 case KW_tile_path_5: thawer.get (tile_path [4]); break;
679 case KW_tile_path_6: thawer.get (tile_path [5]); break;
670 680
671 case KW_ERROR: 681 case KW_ERROR:
672 set_key_text (thawer.kw_str, thawer.value); 682 set_key_text (thawer.kw_str, thawer.value);
673 break; 683 break;
674 684
… …
757 767
758 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 768 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
759 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 769 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
760 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 770 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
761 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 771 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
772 if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
773 if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
762 774
763 freezer.put (this); 775 freezer.put (this);
764 freezer.put (KW(end)); 776 freezer.put (KW(end));
765 777
766 return true; 778 return true;
… …
823 msg = 0; 835 msg = 0;
824 maplore = 0; 836 maplore = 0;
825 shoprace = 0; 837 shoprace = 0;
826 delete [] shopitems, shopitems = 0; 838 delete [] shopitems, shopitems = 0;
827 839
828 for (int i = 0; i < 4; i++) 840 for (int i = 0; i < TILE_NUM; i++)
829 tile_path [i] = 0; 841 tile_path [i] = 0;
830} 842}
831 843
832maptile::~maptile () 844maptile::~maptile ()
833{ 845{
… …
840 /* We need to look through all the maps and see if any maps 852 /* We need to look through all the maps and see if any maps
841 * are pointing at this one for tiling information. Since 853 * are pointing at this one for tiling information. Since
842 * tiling can be asymetric, we just can not look to see which 854 * tiling can be asymetric, we just can not look to see which
843 * maps this map tiles with and clears those. 855 * maps this map tiles with and clears those.
844 */ 856 */
845 for (int i = 0; i < 4; i++) 857 for (int i = 0; i < TILE_NUM; i++)
846 if (tile_map[i] == m) 858 if (tile_map[i] == m)
847 tile_map[i] = 0; 859 tile_map[i] = 0;
848} 860}
849 861
850void 862void
… …
1193maptile * 1205maptile *
1194maptile::tile_available (int dir, bool load) 1206maptile::tile_available (int dir, bool load)
1195{ 1207{
1196 if (tile_path[dir]) 1208 if (tile_path[dir])
1197 { 1209 {
1210 // map is there and we don't need to load it OR it's loaded => return what we have
1198 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1211 if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
1199 return tile_map[dir]; 1212 return tile_map[dir];
1200 1213
1214 // well, try to locate it then, if possible - maybe it's there already
1201 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1215 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1202 return tile_map[dir]; 1216 return tile_map[dir];
1203 } 1217 }
1204 1218
1205 return 0; 1219 return 0;
… …
1329 if (map1 == map2) 1343 if (map1 == map2)
1330 { 1344 {
1331 *dx = 0; 1345 *dx = 0;
1332 *dy = 0; 1346 *dy = 0;
1333 } 1347 }
1334 else if (map1->tile_available (0, false) == map2) 1348 else if (map1->tile_available (TILE_NORTH, false) == map2)
1335 { /* up */ 1349 {
1336 *dx = 0; 1350 *dx = 0;
1337 *dy = -map2->height; 1351 *dy = -map2->height;
1338 } 1352 }
1339 else if (map1->tile_available (1, false) == map2) 1353 else if (map1->tile_available (TILE_EAST , false) == map2)
1340 { /* right */ 1354 {
1341 *dx = map1->width; 1355 *dx = map1->width;
1342 *dy = 0; 1356 *dy = 0;
1343 } 1357 }
1344 else if (map1->tile_available (2, false) == map2) 1358 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1345 { /* down */ 1359 {
1346 *dx = 0; 1360 *dx = 0;
1347 *dy = map1->height; 1361 *dy = map1->height;
1348 } 1362 }
1349 else if (map1->tile_available (3, false) == map2) 1363 else if (map1->tile_available (TILE_WEST , false) == map2)
1350 { /* left */ 1364 {
1351 *dx = -map2->width; 1365 *dx = -map2->width;
1352 *dy = 0; 1366 *dy = 0;
1353 } 1367 }
1354 else if (map1->tile_map[0] && map1->tile_map[0]->tile_available (1, false) == map2) 1368 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1355 { /* up right */ 1369 { /* up right */
1356 *dx = map1->tile_map[0]->width; 1370 *dx = +map1->tile_map[TILE_NORTH]->width;
1357 *dy = -map1->tile_map[0]->height; 1371 *dy = -map1->tile_map[TILE_NORTH]->height;
1358 } 1372 }
1359 else if (map1->tile_map[0] && map1->tile_map[0]->tile_available (3, false) == map2) 1373 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1360 { /* up left */ 1374 { /* up left */
1361 *dx = -map2->width; 1375 *dx = -map2->width;
1362 *dy = -map1->tile_map[0]->height; 1376 *dy = -map1->tile_map[TILE_NORTH]->height;
1363 } 1377 }
1364 else if (map1->tile_map[1] && map1->tile_map[1]->tile_available (0, false) == map2) 1378 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1365 { /* right up */ 1379 { /* right up */
1366 *dx = map1->width; 1380 *dx = +map1->width;
1367 *dy = -map2->height; 1381 *dy = -map2->height;
1368 } 1382 }
1369 else if (map1->tile_map[1] && map1->tile_map[1]->tile_available (2, false) == map2) 1383 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1370 { /* right down */ 1384 { /* right down */
1371 *dx = map1->width; 1385 *dx = +map1->width;
1372 *dy = map1->tile_map[1]->height; 1386 *dy = +map1->tile_map[TILE_EAST]->height;
1373 } 1387 }
1374 else if (map1->tile_map[2] && map1->tile_map[2]->tile_available (1, false) == map2) 1388 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1375 { /* down right */ 1389 { /* down right */
1376 *dx = map1->tile_map[2]->width; 1390 *dx = +map1->tile_map[TILE_SOUTH]->width;
1377 *dy = map1->height; 1391 *dy = +map1->height;
1378 } 1392 }
1379 else if (map1->tile_map[2] && map1->tile_map[2]->tile_available (3, false) == map2) 1393 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1380 { /* down left */ 1394 { /* down left */
1381 *dx = -map2->width; 1395 *dx = -map2->width;
1382 *dy = map1->height; 1396 *dy = +map1->height;
1383 } 1397 }
1384 else if (map1->tile_map[3] && map1->tile_map[3]->tile_available (0, false) == map2) 1398 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1385 { /* left up */ 1399 { /* left up */
1386 *dx = -map1->tile_map[3]->width; 1400 *dx = -map1->tile_map[TILE_WEST]->width;
1387 *dy = -map2->height; 1401 *dy = -map2->height;
1388 } 1402 }
1389 else if (map1->tile_map[3] && map1->tile_map[3]->tile_available (2, false) == map2) 1403 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1390 { /* left down */ 1404 { /* left down */
1391 *dx = -map1->tile_map[3]->width; 1405 *dx = -map1->tile_map[TILE_WEST]->width;
1392 *dy = map1->tile_map[3]->height; 1406 *dy = +map1->tile_map[TILE_WEST]->height;
1393 } 1407 }
1394 else 1408 else
1395 return 0; 1409 return 0;
1396 1410
1397 return 1; 1411 return 1;
… …
1629split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1643split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1630{ 1644{
1631 // clip to map to the left 1645 // clip to map to the left
1632 if (x0 < 0) 1646 if (x0 < 0)
1633 { 1647 {
1634 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1648 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1635 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1649 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1636 1650
1637 if (x1 < 0) // entirely to the left 1651 if (x1 < 0) // entirely to the left
1638 return; 1652 return;
1639 1653
… …
1641 } 1655 }
1642 1656
1643 // clip to map to the right 1657 // clip to map to the right
1644 if (x1 > m->width) 1658 if (x1 > m->width)
1645 { 1659 {
1646 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1660 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1647 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1661 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1648 1662
1649 if (x0 > m->width) // entirely to the right 1663 if (x0 > m->width) // entirely to the right
1650 return; 1664 return;
1651 1665
… …
1653 } 1667 }
1654 1668
1655 // clip to map above 1669 // clip to map above
1656 if (y0 < 0) 1670 if (y0 < 0)
1657 { 1671 {
1658 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1672 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1659 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1673 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1660 1674
1661 if (y1 < 0) // entirely above 1675 if (y1 < 0) // entirely above
1662 return; 1676 return;
1663 1677
… …
1665 } 1679 }
1666 1680
1667 // clip to map below 1681 // clip to map below
1668 if (y1 > m->height) 1682 if (y1 > m->height)
1669 { 1683 {
1670 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1684 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1671 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1685 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1672 1686
1673 if (y0 > m->height) // entirely below 1687 if (y0 > m->height) // entirely below
1674 return; 1688 return;
1675 1689

Diff Legend

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