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.199 by root, Tue May 4 22:26:49 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
… …
311 case KW_arch: 311 case KW_arch:
312 if (object *op = object::read (f, this)) 312 if (object *op = object::read (f, this))
313 { 313 {
314 // TODO: why? 314 // TODO: why?
315 if (op->inv) 315 if (op->inv)
316 {
317 op->carrying = 0;
316 op->update_weight (); 318 op->update_weight ();
319 }
317 320
318 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
319 { 322 {
320 // we insert manually because 323 // we insert manually because
321 // a) its way faster 324 // a) its way faster
… …
358} 361}
359 362
360void 363void
361maptile::activate () 364maptile::activate ()
362{ 365{
363 if (spaces) 366 if (state != MAP_INACTIVE)
367 return;
368
364 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 369 for (mapspace *ms = spaces + size (); ms-- > spaces; )
365 for (object *op = ms->bot; op; op = op->above) 370 for (object *op = ms->bot; op; op = op->above)
366 op->activate_recursive (); 371 op->activate_recursive ();
372
373 state = MAP_ACTIVE;
367} 374}
368 375
369void 376void
370maptile::deactivate () 377maptile::deactivate ()
371{ 378{
372 if (spaces) 379 if (state != MAP_ACTIVE)
380 return;
381
373 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
374 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
375 op->deactivate_recursive (); 384 op->deactivate_recursive ();
385
386 state = MAP_INACTIVE;
376} 387}
377 388
378bool 389bool
379maptile::_save_objects (object_freezer &f, int flags) 390maptile::_save_objects (object_freezer &f, int flags)
380{ 391{
… …
424} 435}
425 436
426void 437void
427maptile::init () 438maptile::init ()
428{ 439{
429 in_memory = MAP_SWAPPED; 440 state = MAP_SWAPPED;
430 441
431 /* 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
432 * map archetype. Mimic that behaviour. 443 * map archetype. Mimic that behaviour.
433 */ 444 */
434 width = 16; 445 width = 16;
… …
611 { 622 {
612 case KW_msg: 623 case KW_msg:
613 thawer.get_ml (KW_endmsg, msg); 624 thawer.get_ml (KW_endmsg, msg);
614 break; 625 break;
615 626
616 case KW_lore: // CF+ extension 627 case KW_lore: // deliantra extension
617 thawer.get_ml (KW_endlore, maplore); 628 thawer.get_ml (KW_endlore, maplore);
618 break; 629 break;
619 630
620 case KW_maplore: 631 case KW_maplore:
621 thawer.get_ml (KW_endmaplore, maplore); 632 thawer.get_ml (KW_endmaplore, maplore);
… …
662 673
663 case KW_tile_path_1: thawer.get (tile_path [0]); break; 674 case KW_tile_path_1: thawer.get (tile_path [0]); break;
664 case KW_tile_path_2: thawer.get (tile_path [1]); break; 675 case KW_tile_path_2: thawer.get (tile_path [1]); break;
665 case KW_tile_path_3: thawer.get (tile_path [2]); break; 676 case KW_tile_path_3: thawer.get (tile_path [2]); break;
666 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;
667 680
668 case KW_ERROR: 681 case KW_ERROR:
669 set_key_text (thawer.kw_str, thawer.value); 682 set_key_text (thawer.kw_str, thawer.value);
670 break; 683 break;
671 684
… …
754 767
755 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]);
756 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]);
757 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]);
758 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]);
759 774
760 freezer.put (this); 775 freezer.put (this);
761 freezer.put (KW(end)); 776 freezer.put (KW(end));
762 777
763 return true; 778 return true;
… …
820 msg = 0; 835 msg = 0;
821 maplore = 0; 836 maplore = 0;
822 shoprace = 0; 837 shoprace = 0;
823 delete [] shopitems, shopitems = 0; 838 delete [] shopitems, shopitems = 0;
824 839
825 for (int i = 0; i < 4; i++) 840 for (int i = 0; i < TILE_NUM; i++)
826 tile_path [i] = 0; 841 tile_path [i] = 0;
827} 842}
828 843
829maptile::~maptile () 844maptile::~maptile ()
830{ 845{
… …
837 /* 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
838 * are pointing at this one for tiling information. Since 853 * are pointing at this one for tiling information. Since
839 * 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
840 * maps this map tiles with and clears those. 855 * maps this map tiles with and clears those.
841 */ 856 */
842 for (int i = 0; i < 4; i++) 857 for (int i = 0; i < TILE_NUM; i++)
843 if (tile_map[i] == m) 858 if (tile_map[i] == m)
844 tile_map[i] = 0; 859 tile_map[i] = 0;
845} 860}
846 861
847void 862void
… …
1190maptile * 1205maptile *
1191maptile::tile_available (int dir, bool load) 1206maptile::tile_available (int dir, bool load)
1192{ 1207{
1193 if (tile_path[dir]) 1208 if (tile_path[dir])
1194 { 1209 {
1210 // map is there and we don't need to load it OR it's loaded => return what we have
1195 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1211 if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
1196 return tile_map[dir]; 1212 return tile_map[dir];
1197 1213
1214 // well, try to locate it then, if possible - maybe it's there already
1198 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1215 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1199 return tile_map[dir]; 1216 return tile_map[dir];
1200 } 1217 }
1201 1218
1202 return 0; 1219 return 0;
… …
1326 if (map1 == map2) 1343 if (map1 == map2)
1327 { 1344 {
1328 *dx = 0; 1345 *dx = 0;
1329 *dy = 0; 1346 *dy = 0;
1330 } 1347 }
1331 else if (map1->tile_available (0, false) == map2) 1348 else if (map1->tile_available (TILE_NORTH, false) == map2)
1332 { /* up */ 1349 {
1333 *dx = 0; 1350 *dx = 0;
1334 *dy = -map2->height; 1351 *dy = -map2->height;
1335 } 1352 }
1336 else if (map1->tile_available (1, false) == map2) 1353 else if (map1->tile_available (TILE_EAST , false) == map2)
1337 { /* right */ 1354 {
1338 *dx = map1->width; 1355 *dx = map1->width;
1339 *dy = 0; 1356 *dy = 0;
1340 } 1357 }
1341 else if (map1->tile_available (2, false) == map2) 1358 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1342 { /* down */ 1359 {
1343 *dx = 0; 1360 *dx = 0;
1344 *dy = map1->height; 1361 *dy = map1->height;
1345 } 1362 }
1346 else if (map1->tile_available (3, false) == map2) 1363 else if (map1->tile_available (TILE_WEST , false) == map2)
1347 { /* left */ 1364 {
1348 *dx = -map2->width; 1365 *dx = -map2->width;
1349 *dy = 0; 1366 *dy = 0;
1350 } 1367 }
1351 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)
1352 { /* up right */ 1369 { /* up right */
1353 *dx = map1->tile_map[0]->width; 1370 *dx = +map1->tile_map[TILE_NORTH]->width;
1354 *dy = -map1->tile_map[0]->height; 1371 *dy = -map1->tile_map[TILE_NORTH]->height;
1355 } 1372 }
1356 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)
1357 { /* up left */ 1374 { /* up left */
1358 *dx = -map2->width; 1375 *dx = -map2->width;
1359 *dy = -map1->tile_map[0]->height; 1376 *dy = -map1->tile_map[TILE_NORTH]->height;
1360 } 1377 }
1361 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)
1362 { /* right up */ 1379 { /* right up */
1363 *dx = map1->width; 1380 *dx = +map1->width;
1364 *dy = -map2->height; 1381 *dy = -map2->height;
1365 } 1382 }
1366 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)
1367 { /* right down */ 1384 { /* right down */
1368 *dx = map1->width; 1385 *dx = +map1->width;
1369 *dy = map1->tile_map[1]->height; 1386 *dy = +map1->tile_map[TILE_EAST]->height;
1370 } 1387 }
1371 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)
1372 { /* down right */ 1389 { /* down right */
1373 *dx = map1->tile_map[2]->width; 1390 *dx = +map1->tile_map[TILE_SOUTH]->width;
1374 *dy = map1->height; 1391 *dy = +map1->height;
1375 } 1392 }
1376 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)
1377 { /* down left */ 1394 { /* down left */
1378 *dx = -map2->width; 1395 *dx = -map2->width;
1379 *dy = map1->height; 1396 *dy = +map1->height;
1380 } 1397 }
1381 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)
1382 { /* left up */ 1399 { /* left up */
1383 *dx = -map1->tile_map[3]->width; 1400 *dx = -map1->tile_map[TILE_WEST]->width;
1384 *dy = -map2->height; 1401 *dy = -map2->height;
1385 } 1402 }
1386 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)
1387 { /* left down */ 1404 { /* left down */
1388 *dx = -map1->tile_map[3]->width; 1405 *dx = -map1->tile_map[TILE_WEST]->width;
1389 *dy = map1->tile_map[3]->height; 1406 *dy = +map1->tile_map[TILE_WEST]->height;
1390 } 1407 }
1391 else 1408 else
1392 return 0; 1409 return 0;
1393 1410
1394 return 1; 1411 return 1;
… …
1626split_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)
1627{ 1644{
1628 // clip to map to the left 1645 // clip to map to the left
1629 if (x0 < 0) 1646 if (x0 < 0)
1630 { 1647 {
1631 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1648 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1632 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);
1633 1650
1634 if (x1 < 0) // entirely to the left 1651 if (x1 < 0) // entirely to the left
1635 return; 1652 return;
1636 1653
… …
1638 } 1655 }
1639 1656
1640 // clip to map to the right 1657 // clip to map to the right
1641 if (x1 > m->width) 1658 if (x1 > m->width)
1642 { 1659 {
1643 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1660 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1644 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);
1645 1662
1646 if (x0 > m->width) // entirely to the right 1663 if (x0 > m->width) // entirely to the right
1647 return; 1664 return;
1648 1665
… …
1650 } 1667 }
1651 1668
1652 // clip to map above 1669 // clip to map above
1653 if (y0 < 0) 1670 if (y0 < 0)
1654 { 1671 {
1655 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1672 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1656 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);
1657 1674
1658 if (y1 < 0) // entirely above 1675 if (y1 < 0) // entirely above
1659 return; 1676 return;
1660 1677
… …
1662 } 1679 }
1663 1680
1664 // clip to map below 1681 // clip to map below
1665 if (y1 > m->height) 1682 if (y1 > m->height)
1666 { 1683 {
1667 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1684 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1668 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);
1669 1686
1670 if (y0 > m->height) // entirely below 1687 if (y0 > m->height) // entirely below
1671 return; 1688 return;
1672 1689

Diff Legend

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