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.140 by root, Sun May 4 20:40:52 2008 UTC vs.
Revision 1.145 by root, Mon Aug 11 23:23:41 2008 UTC

… …
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
27
28#include "loader.h" 27#include "loader.h"
29
30#include "path.h" 28#include "path.h"
31 29
32/* This rolls up wall, blocks_magic, blocks_view, etc, all into 30/* This rolls up wall, blocks_magic, blocks_view, etc, all into
33 * one function that just returns a P_.. value (see map.h) 31 * one function that just returns a P_.. value (see map.h)
34 * it will also do map translation for tiled maps, returning 32 * it will also do map translation for tiled maps, returning
… …
260 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 258 for (mapspace *ms = spaces + size (); ms-- > spaces; )
261 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 259 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
262 tmp->flag [flag] = value; 260 tmp->flag [flag] = value;
263} 261}
264 262
263void
264maptile::post_load_original ()
265{
266 if (!spaces)
267 return;
268
269 set_object_flag (FLAG_OBJ_ORIGINAL);
270
271 for (mapspace *ms = spaces + size (); ms-- > spaces; )
272 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
273 INVOKE_OBJECT (RESET, tmp);
274}
275
265/* link_multipart_objects go through all the objects on the map looking 276/* link_multipart_objects go through all the objects on the map looking
266 * for objects whose arch says they are multipart yet according to the 277 * for objects whose arch says they are multipart yet according to the
267 * info we have, they only have the head (as would be expected when 278 * info we have, they only have the head (as would be expected when
268 * they are saved). 279 * they are saved).
269 */ 280 */
… …
641 case KW_sky: thawer.get (sky); break; 652 case KW_sky: thawer.get (sky); break;
642 653
643 case KW_per_player: thawer.get (per_player); break; 654 case KW_per_player: thawer.get (per_player); break;
644 case KW_per_party: thawer.get (per_party); break; 655 case KW_per_party: thawer.get (per_party); break;
645 case KW_no_reset: thawer.get (no_reset); break; 656 case KW_no_reset: thawer.get (no_reset); break;
657 case KW_no_drop: thawer.get (no_drop); break;
646 658
647 case KW_region: default_region = region::find (thawer.get_str ()); break; 659 case KW_region: default_region = region::find (thawer.get_str ()); break;
648 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 660 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
649 661
650 // old names new names 662 // old names new names
… …
724 MAP_OUT (swap_time); 736 MAP_OUT (swap_time);
725 MAP_OUT (reset_time); 737 MAP_OUT (reset_time);
726 MAP_OUT (reset_timeout); 738 MAP_OUT (reset_timeout);
727 MAP_OUT (fixed_resettime); 739 MAP_OUT (fixed_resettime);
728 MAP_OUT (no_reset); 740 MAP_OUT (no_reset);
741 MAP_OUT (no_drop);
729 MAP_OUT (difficulty); 742 MAP_OUT (difficulty);
730 743
731 if (default_region) MAP_OUT2 (region, default_region->name); 744 if (default_region) MAP_OUT2 (region, default_region->name);
732 745
733 if (shopitems) 746 if (shopitems)
… …
1040 else 1053 else
1041 darkness = new_level; 1054 darkness = new_level;
1042 1055
1043 /* All clients need to get re-updated for the change */ 1056 /* All clients need to get re-updated for the change */
1044 update_all_map_los (this); 1057 update_all_map_los (this);
1058
1045 return 1; 1059 return 1;
1046} 1060}
1047 1061
1048/* 1062/*
1049 * This function updates various attributes about a specific space 1063 * This function updates various attributes about a specific space
… …
1052 * through, etc) 1066 * through, etc)
1053 */ 1067 */
1054void 1068void
1055mapspace::update_ () 1069mapspace::update_ ()
1056{ 1070{
1057 object *tmp, *last = 0; 1071 object *last = 0;
1058 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1072 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1059 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1073 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1060 1074
1061 //object *middle = 0; 1075 //object *middle = 0;
1062 //object *top = 0; 1076 //object *top = 0;
… …
1064 // this seems to generate better code than using locals, above 1078 // this seems to generate better code than using locals, above
1065 object *&top = faces_obj[0] = 0; 1079 object *&top = faces_obj[0] = 0;
1066 object *&middle = faces_obj[1] = 0; 1080 object *&middle = faces_obj[1] = 0;
1067 object *&floor = faces_obj[2] = 0; 1081 object *&floor = faces_obj[2] = 0;
1068 1082
1069 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1083 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1070 { 1084 {
1071 /* This could be made additive I guess (two lights better than 1085 /* This could be made additive I guess (two lights better than
1072 * one). But if so, it shouldn't be a simple additive - 2 1086 * one). But if so, it shouldn't be a simple additive - 2
1073 * light bulbs do not illuminate twice as far as once since 1087 * light bulbs do not illuminate twice as far as once since
1074 * it is a dissapation factor that is cubed. 1088 * it is a dissapation factor that is cubed.
… …
1100 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1114 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1101 { 1115 {
1102 middle = tmp; 1116 middle = tmp;
1103 anywhere = 1; 1117 anywhere = 1;
1104 } 1118 }
1119
1105 /* Find the highest visible face around. If equal 1120 /* Find the highest visible face around. If equal
1106 * visibilities, we still want the one nearer to the 1121 * visibilities, we still want the one nearer to the
1107 * top 1122 * top
1108 */ 1123 */
1109 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1124 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1122 move_off |= tmp->move_off; 1137 move_off |= tmp->move_off;
1123 move_allow |= tmp->move_allow; 1138 move_allow |= tmp->move_allow;
1124 1139
1125 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1140 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
1126 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1141 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
1127 if (tmp->type == PLAYER) flags |= P_PLAYER;
1128 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1142 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1129 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1143 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1130 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1144 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1131 } 1145 }
1132 1146
… …
1158 * 1) top face is set, need middle to be set. 1172 * 1) top face is set, need middle to be set.
1159 * 2) middle is set, need to set top. 1173 * 2) middle is set, need to set top.
1160 * 3) neither middle or top is set - need to set both. 1174 * 3) neither middle or top is set - need to set both.
1161 */ 1175 */
1162 1176
1163 for (tmp = last; tmp; tmp = tmp->below) 1177 for (object *tmp = last; tmp; tmp = tmp->below)
1164 { 1178 {
1165 /* Once we get to a floor, stop, since we already have a floor object */ 1179 /* Once we get to a floor, stop, since we already have a floor object */
1166 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1180 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1167 break; 1181 break;
1168 1182
… …
1571} 1585}
1572 1586
1573object * 1587object *
1574maptile::insert (object *op, int x, int y, object *originator, int flags) 1588maptile::insert (object *op, int x, int y, object *originator, int flags)
1575{ 1589{
1576 if (!op->flag [FLAG_REMOVED])
1577 op->remove ();
1578
1579 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1590 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1580} 1591}
1581 1592
1582region * 1593region *
1583maptile::region (int x, int y) const 1594maptile::region (int x, int y) const

Diff Legend

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