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.194 by root, Wed Apr 21 06:29:42 2010 UTC vs.
Revision 1.203 by root, Sat Apr 23 04:56:46 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
… …
90 90
91 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
92 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
93 * things we need to do for players. 93 * things we need to do for players.
94 */ 94 */
95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
96 return 0; 96 return 0;
97 97
98 /* if there isn't anything alive on this space, and this space isn't 98 /* if there isn't anything alive on this space, and this space isn't
99 * otherwise blocked, we can return now. Only if there is a living 99 * otherwise blocked, we can return now. Only if there is a living
100 * creature do we need to investigate if it is part of this creature 100 * creature do we need to investigate if it is part of this creature
… …
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
… …
559 * the map (or something equivilent) into output_string. */ 562 * the map (or something equivilent) into output_string. */
560static const char * 563static const char *
561print_shop_string (maptile *m) 564print_shop_string (maptile *m)
562{ 565{
563 static dynbuf_text buf; buf.clear (); 566 static dynbuf_text buf; buf.clear ();
567 bool first = true;
564 568
565 for (int i = 0; i < m->shopitems[0].index; i++) 569 for (int i = 0; i < m->shopitems[0].index; i++)
566 { 570 {
571 if (!first)
572 buf << ';';
573
574 first = false;
575
567 if (m->shopitems[i].typenum) 576 if (m->shopitems[i].typenum)
568 { 577 {
569 if (m->shopitems[i].strength) 578 if (m->shopitems[i].strength)
570 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 579 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
571 else 580 else
572 buf.printf ("%s;", m->shopitems[i].name); 581 buf.printf ("%s", m->shopitems[i].name);
573 } 582 }
574 else 583 else
575 { 584 {
576 if (m->shopitems[i].strength) 585 if (m->shopitems[i].strength)
577 buf.printf ("*:%d;", m->shopitems[i].strength); 586 buf.printf ("*:%d", m->shopitems[i].strength);
578 else 587 else
579 buf.printf ("*"); 588 buf.printf ("*");
580 } 589 }
581 } 590 }
582 591
… …
605 { 614 {
606 case KW_msg: 615 case KW_msg:
607 thawer.get_ml (KW_endmsg, msg); 616 thawer.get_ml (KW_endmsg, msg);
608 break; 617 break;
609 618
610 case KW_lore: // CF+ extension 619 case KW_lore: // deliantra extension
611 thawer.get_ml (KW_endlore, maplore); 620 thawer.get_ml (KW_endlore, maplore);
612 break; 621 break;
613 622
614 case KW_maplore: 623 case KW_maplore:
615 thawer.get_ml (KW_endmaplore, maplore); 624 thawer.get_ml (KW_endmaplore, maplore);
… …
638 case KW_per_player: thawer.get (per_player); break; 647 case KW_per_player: thawer.get (per_player); break;
639 case KW_per_party: thawer.get (per_party); break; 648 case KW_per_party: thawer.get (per_party); break;
640 case KW_no_reset: thawer.get (no_reset); break; 649 case KW_no_reset: thawer.get (no_reset); break;
641 case KW_no_drop: thawer.get (no_drop); break; 650 case KW_no_drop: thawer.get (no_drop); break;
642 651
643 case KW_region: default_region = region::find (thawer.get_str ()); break; 652 case KW_region: thawer.get (default_region); break;
644 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 653 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
645 654
646 // old names new names 655 // old names new names
647 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 656 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
648 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 657 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
656 665
657 case KW_tile_path_1: thawer.get (tile_path [0]); break; 666 case KW_tile_path_1: thawer.get (tile_path [0]); break;
658 case KW_tile_path_2: thawer.get (tile_path [1]); break; 667 case KW_tile_path_2: thawer.get (tile_path [1]); break;
659 case KW_tile_path_3: thawer.get (tile_path [2]); break; 668 case KW_tile_path_3: thawer.get (tile_path [2]); break;
660 case KW_tile_path_4: thawer.get (tile_path [3]); break; 669 case KW_tile_path_4: thawer.get (tile_path [3]); break;
670 case KW_tile_path_5: thawer.get (tile_path [4]); break;
671 case KW_tile_path_6: thawer.get (tile_path [5]); break;
661 672
662 case KW_ERROR: 673 case KW_ERROR:
663 set_key_text (thawer.kw_str, thawer.value); 674 set_key_text (thawer.kw_str, thawer.value);
664 break; 675 break;
665 676
… …
748 759
749 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 760 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
750 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 761 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
751 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 762 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
752 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 763 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
764 if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
765 if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
753 766
754 freezer.put (this); 767 freezer.put (this);
755 freezer.put (KW(end)); 768 freezer.put (KW(end));
756 769
757 return true; 770 return true;
… …
814 msg = 0; 827 msg = 0;
815 maplore = 0; 828 maplore = 0;
816 shoprace = 0; 829 shoprace = 0;
817 delete [] shopitems, shopitems = 0; 830 delete [] shopitems, shopitems = 0;
818 831
819 for (int i = 0; i < 4; i++) 832 for (int i = 0; i < TILE_NUM; i++)
820 tile_path [i] = 0; 833 tile_path [i] = 0;
821} 834}
822 835
823maptile::~maptile () 836maptile::~maptile ()
824{ 837{
… …
1184maptile * 1197maptile *
1185maptile::tile_available (int dir, bool load) 1198maptile::tile_available (int dir, bool load)
1186{ 1199{
1187 if (tile_path[dir]) 1200 if (tile_path[dir])
1188 { 1201 {
1202 // map is there and we don't need to load it OR it's loaded => return what we have
1189 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1203 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1190 return tile_map[dir]; 1204 return tile_map[dir];
1191 1205
1206 // well, try to locate it then, if possible - maybe it's there already
1192 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1207 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1193 return tile_map[dir]; 1208 return tile_map[dir];
1194 } 1209 }
1195 1210
1196 return 0; 1211 return 0;
… …
1308/** 1323/**
1309 * Return whether map2 is adjacent to map1. If so, store the distance from 1324 * Return whether map2 is adjacent to map1. If so, store the distance from
1310 * map1 to map2 in dx/dy. 1325 * map1 to map2 in dx/dy.
1311 */ 1326 */
1312int 1327int
1313adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1328adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1314{ 1329{
1315 if (!map1 || !map2) 1330 if (!map1 || !map2)
1316 return 0; 1331 return 0;
1317 1332
1318 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1333 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1320 if (map1 == map2) 1335 if (map1 == map2)
1321 { 1336 {
1322 *dx = 0; 1337 *dx = 0;
1323 *dy = 0; 1338 *dy = 0;
1324 } 1339 }
1325 else if (map1->tile_map[0] == map2) 1340 else if (map1->tile_available (TILE_NORTH, false) == map2)
1326 { /* up */ 1341 {
1327 *dx = 0; 1342 *dx = 0;
1328 *dy = -map2->height; 1343 *dy = -map2->height;
1329 } 1344 }
1330 else if (map1->tile_map[1] == map2) 1345 else if (map1->tile_available (TILE_EAST , false) == map2)
1331 { /* right */ 1346 {
1332 *dx = map1->width; 1347 *dx = map1->width;
1333 *dy = 0; 1348 *dy = 0;
1334 } 1349 }
1335 else if (map1->tile_map[2] == map2) 1350 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1336 { /* down */ 1351 {
1337 *dx = 0; 1352 *dx = 0;
1338 *dy = map1->height; 1353 *dy = map1->height;
1339 } 1354 }
1340 else if (map1->tile_map[3] == map2) 1355 else if (map1->tile_available (TILE_WEST , false) == map2)
1341 { /* left */ 1356 {
1342 *dx = -map2->width; 1357 *dx = -map2->width;
1343 *dy = 0; 1358 *dy = 0;
1344 } 1359 }
1345 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1360 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1346 { /* up right */ 1361 { /* up right */
1347 *dx = map1->tile_map[0]->width; 1362 *dx = +map1->tile_map[TILE_NORTH]->width;
1348 *dy = -map1->tile_map[0]->height; 1363 *dy = -map1->tile_map[TILE_NORTH]->height;
1349 } 1364 }
1350 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1365 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1351 { /* up left */ 1366 { /* up left */
1352 *dx = -map2->width; 1367 *dx = -map2->width;
1353 *dy = -map1->tile_map[0]->height; 1368 *dy = -map1->tile_map[TILE_NORTH]->height;
1354 } 1369 }
1355 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1370 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1356 { /* right up */ 1371 { /* right up */
1357 *dx = map1->width; 1372 *dx = +map1->width;
1358 *dy = -map2->height; 1373 *dy = -map2->height;
1359 } 1374 }
1360 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1375 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1361 { /* right down */ 1376 { /* right down */
1362 *dx = map1->width; 1377 *dx = +map1->width;
1363 *dy = map1->tile_map[1]->height; 1378 *dy = +map1->tile_map[TILE_EAST]->height;
1364 } 1379 }
1365 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1380 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1366 { /* down right */ 1381 { /* down right */
1367 *dx = map1->tile_map[2]->width; 1382 *dx = +map1->tile_map[TILE_SOUTH]->width;
1368 *dy = map1->height; 1383 *dy = +map1->height;
1369 } 1384 }
1370 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1385 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1371 { /* down left */ 1386 { /* down left */
1372 *dx = -map2->width; 1387 *dx = -map2->width;
1373 *dy = map1->height; 1388 *dy = +map1->height;
1374 } 1389 }
1375 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1390 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1376 { /* left up */ 1391 { /* left up */
1377 *dx = -map1->tile_map[3]->width; 1392 *dx = -map1->tile_map[TILE_WEST]->width;
1378 *dy = -map2->height; 1393 *dy = -map2->height;
1379 } 1394 }
1380 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1395 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1381 { /* left down */ 1396 { /* left down */
1382 *dx = -map1->tile_map[3]->width; 1397 *dx = -map1->tile_map[TILE_WEST]->width;
1383 *dy = map1->tile_map[3]->height; 1398 *dy = +map1->tile_map[TILE_WEST]->height;
1384 } 1399 }
1385 else 1400 else
1386 return 0; 1401 return 0;
1387 1402
1388 return 1; 1403 return 1;
… …
1488 * be more consistant with the above function and also in case they are needed 1503 * be more consistant with the above function and also in case they are needed
1489 * for something in the future. Also, since no object is pasted, the best 1504 * for something in the future. Also, since no object is pasted, the best
1490 * field of the rv_vector is set to NULL. 1505 * field of the rv_vector is set to NULL.
1491 */ 1506 */
1492void 1507void
1493get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1508get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1494{ 1509{
1495 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1510 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1496 { 1511 {
1497 /* be conservative and fill in _some_ data */ 1512 /* be conservative and fill in _some_ data */
1498 retval->distance = 100000; 1513 retval->distance = 100000;
… …
1620split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1635split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1621{ 1636{
1622 // clip to map to the left 1637 // clip to map to the left
1623 if (x0 < 0) 1638 if (x0 < 0)
1624 { 1639 {
1625 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1640 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1626 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1641 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1627 1642
1628 if (x1 < 0) // entirely to the left 1643 if (x1 < 0) // entirely to the left
1629 return; 1644 return;
1630 1645
… …
1632 } 1647 }
1633 1648
1634 // clip to map to the right 1649 // clip to map to the right
1635 if (x1 > m->width) 1650 if (x1 > m->width)
1636 { 1651 {
1637 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1652 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1638 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1653 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1639 1654
1640 if (x0 > m->width) // entirely to the right 1655 if (x0 > m->width) // entirely to the right
1641 return; 1656 return;
1642 1657
… …
1644 } 1659 }
1645 1660
1646 // clip to map above 1661 // clip to map above
1647 if (y0 < 0) 1662 if (y0 < 0)
1648 { 1663 {
1649 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1664 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1650 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1665 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1651 1666
1652 if (y1 < 0) // entirely above 1667 if (y1 < 0) // entirely above
1653 return; 1668 return;
1654 1669
… …
1656 } 1671 }
1657 1672
1658 // clip to map below 1673 // clip to map below
1659 if (y1 > m->height) 1674 if (y1 > m->height)
1660 { 1675 {
1661 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1676 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1662 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1677 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1663 1678
1664 if (y0 > m->height) // entirely below 1679 if (y0 > m->height) // entirely below
1665 return; 1680 return;
1666 1681

Diff Legend

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