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.176 by root, Tue Nov 10 05:11:05 2009 UTC vs.
Revision 1.191 by root, Sun Apr 18 05:57:03 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 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
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
28#include "loader.h"
29#include "path.h" 28#include "path.h"
30 29
31//+GPL 30//+GPL
32 31
33sint8 maptile::outdoor_darkness; 32sint8 maptile::outdoor_darkness;
… …
111 /* We basically go through the stack of objects, and if there is 110 /* We basically go through the stack of objects, and if there is
112 * some other object that has NO_PASS or FLAG_ALIVE set, return 111 * some other object that has NO_PASS or FLAG_ALIVE set, return
113 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
114 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
115 */ 114 */
116 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 115 for (object *tmp = ms.top; tmp; tmp = tmp->below)
117 { 116 {
118 if (OB_MOVE_BLOCK (ob, tmp)) 117 if (OB_MOVE_BLOCK (ob, tmp))
119 { 118 {
120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob)) 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
121 if (RESULT_INT (0)) 120 if (RESULT_INT (0))
… …
145 return 1; // unconditional block 144 return 1; // unconditional block
146 145
147 } else { 146 } else {
148 // space does not block the ob, directly, but 147 // space does not block the ob, directly, but
149 // anything alive that is not a door still 148 // anything alive that is not a door still
150 // blocks anything but wizards. 149 // blocks anything
151 150
152 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
153 && tmp->head_ () != ob
154 && tmp != ob
155 && tmp->type != DOOR 152 && tmp->type != DOOR
156 && !tmp->flag [FLAG_WIZPASS]) 153 && tmp->head_ () != ob) //TODO: maybe move these check up?
157 return 1; 154 return 1;
158 } 155 }
159 } 156 }
160 157
161 return 0; 158 return 0;
162} 159}
163 160
164/* 161/*
165 * Returns qthe blocking object if the given object can't fit in the given 162 * Returns the blocking object if the given object can't fit in the given
166 * spot. This is meant for multi space objects - for single space objecs, 163 * spot. This is meant for multi space objects - for single space objecs,
167 * just calling get_map_blocked and checking that against movement type 164 * just calling get_map_blocked and checking that against movement type
168 * of object. This function goes through all the parts of the multipart 165 * of object. This function goes through all the parts of the multipart
169 * object and makes sure they can be inserted. 166 * object and makes sure they can be inserted.
170 * 167 *
… …
424 return false; 421 return false;
425 422
426 return freezer.save (path); 423 return freezer.save (path);
427} 424}
428 425
429maptile::maptile () 426void
427maptile::init ()
430{ 428{
431 in_memory = MAP_SWAPPED; 429 in_memory = MAP_SWAPPED;
432 430
433 /* The maps used to pick up default x and y values from the 431 /* The maps used to pick up default x and y values from the
434 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
435 */ 433 */
436 width = 16; 434 width = 16;
437 height = 16; 435 height = 16;
438 timeout = 300; 436 timeout = 300;
439 max_items = MAX_ITEM_PER_ACTION; 437 max_items = MAX_ITEM_PER_ACTION;
440 max_volume = 2000000; // 2m³ 438 max_volume = 2000000; // 2m³
441}
442
443maptile::maptile (int w, int h)
444{
445 in_memory = MAP_SWAPPED;
446
447 width = w;
448 height = h;
449 reset_timeout = 0; 439 reset_timeout = 0;
450 timeout = 300;
451 enter_x = 0; 440 enter_x = 0;
452 enter_y = 0; 441 enter_y = 0;
442}
443
444maptile::maptile ()
445{
446 init ();
447}
448
449maptile::maptile (int w, int h)
450{
451 init ();
452
453 width = w;
454 height = h;
453 455
454 alloc (); 456 alloc ();
455} 457}
456 458
457/* 459/*
… …
630 case KW_shopgreed: thawer.get (shopgreed); break; 632 case KW_shopgreed: thawer.get (shopgreed); break;
631 case KW_shopmin: thawer.get (shopmin); break; 633 case KW_shopmin: thawer.get (shopmin); break;
632 case KW_shopmax: thawer.get (shopmax); break; 634 case KW_shopmax: thawer.get (shopmax); break;
633 case KW_shoprace: thawer.get (shoprace); break; 635 case KW_shoprace: thawer.get (shoprace); break;
634 case KW_outdoor: thawer.get (outdoor); break; 636 case KW_outdoor: thawer.get (outdoor); break;
635 case KW_temp: thawer.get (temp); break;
636 case KW_pressure: thawer.get (pressure); break;
637 case KW_humid: thawer.get (humid); break;
638 case KW_windspeed: thawer.get (windspeed); break;
639 case KW_winddir: thawer.get (winddir); break;
640 case KW_sky: thawer.get (sky); break;
641 637
642 case KW_per_player: thawer.get (per_player); break; 638 case KW_per_player: thawer.get (per_player); break;
643 case KW_per_party: thawer.get (per_party); break; 639 case KW_per_party: thawer.get (per_party); break;
644 case KW_no_reset: thawer.get (no_reset); break; 640 case KW_no_reset: thawer.get (no_reset); break;
645 case KW_no_drop: thawer.get (no_drop); break; 641 case KW_no_drop: thawer.get (no_drop); break;
… …
670 case KW_end: 666 case KW_end:
671 thawer.next (); 667 thawer.next ();
672 return true; 668 return true;
673 669
674 default: 670 default:
675 if (!thawer.parse_error ("map", 0)) 671 if (!thawer.parse_error ("map"))
676 return false; 672 return false;
677 break; 673 break;
678 } 674 }
679 675
680 thawer.next (); 676 thawer.next ();
… …
698 int unique = 0; 694 int unique = 0;
699 for (object *op = spaces [i].bot; op; ) 695 for (object *op = spaces [i].bot; op; )
700 { 696 {
701 object *above = op->above; 697 object *above = op->above;
702 698
703 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 699 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
704 unique = 1; 700 unique = 1;
705 701
706 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 702 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
707 op->destroy (); 703 op->destroy ();
708 704
709 op = above; 705 op = above;
710 } 706 }
711 } 707 }
… …
714//-GPL 710//-GPL
715 711
716bool 712bool
717maptile::_save_header (object_freezer &freezer) 713maptile::_save_header (object_freezer &freezer)
718{ 714{
719#define MAP_OUT(k) freezer.put (KW_ ## k, k) 715#define MAP_OUT(k) freezer.put (KW(k), k)
720#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 716#define MAP_OUT2(k,v) freezer.put (KW(k), v)
721 717
722 MAP_OUT2 (arch, "map"); 718 MAP_OUT2 (arch, CS(map));
723 719
724 if (name) MAP_OUT (name); 720 if (name) MAP_OUT (name);
725 MAP_OUT (swap_time); 721 MAP_OUT (swap_time);
726 MAP_OUT (reset_time); 722 MAP_OUT (reset_time);
727 MAP_OUT (reset_timeout); 723 MAP_OUT (reset_timeout);
… …
735 MAP_OUT (shopgreed); 731 MAP_OUT (shopgreed);
736 MAP_OUT (shopmin); 732 MAP_OUT (shopmin);
737 MAP_OUT (shopmax); 733 MAP_OUT (shopmax);
738 if (shoprace) MAP_OUT (shoprace); 734 if (shoprace) MAP_OUT (shoprace);
739 735
740 MAP_OUT (darkness);
741 MAP_OUT (width); 736 MAP_OUT (width);
742 MAP_OUT (height); 737 MAP_OUT (height);
743 MAP_OUT (enter_x); 738 MAP_OUT (enter_x);
744 MAP_OUT (enter_y); 739 MAP_OUT (enter_y);
745 740 MAP_OUT (darkness);
746 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
747 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
748
749 MAP_OUT (outdoor); 741 MAP_OUT (outdoor);
750 MAP_OUT (temp); 742
751 MAP_OUT (pressure); 743 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
752 MAP_OUT (humid); 744 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
753 MAP_OUT (windspeed);
754 MAP_OUT (winddir);
755 MAP_OUT (sky);
756 745
757 MAP_OUT (per_player); 746 MAP_OUT (per_player);
758 MAP_OUT (per_party); 747 MAP_OUT (per_party);
759 748
760 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 749 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
761 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 750 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
762 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 751 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
763 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 752 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
764 753
765 freezer.put (this); 754 freezer.put (this);
766 freezer.put (KW_end); 755 freezer.put (KW(end));
767 756
768 return true; 757 return true;
769} 758}
770 759
771bool 760bool
… …
856 845
857 clear (); 846 clear ();
858} 847}
859 848
860/* decay and destroy perishable items in a map */ 849/* decay and destroy perishable items in a map */
850// TODO: should be done regularly, not on map load?
861void 851void
862maptile::do_decay_objects () 852maptile::do_decay_objects ()
863{ 853{
864 if (!spaces) 854 if (!spaces)
865 return; 855 return;
… …
867 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 857 for (mapspace *ms = spaces + size (); ms-- > spaces; )
868 for (object *above, *op = ms->bot; op; op = above) 858 for (object *above, *op = ms->bot; op; op = above)
869 { 859 {
870 above = op->above; 860 above = op->above;
871 861
862 // do not decay anything above unique floor tiles (yet :)
863 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
864 break;
865
872 bool destroy = 0; 866 bool destroy = 0;
873 867
874 // do not decay anything above unique floor tiles (yet :) 868 if (op->flag [FLAG_IS_FLOOR]
875 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 869 || op->flag [FLAG_OBJ_ORIGINAL]
876 break; 870 || op->flag [FLAG_UNIQUE]
877 871 || op->flag [FLAG_OVERLAY_FLOOR]
878 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 872 || op->flag [FLAG_UNPAID]
879 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
880 || QUERY_FLAG (op, FLAG_UNIQUE)
881 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
882 || QUERY_FLAG (op, FLAG_UNPAID)
883 || op->is_alive ()) 873 || op->is_alive ())
884 ; // do not decay 874 ; // do not decay
885 else if (op->is_weapon ()) 875 else if (op->is_weapon ())
886 { 876 {
887 op->stats.dam--; 877 op->stats.dam--;
… …
912 || mat & M_LIQUID 902 || mat & M_LIQUID
913 || (mat & M_IRON && rndm (1, 5) == 1) 903 || (mat & M_IRON && rndm (1, 5) == 1)
914 || (mat & M_GLASS && rndm (1, 2) == 1) 904 || (mat & M_GLASS && rndm (1, 2) == 1)
915 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 905 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
916 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 906 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
917 || (mat & M_ICE && temp > 32)) 907 //|| (mat & M_ICE && temp > 32)
908 )
918 destroy = 1; 909 destroy = 1;
919 } 910 }
920 911
921 /* adjust overall chance below */ 912 /* adjust overall chance below */
922 if (destroy && rndm (0, 1)) 913 if (destroy && rndm (0, 1))
… …
942 sint64 total_exp = 0; 933 sint64 total_exp = 0;
943 934
944 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 935 for (mapspace *ms = spaces + size (); ms-- > spaces; )
945 for (object *op = ms->bot; op; op = op->above) 936 for (object *op = ms->bot; op; op = op->above)
946 { 937 {
947 if (QUERY_FLAG (op, FLAG_MONSTER)) 938 if (op->flag [FLAG_MONSTER])
948 { 939 {
949 total_exp += op->stats.exp; 940 total_exp += op->stats.exp;
950 monster_cnt++; 941 monster_cnt++;
951 } 942 }
952 943
953 if (QUERY_FLAG (op, FLAG_GENERATOR)) 944 if (op->flag [FLAG_GENERATOR])
954 { 945 {
955 total_exp += op->stats.exp; 946 total_exp += op->stats.exp;
956 947
957 if (archetype *at = op->other_arch) 948 if (archetype *at = op->other_arch)
958 { 949 {
… …
1140 */ 1131 */
1141 1132
1142 for (object *tmp = last; tmp; tmp = tmp->below) 1133 for (object *tmp = last; tmp; tmp = tmp->below)
1143 { 1134 {
1144 /* Once we get to a floor, stop, since we already have a floor object */ 1135 /* Once we get to a floor, stop, since we already have a floor object */
1145 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1136 if (tmp->flag [FLAG_IS_FLOOR])
1146 break; 1137 break;
1147 1138
1148 /* If two top faces are already set, quit processing */ 1139 /* If two top faces are already set, quit processing */
1149 if (top && middle) 1140 if (top && middle)
1150 break; 1141 break;
… …
1433 * 1424 *
1434 * currently, the only flag supported (0x1) is don't translate for 1425 * currently, the only flag supported (0x1) is don't translate for
1435 * closest body part of 'op1' 1426 * closest body part of 'op1'
1436 */ 1427 */
1437void 1428void
1438get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1429get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1439{ 1430{
1440 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1431 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1441 { 1432 {
1442 /* be conservative and fill in _some_ data */ 1433 /* be conservative and fill in _some_ data */
1443 retval->distance = 10000; 1434 retval->distance = 10000;
1444 retval->distance_x = 10000; 1435 retval->distance_x = 10000;
1445 retval->distance_y = 10000; 1436 retval->distance_y = 10000;
1446 retval->direction = 0; 1437 retval->direction = 0;
1447 retval->part = 0; 1438 retval->part = 0;
1448 } 1439 }
1449 else 1440 else
1450 { 1441 {
1451 object *best;
1452
1453 retval->distance_x += op2->x - op1->x; 1442 retval->distance_x += op2->x - op1->x;
1454 retval->distance_y += op2->y - op1->y; 1443 retval->distance_y += op2->y - op1->y;
1455 1444
1456 best = op1; 1445 object *best = op1;
1446
1457 /* If this is multipart, find the closest part now */ 1447 /* If this is multipart, find the closest part now */
1458 if (!(flags & 0x1) && op1->more) 1448 if (!(flags & 1) && op1->more)
1459 { 1449 {
1460 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1450 int best_distance = idistance (retval->distance_x, retval->distance_y);
1461 1451
1462 /* we just take the offset of the piece to head to figure 1452 /* we just take the offset of the piece to head to figure
1463 * distance instead of doing all that work above again 1453 * distance instead of doing all that work above again
1464 * since the distance fields we set above are positive in the 1454 * since the distance fields we set above are positive in the
1465 * same axis as is used for multipart objects, the simply arithmetic 1455 * same axis as is used for multipart objects, the simply arithmetic
1466 * below works. 1456 * below works.
1467 */ 1457 */
1468 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1458 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1469 { 1459 {
1470 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1460 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1471 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1461
1472 if (tmpi < best_distance) 1462 if (tmpi < best_distance)
1473 { 1463 {
1474 best_distance = tmpi; 1464 best_distance = tmpi;
1475 best = tmp; 1465 best = tmp;
1476 } 1466 }
1477 } 1467 }
1478 1468
1479 if (best != op1) 1469 if (best != op1)
1480 { 1470 {
… …
1576 */ 1566 */
1577 for (int i = 1000; --i;) 1567 for (int i = 1000; --i;)
1578 { 1568 {
1579 object *pick = at (gen (width), gen (height)).bot; 1569 object *pick = at (gen (width), gen (height)).bot;
1580 1570
1581 // do not prefer big monsters just because they are big. 1571 // must be head: do not prefer big monsters just because they are big.
1582 if (pick && pick->is_head ()) 1572 if (pick && pick->is_head ())
1583 return pick->head_ (); 1573 return pick;
1584 } 1574 }
1585 1575
1586 // instead of crashing in the unlikely(?) case, try to return *something* 1576 // instead of crashing in the unlikely(?) case, try to return *something*
1587 return archetype::find (shstr_bug); 1577 return archetype::find (shstr_bug);
1588} 1578}
… …
1621 1611
1622 if (distance <= MAX_SOUND_DISTANCE) 1612 if (distance <= MAX_SOUND_DISTANCE)
1623 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1613 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1624 } 1614 }
1625} 1615}
1616
1617dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1626 1618
1627static void 1619static void
1628split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1620split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1629{ 1621{
1630 // clip to map to the left 1622 // clip to map to the left
… …
1686 r->dx = dx; 1678 r->dx = dx;
1687 r->dy = dy; 1679 r->dy = dy;
1688} 1680}
1689 1681
1690maprect * 1682maprect *
1691maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1683maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1692{ 1684{
1693 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1694 buf.clear (); 1685 buf.clear ();
1695 1686
1696 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1687 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1697 1688
1698 // add end marker 1689 // add end marker

Diff Legend

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