ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.124 by root, Tue Sep 30 07:51:17 2008 UTC vs.
Revision 1.146 by root, Wed Nov 11 04:45:22 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
26#include <sproto.h> 27#include <sproto.h>
27 28
28///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
29 30
30extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
31 34
32/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
33 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
34 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
35 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
327 330
328 if (!name_pl) 331 if (!name_pl)
329 name_pl = name; 332 name_pl = name;
330 333
331 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
332 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
333 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
334 337
335 /* only do these when program is first run - a bit 338 /* only do these when program is first run - a bit
336 * excessive to do this at every run - most of this is 339 * excessive to do this at every run - most of this is
337 * really just to catch any errors - program will still run, but 340 * really just to catch any errors - program will still run, but
338 * not in the ideal fashion. 341 * not in the ideal fashion.
339 */ 342 */
340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 343 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341 { 344 {
342 if (!skill) 345 if (!skill)
343 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); 346 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 347 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 348 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
346 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 349 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 350 }
348 351
349 /* We changed last_heal to gen_sp_armour, which is what it 352 /* We changed last_heal to gen_sp_armour, which is what it
350 * really does for many objects. Need to catch any in maps 353 * really does for many objects. Need to catch any in maps
… …
460 stats.maxhp = 0; 463 stats.maxhp = 0;
461 } 464 }
462 else 465 else
463 move_type = MOVE_WALK; 466 move_type = MOVE_WALK;
464 } 467 }
468 }
469
470 // if the object has an animation, try to provide a default face
471 if (has_anim ())
472 {
473 const animation &anim_ob = anim ();
474
475 if (anim_speed)
476 // if this item is time-animated, force the last frame
477 animate_object (this, 0);
478 else if (flag [FLAG_MONSTER])
479 // if it is a monster, set appropriate facing
480 animate_object (this, direction);
465 } 481 }
466} 482}
467 483
468static void 484static void
469set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, const char *str)
… …
522 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str); 538 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
523 539
524next: ; 540next: ;
525 } 541 }
526} 542}
543
544//-GPL
527 545
528#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
529 547
530bool 548bool
531object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
… …
707 case KW_invisible: f.get (invisible); break; 725 case KW_invisible: f.get (invisible); break;
708 case KW_magic: f.get (magic); break; 726 case KW_magic: f.get (magic); break;
709 case KW_state: f.get (state); break; 727 case KW_state: f.get (state); break;
710 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 728 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
711 case KW_material: f.get (materials); break; //TODO: nuke 729 case KW_material: f.get (materials); break; //TODO: nuke
712 case KW_materialname: f.get (materialname); break; 730
731 case KW_materialname:
732 {
733 shstr sh;
734 f.get (sh);
735 material = name_to_material (sh);
736 }
737 break;
713 738
714 /* These are the new values */ 739 /* These are the new values */
715 case KW_move_block: set_move (move_block, f.get_str ()); break; 740 case KW_move_block: set_move (move_block, f.get_str ()); break;
716 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 741 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
717 case KW_move_type: set_move (move_type, f.get_str ()); break; 742 case KW_move_type: set_move (move_type, f.get_str ()); break;
… …
834 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 859 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
835 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 860 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
836 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 861 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
837 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 862 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
838 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 863 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
839 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
840 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 864 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
841 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 865 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
842 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 866 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
843 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 867 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
844 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 868 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
927 case KW_anim_speed: f.get (anim_speed); break; 951 case KW_anim_speed: f.get (anim_speed); break;
928 case KW_container: f.get (weight_limit); break; 952 case KW_container: f.get (weight_limit); break;
929 case KW_will_apply: f.get (will_apply); break; 953 case KW_will_apply: f.get (will_apply); break;
930 case KW_attack_movement: f.get (attack_movement); break; 954 case KW_attack_movement: f.get (attack_movement); break;
931 case KW_move_state: f.get (move_status); break; 955 case KW_move_state: f.get (move_status); break;
932 case KW_expmul: f.get (expmul); break; 956 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
933 case KW_glow_radius: f.get (glow_radius); break; 957 case KW_glow_radius: f.get (glow_radius); break;
934 case KW_weapontype: f.get (weapontype); break; 958 case KW_weapontype: f.get (weapontype); break;
935 case KW_tooltype: f.get (tooltype); break;
936 case KW_casting_time: f.get (casting_time); break; 959 case KW_casting_time: f.get (casting_time); break;
937 960
938 // elevation is deprecated 961 // elevation is deprecated
939 case KW_elevation: break; 962 case KW_elevation: break;
940 963
… …
964 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 987 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
965 case KW_can_apply: 988 case KW_can_apply:
966 break; 989 break;
967 990
968 case KW_connected: 991 case KW_connected:
969 add_button_link (this, map, f.get_sint32 ()); 992 {
993 shstr connected;
994
995 f.get (connected);
996 add_link (map, connected);
997 }
970 break; 998 break;
971 999
972 case KW_randomitems: 1000 case KW_randomitems:
973 if (f.get_str ()) 1001 if (f.get_str ())
974 { 1002 {
… …
976 loading_arch 1004 loading_arch
977 ? treasurelist::get (f.get_str ()) 1005 ? treasurelist::get (f.get_str ())
978 : treasurelist::find (f.get_str ()); 1006 : treasurelist::find (f.get_str ());
979 1007
980 if (!randomitems) 1008 if (!randomitems)
1009 {
981 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1010 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1011 randomitems = treasurelist::get (shstr_none); // avoid crashes
1012 }
982 } 1013 }
983 else 1014 else
984 randomitems = 0; 1015 randomitems = 0;
985 break; 1016 break;
986 1017
… …
1045 archetype *arch = archetype::find (f.get_str ()); 1076 archetype *arch = archetype::find (f.get_str ());
1046 1077
1047 if (!arch) 1078 if (!arch)
1048 { 1079 {
1049 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1080 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1050 arch = archetype::find ("earthwall"); 1081 arch = archetype::find (shstr_earthwall);
1051 } 1082 }
1052 1083
1053 assert (arch); //D maybe use exception handling of sorts? 1084 assert (arch); //D maybe use exception handling of sorts?
1054 1085
1055 f.next (); 1086 f.next ();
… …
1081 object_thawer f (buf, (AV *)0); 1112 object_thawer f (buf, (AV *)0);
1082 1113
1083 return op->parse_kv (f); 1114 return op->parse_kv (f);
1084} 1115}
1085 1116
1086/* This returns a string of the integer movement type */
1087#if 0
1088// unused function
1089static char *
1090get_string_move_type (MoveType mt)
1091{
1092 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1093 int i, all_count = 0, count;
1094
1095 strcpy (retbuf, "");
1096 strcpy (retbuf_all, " all");
1097
1098 /* Quick check, and probably fairly common */
1099 if (mt == MOVE_ALL)
1100 return retbuf_all + 1;
1101 if (mt == 0)
1102 {
1103 strcpy (retbuf, "0");
1104 return retbuf;
1105 }
1106
1107 /* We basically slide the bits down. Why look at MOVE_ALL?
1108 * because we may want to return a string like 'all -swim',
1109 * and if we just looked at mt, we couldn't get that.
1110 */
1111 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1112 {
1113 if (mt & (1 << count))
1114 {
1115 strcat (retbuf, " ");
1116 strcat (retbuf, move_name[count]);
1117 }
1118 else
1119 {
1120 strcat (retbuf_all, " -");
1121 strcat (retbuf_all, move_name[count]);
1122 all_count++;
1123 }
1124 }
1125 /* Basically, if there is a single negation, return it, eg
1126 * 'all -swim'. But more than that, just return the
1127 * enumerated values. It doesn't make sense to return
1128 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1129 */
1130 if (all_count <= 1)
1131 return retbuf_all + 1;
1132 else
1133 return retbuf + 1;
1134}
1135#endif
1136
1137// compare *op against *tmp and output differences 1117// compare *op against *arch and output differences
1138static void 1118static void
1139write_diff (object_freezer &f, object *op, object *tmp) 1119write_diff (object_freezer &f, object *op, object *arch)
1140{ 1120{
1141 static const keyword resist_save[NROFATTACKS] = { 1121 static const keyword resist_save[NROFATTACKS] = {
1142# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1122# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1143# include "attackinc.h" 1123# include "attackinc.h"
1144# undef def 1124# undef def
… …
1158 KW_applied, 1138 KW_applied,
1159 KW_unpaid, 1139 KW_unpaid,
1160 KW_can_use_shield, 1140 KW_can_use_shield,
1161 KW_no_pick, 1141 KW_no_pick,
1162 KW_NULL, // walk_on 1142 KW_NULL, // walk_on
1143 /* 10 */
1163 KW_NULL, // no_pass 1144 KW_NULL, // no_pass
1164 /* 10 */
1165 KW_is_animated, 1145 KW_is_animated,
1166 KW_NULL, // slow_move 1146 KW_NULL, // slow_move
1167 KW_NULL, // flying 1147 KW_NULL, // flying
1168 KW_monster, 1148 KW_monster,
1169 KW_friendly, 1149 KW_friendly,
1170 KW_generator, 1150 KW_generator,
1171 KW_is_thrown, 1151 KW_is_thrown,
1172 KW_auto_apply, 1152 KW_auto_apply,
1173 KW_treasure_env, 1153 KW_treasure_env,
1154 /* 20 */
1174 KW_player_sold, 1155 KW_player_sold,
1175 /* 20 */
1176 KW_see_invisible, 1156 KW_see_invisible,
1177 KW_can_roll, 1157 KW_can_roll,
1178 KW_overlay_floor, 1158 KW_overlay_floor,
1179 KW_is_turnable, 1159 KW_is_turnable,
1180 KW_NULL, // walk_off 1160 KW_NULL, // walk_off
1181 KW_NULL, // fly_on 1161 KW_NULL, // fly_on
1182 KW_NULL, // fly_off 1162 KW_NULL, // fly_off
1183 KW_is_used_up, 1163 KW_is_used_up,
1184 KW_identified, 1164 KW_identified,
1165 /* 30 */
1185 KW_reflecting, 1166 KW_reflecting,
1186 /* 30 */
1187 KW_changing, 1167 KW_changing,
1188 KW_splitting, 1168 KW_splitting,
1189 KW_hitback, 1169 KW_hitback,
1190 KW_startequip, 1170 KW_startequip,
1191 KW_blocksview, 1171 KW_blocksview,
1192 KW_undead, 1172 KW_undead,
1193 KW_scared, 1173 KW_scared,
1194 KW_unaggressive, 1174 KW_unaggressive,
1195 KW_reflect_missile, 1175 KW_reflect_missile,
1176 /* 40 */
1196 KW_reflect_spell, 1177 KW_reflect_spell,
1197 /* 40 */
1198 KW_no_magic, 1178 KW_no_magic,
1199 KW_no_fix_player, 1179 KW_NULL,
1200 KW_is_lightable, 1180 KW_is_lightable,
1201 KW_tear_down, 1181 KW_tear_down,
1202 KW_run_away, 1182 KW_run_away,
1203 KW_NULL, // pass_thru 1183 KW_NULL, // pass_thru
1204 KW_NULL, // an_pass_thru 1184 KW_NULL, // an_pass_thru
1205 KW_pick_up, 1185 KW_pick_up,
1206 KW_unique, 1186 KW_unique,
1187 /* 50 */
1207 KW_no_drop, 1188 KW_no_drop,
1208 /* 50 */
1209 KW_NULL, // wizcast 1189 KW_NULL, // wizcast
1210 KW_can_cast_spell, 1190 KW_can_cast_spell,
1211 KW_can_use_scroll, 1191 KW_can_use_scroll,
1212 KW_can_use_range, 1192 KW_can_use_range,
1213 KW_can_use_bow, 1193 KW_can_use_bow,
1214 KW_can_use_armour, 1194 KW_can_use_armour,
1215 KW_can_use_weapon, 1195 KW_can_use_weapon,
1216 KW_can_use_ring, 1196 KW_can_use_ring,
1217 KW_has_ready_range, 1197 KW_has_ready_range,
1198 /* 60 */
1218 KW_has_ready_bow, 1199 KW_has_ready_bow,
1219 /* 60 */
1220 KW_xrays, 1200 KW_xrays,
1221 KW_NULL, 1201 KW_NULL,
1222 KW_is_floor, 1202 KW_is_floor,
1223 KW_lifesave, 1203 KW_lifesave,
1224 KW_no_strength, 1204 KW_no_strength,
1225 KW_sleep, 1205 KW_sleep,
1226 KW_stand_still, 1206 KW_stand_still,
1227 KW_random_move, 1207 KW_random_move,
1228 KW_only_attack, 1208 KW_only_attack,
1209 /* 70 */
1229 KW_confused, 1210 KW_confused,
1230 /* 70 */
1231 KW_stealth, 1211 KW_stealth,
1232 KW_NULL, 1212 KW_NULL,
1233 KW_NULL, 1213 KW_NULL,
1234 KW_cursed, 1214 KW_cursed,
1235 KW_damned, 1215 KW_damned,
1236 KW_see_anywhere, 1216 KW_see_anywhere,
1237 KW_known_magical, 1217 KW_known_magical,
1238 KW_known_cursed, 1218 KW_known_cursed,
1239 KW_can_use_skill, 1219 KW_can_use_skill,
1220 /* 80 */
1240 KW_been_applied, 1221 KW_been_applied,
1241 /* 80 */
1242 KW_has_ready_scroll, 1222 KW_has_ready_scroll,
1243 KW_can_use_rod, 1223 KW_can_use_rod,
1244 KW_precious, 1224 KW_precious,
1245 KW_can_use_horn, 1225 KW_can_use_horn,
1246 KW_make_invisible, 1226 KW_make_invisible,
1247 KW_inv_locked, 1227 KW_inv_locked,
1248 KW_is_wooded, 1228 KW_is_wooded,
1249 KW_is_hilly, 1229 KW_is_hilly,
1250 KW_has_ready_skill, 1230 KW_has_ready_skill,
1231 /* 90 */
1251 KW_has_ready_weapon, 1232 KW_has_ready_weapon,
1252 /* 90 */
1253 KW_no_skill_ident, 1233 KW_no_skill_ident,
1254 KW_is_blind, 1234 KW_is_blind,
1255 KW_can_see_in_dark, 1235 KW_can_see_in_dark,
1256 KW_is_cauldron, 1236 KW_is_cauldron,
1257 KW_NULL, 1237 KW_NULL,
1258 KW_no_steal, 1238 KW_no_steal,
1259 KW_one_hit, 1239 KW_one_hit,
1260 KW_NULL, 1240 KW_NULL,
1261 KW_berserk, 1241 KW_berserk,
1242 /* 100 */
1262 KW_neutral, 1243 KW_neutral,
1263 /* 100 */
1264 KW_no_attack, 1244 KW_no_attack,
1265 KW_no_damage, 1245 KW_no_damage,
1266 KW_obj_original, 1246 KW_obj_original,
1267 KW_NULL, 1247 KW_NULL,
1268 KW_activate_on_push, 1248 KW_activate_on_push,
1269 KW_activate_on_release, 1249 KW_activate_on_release,
1270 KW_is_water, 1250 KW_is_water,
1271 KW_use_content_on_gen, 1251 KW_use_content_on_gen,
1272 KW_NULL, 1252 KW_NULL,
1253 /* 110 */
1273 KW_is_buildable, 1254 KW_is_buildable,
1274 /* 110 */
1275 KW_destroy_on_death, 1255 KW_destroy_on_death,
1276 KW_NULL, 1256 KW_NULL,
1277 }; 1257 };
1258
1259 // obj_original is the only commonly differing flag between archetype
1260 // and object, so special-case it here to be able to skip the loop
1261 static const struct flagmask : object::flags_t
1262 {
1263 flagmask ()
1264 {
1265 for (int i = 0; i < NUM_FLAGS; i++)
1266 if (flag_names [i])
1267 set (i);
1268 }
1269 } flagmask;
1278 1270
1279 /* This saves the key/value lists. We do it first so that any 1271 /* This saves the key/value lists. We do it first so that any
1280 * keys that match field names will be overwritten by the loader. 1272 * keys that match field names will be overwritten by the loader.
1281 */ 1273 */
1282 for (key_value *kv = op->key_values; kv; kv = kv->next) 1274 for (key_value *kv = op->key_values; kv; kv = kv->next)
1283 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1275 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1284 f.put (kv->key, kv->value); 1276 f.put (kv->key, kv->value);
1285 1277
1286 /* We don't need to worry about the arch's extra fields - they 1278 if (op->uuid)
1287 * will get taken care of the copy_to method. 1279 {
1288 */ 1280 // highly optimised - this is often 25% of all data written
1281 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1282 char *ptr = cur;
1289 1283
1290 f.put (KW_uuid, op->uuid.c_str ()); 1284 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1285 ptr += sizeof ("uuid ") - 1;
1286 ptr = op->uuid.append (ptr);
1287 *ptr++ = '\n';
1291 1288
1289 f.alloc (ptr - cur);
1290 }
1291
1292#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1292#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v)
1293#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1293#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1294
1295 CMP_OUT (x);
1296 CMP_OUT (y);
1297
1298 CMP_OUT (type);
1299 CMP_OUT (subtype);
1300 CMP_OUT (direction);
1301
1302 CMP_OUT (name);
1303 CMP_OUT (name_pl);
1304
1305 CMP_OUT (speed);
1306 CMP_OUT (speed_left);
1307
1308 CMP_OUT (title);
1309 CMP_OUT (race);
1310 CMP_OUT (slaying);
1311 CMP_OUT (skill);
1312
1313 CMP_OUT (tag);
1314 CMP_OUT (custom_name);
1294 1315
1295 if (object *owner = op->owner) 1316 if (object *owner = op->owner)
1296 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1317 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1297 1318
1298 CMP_OUT (name); 1319 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1299 CMP_OUT (name_pl); 1320
1300 CMP_OUT (custom_name);
1301 CMP_OUT (title);
1302 CMP_OUT (race);
1303 CMP_OUT (skill);
1304 CMP_OUT (slaying);
1305 CMP_OUT (tag);
1306 CMP_OUT (other_arch); 1321 CMP_OUT (other_arch);
1307 1322
1308 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1323 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1309 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1324 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1310 1325
1311 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1326 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1312 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1327 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1313 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1328 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1314 1329
1315 if (op->animation_id != tmp->animation_id) 1330 if (op->animation_id != arch->animation_id)
1316 if (op->animation_id) 1331 if (op->has_anim ())
1317 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1332 f.put (KW_animation, op->anim ().name);
1318 else 1333 else
1319 { 1334 {
1320 f.put (KW_animation, (const char *)0); 1335 f.put (KW_animation, (const char *)0);
1321 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1336 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1322 } 1337 }
… …
1336 CMP_OUT2 (grace, stats.grace); 1351 CMP_OUT2 (grace, stats.grace);
1337 CMP_OUT2 (maxgrace, stats.maxgrace); 1352 CMP_OUT2 (maxgrace, stats.maxgrace);
1338 CMP_OUT2 (exp, stats.exp); 1353 CMP_OUT2 (exp, stats.exp);
1339 1354
1340 CMP_OUT (perm_exp); 1355 CMP_OUT (perm_exp);
1341 CMP_OUT (expmul); 1356 //CMP_OUT (expmul);
1342 1357
1343 CMP_OUT2 (food, stats.food); 1358 CMP_OUT2 (food, stats.food);
1344 CMP_OUT2 (dam, stats.dam); 1359 CMP_OUT2 (dam, stats.dam);
1345 CMP_OUT2 (luck, stats.luck); 1360 CMP_OUT2 (luck, stats.luck);
1346 CMP_OUT2 (wc, stats.wc); 1361 CMP_OUT2 (wc, stats.wc);
1347 CMP_OUT2 (ac, stats.ac); 1362 CMP_OUT2 (ac, stats.ac);
1348 1363
1349 CMP_OUT (x);
1350 CMP_OUT (y);
1351 CMP_OUT (speed);
1352 CMP_OUT (speed_left);
1353 CMP_OUT2 (move_state, move_status); 1364 CMP_OUT2 (move_state, move_status);
1354 CMP_OUT (attack_movement); 1365 CMP_OUT (attack_movement);
1355 CMP_OUT (nrof); 1366 CMP_OUT (nrof);
1356 CMP_OUT (level); 1367 CMP_OUT (level);
1357 CMP_OUT (direction);
1358 CMP_OUT (type);
1359 CMP_OUT (subtype);
1360 CMP_OUT (attacktype); 1368 CMP_OUT (attacktype);
1361 1369
1370 // using memcmp here seems to be a loss - is gcc vectorising?
1362 for (int i = 0; i < NROFATTACKS; i++) 1371 for (int i = 0; i < NROFATTACKS; i++)
1363 if (expect_false (op->resist[i] != tmp->resist[i])) 1372 if (expect_false (op->resist[i] != arch->resist[i]))
1364 f.put (resist_save[i], op->resist[i]); 1373 f.put (resist_save[i], op->resist[i]);
1365 1374
1366 CMP_OUT (path_attuned); 1375 CMP_OUT (path_attuned);
1367 CMP_OUT (path_repelled); 1376 CMP_OUT (path_repelled);
1368 CMP_OUT (path_denied); 1377 CMP_OUT (path_denied);
1378
1369 CMP_OUT2 (material, materials);//TODO: nuke 1379 CMP_OUT2 (material, materials);//TODO: nuke
1370 CMP_OUT (materialname); 1380 if (op->material != arch->material)
1381 f.put (KW_materialname, op->material->name);
1382
1371 CMP_OUT (value); 1383 CMP_OUT (value);
1372 CMP_OUT (carrying); 1384 CMP_OUT (carrying);
1373 CMP_OUT (weight); 1385 CMP_OUT (weight);
1374 CMP_OUT (invisible); 1386 CMP_OUT (invisible);
1375 CMP_OUT (state); 1387 CMP_OUT (state);
… …
1379 CMP_OUT (last_grace); 1391 CMP_OUT (last_grace);
1380 CMP_OUT (last_eat); 1392 CMP_OUT (last_eat);
1381 CMP_OUT (glow_radius); 1393 CMP_OUT (glow_radius);
1382 1394
1383 if (op->flag [FLAG_IS_LINKED]) 1395 if (op->flag [FLAG_IS_LINKED])
1384 if (int i = get_button_value (op)) 1396 if (auto (ol, op->find_link ()))
1385 f.put (KW_connected, i); 1397 f.put (KW_connected, ol->id);
1386 1398
1387 CMP_OUT (randomitems); 1399 CMP_OUT (randomitems);
1388 CMP_OUT2 (container, weight_limit); 1400 CMP_OUT2 (container, weight_limit);
1389 1401
1390 CMP_OUT (run_away); 1402 CMP_OUT (run_away);
1391 CMP_OUT (pick_up); 1403 CMP_OUT (pick_up);
1392 CMP_OUT (will_apply); 1404 CMP_OUT (will_apply);
1393 CMP_OUT (smoothlevel); 1405 CMP_OUT (smoothlevel);
1394 CMP_OUT (weapontype); 1406 CMP_OUT (weapontype);
1395 CMP_OUT (tooltype);
1396 CMP_OUT (client_type); 1407 CMP_OUT (client_type);
1397 CMP_OUT (item_power); 1408 CMP_OUT (item_power);
1398 CMP_OUT (duration); 1409 CMP_OUT (duration);
1399 CMP_OUT (range); 1410 CMP_OUT (range);
1400 CMP_OUT (range_modifier); 1411 CMP_OUT (range_modifier);
… …
1408 CMP_OUT (move_on); 1419 CMP_OUT (move_on);
1409 CMP_OUT (move_off); 1420 CMP_OUT (move_off);
1410 CMP_OUT (move_slow); 1421 CMP_OUT (move_slow);
1411 CMP_OUT (move_slow_penalty); 1422 CMP_OUT (move_slow_penalty);
1412 1423
1413 if (op->flag != tmp->flag) 1424 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1425
1426 if (diff [FLAG_OBJ_ORIGINAL])
1427 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1428
1429 diff.reset (FLAG_OBJ_ORIGINAL);
1430
1431 // quickly test whether any other flags differ
1432 if (expect_true (diff.any ()))
1414 for (int i = 0; i <= NUM_FLAGS; i++) 1433 for (int i = 0; i < NUM_FLAGS; i++)
1415 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1434 if (expect_false (diff [i]))
1416 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1435 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1417 1436
1418 // save body locations 1437 // save body locations. gcc's memcmp does an abysmal job when used
1419 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1438 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1420 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1439 if (expect_false (op->slot[i].info != arch->slot[i].info))
1421 f.put (body_locations[i].save_name, op->slot[i].info); 1440 f.put (body_locations[i].save_name, op->slot[i].info);
1422} 1441}
1423 1442
1424/* 1443/*
1425 * Dumps all variables in an object to a file. 1444 * Dumps all variables in an object to a file.
… …
1427 * the only place this is not set is when saving the player. 1446 * the only place this is not set is when saving the player.
1428 */ 1447 */
1429bool 1448bool
1430object::write (object_freezer &f) 1449object::write (object_freezer &f)
1431{ 1450{
1432 archetype *at = arch ? arch : archetype::empty; 1451 if (is_arch ())
1433 1452 {
1453 f.put (KW_object, arch->archname);
1454 write_diff (f, this, archetype::empty);
1455 }
1456 else
1457 {
1434 f.put (KW_arch, at->archname); 1458 f.put (KW_arch, arch->archname);
1435 write_diff (f, this, at); 1459 write_diff (f, this, arch);
1460 }
1436 1461
1437 for (object *tmp = inv; tmp; tmp = tmp->below) 1462 for (object *tmp = inv; tmp; tmp = tmp->below)
1438 tmp->write (f); 1463 tmp->write (f);
1439 1464
1440 f.put (this); 1465 f.put (this);

Diff Legend

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