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.1 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.16 by root, Thu Sep 14 21:16:11 2006 UTC

1
1/* 2/*
2 CrossFire, A Multiplayer game for X-windows 3 CrossFire, A Multiplayer game for X-windows
3 4
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
… …
30#include <loader.h> 31#include <loader.h>
31#include <newserver.h> 32#include <newserver.h>
32#include <sproto.h> 33#include <sproto.h>
33 34
34/* Maps the MOVE_* values to names */ 35/* Maps the MOVE_* values to names */
35static const char *const move_name[] = {"walk", "fly_low", "fly_high", "swim", "boat", NULL}; 36static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 37
37/* This table is only necessary to convert objects that existed before the 38/* This table is only necessary to convert objects that existed before the
38 * spell object conversion to the new object. It was not practical 39 * spell object conversion to the new object. It was not practical
39 * to go through every mapping looking for every potion, rod, wand, etc 40 * to go through every mapping looking for every potion, rod, wand, etc
40 * that had a sp set and update to the new value. So this maps the 41 * that had a sp set and update to the new value. So this maps the
… …
43 * new spell won't have been used, and thus won't have any legacy object. 44 * new spell won't have been used, and thus won't have any legacy object.
44 * NULL entries in this table are valid - to denote objects that should 45 * NULL entries in this table are valid - to denote objects that should
45 * not be updated for whatever reason. 46 * not be updated for whatever reason.
46 */ 47 */
47const char *spell_mapping[] = { 48const char *spell_mapping[] = {
48"spell_magic_bullet", /* 0 */ 49 "spell_magic_bullet", /* 0 */
49"spell_small_fireball", /* 1 */ 50 "spell_small_fireball", /* 1 */
50"spell_medium_fireball", /* 2 */ 51 "spell_medium_fireball", /* 2 */
51"spell_large_fireball", /* 3 */ 52 "spell_large_fireball", /* 3 */
52"spell_burning_hands", /* 4 */ 53 "spell_burning_hands", /* 4 */
53"spell_sm_lightning", /* 5 */ 54 "spell_sm_lightning", /* 5 */
54"spell_large_lightning", /* 6 */ 55 "spell_large_lightning", /* 6 */
55"spell_magic_missile", /* 7 */ 56 "spell_magic_missile", /* 7 */
56"spell_create_bomb", /* 8 */ 57 "spell_create_bomb", /* 8 */
57"spell_summon_golem", /* 9 */ 58 "spell_summon_golem", /* 9 */
58"spell_summon_fire_elemental", /* 10 */ 59 "spell_summon_fire_elemental", /* 10 */
59"spell_summon_earth_elemental", /* 11 */ 60 "spell_summon_earth_elemental", /* 11 */
60"spell_summon_water_elemental", /* 12 */ 61 "spell_summon_water_elemental", /* 12 */
61"spell_summon_air_elemental", /* 13 */ 62 "spell_summon_air_elemental", /* 13 */
62"spell_dimension_door", /* 14 */ 63 "spell_dimension_door", /* 14 */
63"spell_create_earth_wall", /* 15 */ 64 "spell_create_earth_wall", /* 15 */
64"spell_paralyze", /* 16 */ 65 "spell_paralyze", /* 16 */
65"spell_icestorm", /* 17 */ 66 "spell_icestorm", /* 17 */
66"spell_magic_mapping", /* 18 */ 67 "spell_magic_mapping", /* 18 */
67"spell_turn_undead", /* 19 */ 68 "spell_turn_undead", /* 19 */
68"spell_fear", /* 20 */ 69 "spell_fear", /* 20 */
69"spell_poison_cloud", /* 21 */ 70 "spell_poison_cloud", /* 21 */
70"spell_wonder", /* 22 */ 71 "spell_wonder", /* 22 */
71"spell_destruction", /* 23 */ 72 "spell_destruction", /* 23 */
72"spell_perceive_self", /* 24 */ 73 "spell_perceive_self", /* 24 */
73"spell_word_of_recall", /* 25 */ 74 "spell_word_of_recall", /* 25 */
74"spell_invisible", /* 26 */ 75 "spell_invisible", /* 26 */
75"spell_invisible_to_undead", /* 27 */ 76 "spell_invisible_to_undead", /* 27 */
76"spell_probe", /* 28 */ 77 "spell_probe", /* 28 */
77"spell_lg_magic_bullet", /* 29 */ 78 "spell_lg_magic_bullet", /* 29 */
78"spell_improved_invisibility", /* 30 */ 79 "spell_improved_invisibility", /* 30 */
79"spell_holy_word", /* 31 */ 80 "spell_holy_word", /* 31 */
80"spell_minor_healing", /* 32 */ 81 "spell_minor_healing", /* 32 */
81"spell_medium_healing", /* 33 */ 82 "spell_medium_healing", /* 33 */
82"spell_major_healing", /* 34 */ 83 "spell_major_healing", /* 34 */
83"spell_heal", /* 35 */ 84 "spell_heal", /* 35 */
84"spell_create_food", /* 36 */ 85 "spell_create_food", /* 36 */
85"spell_earth_to_dust", /* 37 */ 86 "spell_earth_to_dust", /* 37 */
86"spell_armour", /* 38 */ 87 "spell_armour", /* 38 */
87"spell_strength", /* 39 */ 88 "spell_strength", /* 39 */
88"spell_dexterity", /* 40 */ 89 "spell_dexterity", /* 40 */
89"spell_constitution", /* 41 */ 90 "spell_constitution", /* 41 */
90"spell_charisma", /* 42 */ 91 "spell_charisma", /* 42 */
91"spell_create_fire_wall", /* 43 */ 92 "spell_create_fire_wall", /* 43 */
92"spell_create_frost_wall", /* 44 */ 93 "spell_create_frost_wall", /* 44 */
93"spell_protection_from_cold", /* 45 */ 94 "spell_protection_from_cold", /* 45 */
94"spell_protection_from_electricity", /* 46 */ 95 "spell_protection_from_electricity", /* 46 */
95"spell_protection_from_fire", /* 47 */ 96 "spell_protection_from_fire", /* 47 */
96"spell_protection_from_poison", /* 48 */ 97 "spell_protection_from_poison", /* 48 */
97"spell_protection_from_slow", /* 49 */ 98 "spell_protection_from_slow", /* 49 */
98"spell_protection_from_paralysis", /* 50 */ 99 "spell_protection_from_paralysis", /* 50 */
99"spell_protection_from_draining", /* 51 */ 100 "spell_protection_from_draining", /* 51 */
100"spell_protection_from_magic", /* 52 */ 101 "spell_protection_from_magic", /* 52 */
101"spell_protection_from_attack", /* 53 */ 102 "spell_protection_from_attack", /* 53 */
102"spell_levitate", /* 54 */ 103 "spell_levitate", /* 54 */
103"spell_small_speedball", /* 55 */ 104 "spell_small_speedball", /* 55 */
104"spell_large_speedball", /* 56 */ 105 "spell_large_speedball", /* 56 */
105"spell_hellfire", /* 57 */ 106 "spell_hellfire", /* 57 */
106"spell_dragonbreath", /* 58 */ 107 "spell_dragonbreath", /* 58 */
107"spell_large_icestorm", /* 59 */ 108 "spell_large_icestorm", /* 59 */
108"spell_charging", /* 60 */ 109 "spell_charging", /* 60 */
109"spell_polymorph", /* 61 */ 110 "spell_polymorph", /* 61 */
110"spell_cancellation", /* 62 */ 111 "spell_cancellation", /* 62 */
111"spell_confusion", /* 63 */ 112 "spell_confusion", /* 63 */
112"spell_mass_confusion", /* 64 */ 113 "spell_mass_confusion", /* 64 */
113"spell_summon_pet_monster", /* 65 */ 114 "spell_summon_pet_monster", /* 65 */
114"spell_slow", /* 66 */ 115 "spell_slow", /* 66 */
115"spell_regenerate_spellpoints", /* 67 */ 116 "spell_regenerate_spellpoints", /* 67 */
116"spell_cure_poison", /* 68 */ 117 "spell_cure_poison", /* 68 */
117"spell_protection_from_confusion", /* 69 */ 118 "spell_protection_from_confusion", /* 69 */
118"spell_protection_from_cancellation", /* 70 */ 119 "spell_protection_from_cancellation", /* 70 */
119"spell_protection_from_depletion", /* 71 */ 120 "spell_protection_from_depletion", /* 71 */
120"spell_alchemy", /* 72 */ 121 "spell_alchemy", /* 72 */
121"spell_remove_curse", /* 73 */ 122 "spell_remove_curse", /* 73 */
122"spell_remove_damnation", /* 74 */ 123 "spell_remove_damnation", /* 74 */
123"spell_identify", /* 75*/ 124 "spell_identify", /* 75 */
124"spell_detect_magic", /* 76 */ 125 "spell_detect_magic", /* 76 */
125"spell_detect_monster", /* 77 */ 126 "spell_detect_monster", /* 77 */
126"spell_detect_evil", /* 78 */ 127 "spell_detect_evil", /* 78 */
127"spell_detect_curse", /* 79 */ 128 "spell_detect_curse", /* 79 */
128"spell_heroism", /* 80 */ 129 "spell_heroism", /* 80 */
129"spell_aggravation", /* 81 */ 130 "spell_aggravation", /* 81 */
130"spell_firebolt", /* 82 */ 131 "spell_firebolt", /* 82 */
131"spell_frostbolt", /* 83 */ 132 "spell_frostbolt", /* 83 */
132"spell_shockwave", /* 84 */ 133 "spell_shockwave", /* 84 */
133"spell_color_spray", /* 85 */ 134 "spell_color_spray", /* 85 */
134"spell_haste", /* 86 */ 135 "spell_haste", /* 86 */
135"spell_face_of_death", /* 87 */ 136 "spell_face_of_death", /* 87 */
136"spell_ball_lightning", /* 88 */ 137 "spell_ball_lightning", /* 88 */
137"spell_meteor_swarm", /* 89 */ 138 "spell_meteor_swarm", /* 89 */
138"spell_comet", /* 90 */ 139 "spell_comet", /* 90 */
139"spell_mystic_fist", /* 91 */ 140 "spell_mystic_fist", /* 91 */
140"spell_raise_dead", /* 92 */ 141 "spell_raise_dead", /* 92 */
141"spell_resurrection", /* 93 */ 142 "spell_resurrection", /* 93 */
142"spell_reincarnation", /* 94 */ 143 "spell_reincarnation", /* 94 */
143"spell_immunity_to_cold", /* 95 */ 144 "spell_immunity_to_cold", /* 95 */
144"spell_immunity_to_electricity",/* 96 */ 145 "spell_immunity_to_electricity", /* 96 */
145"spell_immunity_to_fire", /* 97 */ 146 "spell_immunity_to_fire", /* 97 */
146"spell_immunity_to_poison", /* 98 */ 147 "spell_immunity_to_poison", /* 98 */
147"spell_immunity_to_slow", /* 99 */ 148 "spell_immunity_to_slow", /* 99 */
148"spell_immunity_to_paralysis", /* 100 */ 149 "spell_immunity_to_paralysis", /* 100 */
149"spell_immunity_to_draining", /* 101 */ 150 "spell_immunity_to_draining", /* 101 */
150"spell_immunity_to_magic", /* 102 */ 151 "spell_immunity_to_magic", /* 102 */
151"spell_immunity_to_attack", /* 103 */ 152 "spell_immunity_to_attack", /* 103 */
152"spell_invulnerability", /* 104 */ 153 "spell_invulnerability", /* 104 */
153"spell_defense", /* 105 */ 154 "spell_defense", /* 105 */
154"spell_rune_of_fire", /* 106 */ 155 "spell_rune_of_fire", /* 106 */
155"spell_rune_of_frost", /* 107 */ 156 "spell_rune_of_frost", /* 107 */
156"spell_rune_of_shocking", /* 108 */ 157 "spell_rune_of_shocking", /* 108 */
157"spell_rune_of_blasting", /* 109 */ 158 "spell_rune_of_blasting", /* 109 */
158"spell_rune_of_death", /* 110 */ 159 "spell_rune_of_death", /* 110 */
159"spell_marking_rune", /* 111 */ 160 "spell_marking_rune", /* 111 */
160"spell_build_director", /* 112 */ 161 "spell_build_director", /* 112 */
161"spell_create_pool_of_chaos", /* 113 */ 162 "spell_create_pool_of_chaos", /* 113 */
162"spell_build_bullet_wall", /* 114 */ 163 "spell_build_bullet_wall", /* 114 */
163"spell_build_lightning_wall", /* 115 */ 164 "spell_build_lightning_wall", /* 115 */
164"spell_build_fireball_wall", /* 116 */ 165 "spell_build_fireball_wall", /* 116 */
165"spell_magic_rune", /* 117 */ 166 "spell_magic_rune", /* 117 */
166"spell_rune_of_magic_drain", /* 118 */ 167 "spell_rune_of_magic_drain", /* 118 */
167"spell_antimagic_rune", /* 119 */ 168 "spell_antimagic_rune", /* 119 */
168"spell_rune_of_transference", /* 120 */ 169 "spell_rune_of_transference", /* 120 */
169"spell_transference", /* 121 */ 170 "spell_transference", /* 121 */
170"spell_magic_drain", /* 122 */ 171 "spell_magic_drain", /* 122 */
171"spell_counterspell", /* 123 */ 172 "spell_counterspell", /* 123 */
172"spell_disarm", /* 124 */ 173 "spell_disarm", /* 124 */
173"spell_cure_confusion", /* 125 */ 174 "spell_cure_confusion", /* 125 */
174"spell_restoration", /* 126 */ 175 "spell_restoration", /* 126 */
175"was summon evil monster", /* 127 */ /* Not implenented as nothing used it */ 176 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */
176"spell_counterwall", /* 128 */ 177 "spell_counterwall", /* 128 */
177"spell_cause_light_wounds", /* 129 */ 178 "spell_cause_light_wounds", /* 129 */
178"spell_cause_medium_wounds", /* 130 */ 179 "spell_cause_medium_wounds", /* 130 */
179"spell_cause_heavy_wounds", /* 131 */ 180 "spell_cause_heavy_wounds", /* 131 */
180"spell_charm_monsters", /* 132 */ 181 "spell_charm_monsters", /* 132 */
181"spell_banishment", /* 133 */ 182 "spell_banishment", /* 133 */
182"spell_create_missile", /* 134 */ 183 "spell_create_missile", /* 134 */
183"spell_show_invisible", /* 135 */ 184 "spell_show_invisible", /* 135 */
184"spell_xray", /* 136 */ 185 "spell_xray", /* 136 */
185"spell_pacify", /* 137 */ 186 "spell_pacify", /* 137 */
186"spell_summon_fog", /* 138 */ 187 "spell_summon_fog", /* 138 */
187"spell_steambolt", /* 139 */ 188 "spell_steambolt", /* 139 */
188"spell_command_undead", /* 140 */ 189 "spell_command_undead", /* 140 */
189"spell_holy_orb", /* 141 */ 190 "spell_holy_orb", /* 141 */
190"spell_summon_avatar", /* 142 */ 191 "spell_summon_avatar", /* 142 */
191"spell_holy_possession", /* 143 */ 192 "spell_holy_possession", /* 143 */
192"spell_bless", /* 144 */ 193 "spell_bless", /* 144 */
193"spell_curse", /* 145 */ 194 "spell_curse", /* 145 */
194"spell_regeneration", /* 146 */ 195 "spell_regeneration", /* 146 */
195"spell_consecrate", /* 147 */ 196 "spell_consecrate", /* 147 */
196"spell_summon_cult_monsters", /* 148 */ 197 "spell_summon_cult_monsters", /* 148 */
197"spell_cause_critical_wounds", /* 149 */ 198 "spell_cause_critical_wounds", /* 149 */
198"spell_holy_wrath", /* 150 */ 199 "spell_holy_wrath", /* 150 */
199"spell_retributive_strike", /* 151 */ 200 "spell_retributive_strike", /* 151 */
200"spell_finger_of_death", /* 152 */ 201 "spell_finger_of_death", /* 152 */
201"spell_insect_plague", /* 153 */ 202 "spell_insect_plague", /* 153 */
202"spell_call_holy_servant", /* 154 */ 203 "spell_call_holy_servant", /* 154 */
203"spell_wall_of_thorns", /* 155 */ 204 "spell_wall_of_thorns", /* 155 */
204"spell_staff_to_snake", /* 156 */ 205 "spell_staff_to_snake", /* 156 */
205"spell_light", /* 157 */ 206 "spell_light", /* 157 */
206"spell_darkness", /* 158 */ 207 "spell_darkness", /* 158 */
207"spell_nightfall", /* 159 */ 208 "spell_nightfall", /* 159 */
208"spell_daylight", /* 160 */ 209 "spell_daylight", /* 160 */
209"spell_sunspear", /* 161 */ 210 "spell_sunspear", /* 161 */
210"spell_faery_fire", /* 162 */ 211 "spell_faery_fire", /* 162 */
211"spell_cure_blindness", /* 163 */ 212 "spell_cure_blindness", /* 163 */
212"spell_dark_vision", /* 164 */ 213 "spell_dark_vision", /* 164 */
213"spell_bullet_swarm", /* 165 */ 214 "spell_bullet_swarm", /* 165 */
214"spell_bullet_storm", /* 166 */ 215 "spell_bullet_storm", /* 166 */
215"spell_cause_many_wounds", /* 167 */ 216 "spell_cause_many_wounds", /* 167 */
216"spell_small_snowstorm", /* 168 */ 217 "spell_small_snowstorm", /* 168 */
217"spell_medium_snowstorm", /* 169 */ 218 "spell_medium_snowstorm", /* 169 */
218"spell_large_snowstorm", /* 170 */ 219 "spell_large_snowstorm", /* 170 */
219"spell_cure_disease", /* 171 */ 220 "spell_cure_disease", /* 171 */
220"spell_cause_red_death", /* 172 */ 221 "spell_cause_red_death", /* 172 */
221"spell_cause_flu", /* 173 */ 222 "spell_cause_flu", /* 173 */
222"spell_cause_black_death", /* 174 */ 223 "spell_cause_black_death", /* 174 */
223"spell_cause_leprosy", /* 175 */ 224 "spell_cause_leprosy", /* 175 */
224"spell_cause_smallpox", /* 176 */ 225 "spell_cause_smallpox", /* 176 */
225"spell_cause_white_death", /* 177 */ 226 "spell_cause_white_death", /* 177 */
226"spell_cause_anthrax", /* 178 */ 227 "spell_cause_anthrax", /* 178 */
227"spell_cause_typhoid", /* 179 */ 228 "spell_cause_typhoid", /* 179 */
228"spell_mana_blast", /* 180 */ 229 "spell_mana_blast", /* 180 */
229"spell_small_manaball", /* 181 */ 230 "spell_small_manaball", /* 181 */
230"spell_medium_manaball", /* 182 */ 231 "spell_medium_manaball", /* 182 */
231"spell_large_manaball", /* 183 */ 232 "spell_large_manaball", /* 183 */
232"spell_manabolt", /* 184 */ 233 "spell_manabolt", /* 184 */
233"spell_dancing_sword", /* 185 */ 234 "spell_dancing_sword", /* 185 */
234"spell_animate_weapon", /* 186 */ 235 "spell_animate_weapon", /* 186 */
235"spell_cause_cold", /* 187 */ 236 "spell_cause_cold", /* 187 */
236"spell_divine_shock", /* 188 */ 237 "spell_divine_shock", /* 188 */
237"spell_windstorm", /* 189 */ 238 "spell_windstorm", /* 189 */
238"spell_sanctuary", /* 190 */ 239 "spell_sanctuary", /* 190 */
239"spell_peace", /* 191 */ 240 "spell_peace", /* 191 */
240"spell_spiderweb", /* 192 */ 241 "spell_spiderweb", /* 192 */
241"spell_conflict", /* 193 */ 242 "spell_conflict", /* 193 */
242"spell_rage", /* 194 */ 243 "spell_rage", /* 194 */
243"spell_forked_lightning", /* 195 */ 244 "spell_forked_lightning", /* 195 */
244"spell_poison_fog", /* 196 */ 245 "spell_poison_fog", /* 196 */
245"spell_flaming_aura", /* 197 */ 246 "spell_flaming_aura", /* 197 */
246"spell_vitriol", /* 198 */ 247 "spell_vitriol", /* 198 */
247"spell_vitriol_splash", /* 199 */ 248 "spell_vitriol_splash", /* 199 */
248"spell_iron_skin", /* 200 */ 249 "spell_iron_skin", /* 200 */
249"spell_wrathful_eye", /* 201 */ 250 "spell_wrathful_eye", /* 201 */
250"spell_town_portal", /* 202 */ 251 "spell_town_portal", /* 202 */
251"spell_missile_swarm", /* 203 */ 252 "spell_missile_swarm", /* 203 */
252"spell_cause_rabies", /* 204 */ 253 "spell_cause_rabies", /* 204 */
253"spell_glyph", /* 205 */ 254 "spell_glyph", /* 205 */
254NULL 255 NULL
255}; 256};
256 257
257extern int arch_init; 258extern int arch_init;
258
259// return a suitable strign describign an objetc in enough detail to find it
260// used only in check_loaded_object: TODO remove static, move it elsewhere and
261// use it in more log messages.
262static char *op_debug_info_ (object *op, char *info)
263{
264 char info2[256 * 3];
265 char *p = info;
266
267 p += snprintf (p, 256, "%d=\"%s%s%s\"",
268 op->count,
269 op->name ? (const char *)op->name : "(anon)",
270 op->title ? " " : "",
271 op->title ? (const char *)op->title : "");
272
273 if (op->env)
274 p += snprintf (p, 256, "(in %s)", op_debug_info_ (op->env, info2));
275
276 if (op->map)
277 p += snprintf (p, 256, "(on %s@%d+%d)", op->map->path, op->x, op->y);
278
279 return info;
280}
281
282static char *op_debug_info (object *op)
283{
284 static char info[256 * 3];
285
286 return op_debug_info_ (op, info);
287}
288 259
289/* This function checks the object after it has been loaded (when we 260/* This function checks the object after it has been loaded (when we
290 * get the 'end' in the input stream). This function can be used to 261 * get the 'end' in the input stream). This function can be used to
291 * deal with legacy objects where fields may have changed. It can also be used 262 * deal with legacy objects where fields may have changed. It can also be used
292 * to check for objects to make sure there are no common errors. 263 * to check for objects to make sure there are no common errors.
293 */ 264 */
265static void
294static void check_loaded_object(object *op) { 266check_loaded_object (object *op)
267{
295 int ip; 268 int ip;
296 269
297 /* We do some specialized handling to handle legacy cases of name_pl. 270 /* We do some specialized handling to handle legacy cases of name_pl.
298 * If the object doesn't have a name_pl, we just use the object name - 271 * If the object doesn't have a name_pl, we just use the object name -
299 * this isn't perfect (things won't be properly pluralized), but works to 272 * this isn't perfect (things won't be properly pluralized), but works to
300 * that degree (5 heart is still quite understandable). But the case we 273 * that degree (5 heart is still quite understandable). But the case we
301 * also have to catch is if this object is not using the normal name for 274 * also have to catch is if this object is not using the normal name for
302 * the object. In that case, we also want to use the loaded name. 275 * the object. In that case, we also want to use the loaded name.
303 * Otherwise, what happens is that the the plural name will lose 276 * Otherwise, what happens is that the the plural name will lose
304 * information (appear as just 'hearts' and not 'goblins heart') 277 * information (appear as just 'hearts' and not 'goblins heart')
305 */ 278 */
306 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 279 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)
307 op->name_pl = NULL; 280 op->name_pl = NULL;
308 281
282 if (!op->name_pl)
309 if (!op->name_pl) op->name_pl = op->name; 283 op->name_pl = op->name;
310 284
311 /* objects now have a materialname. try to patch it in */ 285 /* objects now have a materialname. try to patch it in */
312 if (!(IS_WEAPON(op) && op->level > 0)) { 286 if (!(IS_WEAPON (op) && op->level > 0))
287 {
313 if (op->map != NULL) 288 if (op->map != NULL)
314 set_materialname(op, op->map->difficulty, NULL); 289 set_materialname (op, op->map->difficulty, NULL);
315 else 290 else
316 set_materialname(op, 5, NULL); 291 set_materialname (op, 5, NULL);
317 } 292 }
318 /* only do these when program is first run - a bit 293 /* only do these when program is first run - a bit
319 * excessive to do this at every run - most of this is 294 * excessive to do this at every run - most of this is
320 * really just to catch any errors - program will still run, but 295 * really just to catch any errors - program will still run, but
321 * not in the ideal fashion. 296 * not in the ideal fashion.
322 */ 297 */
323 if ((op->type == WEAPON || op->type==BOW) && arch_init) { 298 if ((op->type == WEAPON || op->type == BOW) && arch_init)
299 {
324 if (!op->skill) { 300 if (!op->skill)
301 {
325 LOG(llevError,"Weapon %s lacks a skill.\n", op_debug_info (op)); 302 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
303 }
326 } else if ((!strcmp(op->skill,"one handed weapons") && op->body_info[1] != -1) || 304 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
327 (!strcmp(op->skill,"two handed weapons") && op->body_info[1] != -2)) { 305 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
328 LOG(llevError,"weapon %s arm usage does not match skill: %d, %s\n", 306 {
329 op_debug_info (op), op->body_info[1], &op->skill); 307 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
330 } 308 }
331 } 309 }
332 310
333 /* We changed last_heal to gen_sp_armour, which is what it 311 /* We changed last_heal to gen_sp_armour, which is what it
334 * really does for many objects. Need to catch any in maps 312 * really does for many objects. Need to catch any in maps
335 * that may have an old value. 313 * that may have an old value.
336 */ 314 */
337 if ((op->type == WEAPON) || 315 if ((op->type == WEAPON) ||
338 (op->type == ARMOUR) || (op->type == HELMET) || 316 (op->type == ARMOUR) || (op->type == HELMET) ||
339 (op->type == SHIELD) || (op->type == RING) || 317 (op->type == SHIELD) || (op->type == RING) ||
340 (op->type == BOOTS) || (op->type == GLOVES) || 318 (op->type == BOOTS) || (op->type == GLOVES) ||
341 (op->type == AMULET ) || (op->type == GIRDLE) || 319 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))
342 (op->type == BRACERS ) || (op->type == CLOAK)) { 320 {
343 if (op->last_heal) { 321 if (op->last_heal)
322 {
344 LOG(llevDebug,"Object %s still has last_heal set, not gen_sp_armour\n", op_debug_info (op)); 323 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
345 op->gen_sp_armour = op->last_heal; 324 op->gen_sp_armour = op->last_heal;
346 op->last_heal = 0; 325 op->last_heal = 0;
347 } 326 }
348 if (editor) ip =0; 327 if (editor)
328 ip = 0;
329 else
349 else ip = calc_item_power(op, 0); 330 ip = calc_item_power (op, 0);
350 /* Legacy objects from before item power was in the game */ 331 /* Legacy objects from before item power was in the game */
351 if (!op->item_power && ip) { 332 if (!op->item_power && ip)
333 {
352 if (ip > 3) { 334 if (ip > 3)
335 {
353 LOG(llevDebug,"Object %s had no item power, using %d\n", op_debug_info (op), ip); 336 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
354 } 337 }
355 op->item_power = ip; 338 op->item_power = ip;
356 } 339 }
357 /* Check for possibly bogus values. Has to meet both these criteria - 340 /* Check for possibly bogus values. Has to meet both these criteria -
358 * something that has item_power 1 is probably just fine if our calculated 341 * something that has item_power 1 is probably just fine if our calculated
359 * value is 1 or 2 - these values are small enough that hard to be precise. 342 * value is 1 or 2 - these values are small enough that hard to be precise.
360 * similarly, it item_power is 0, the first check will always pass, 343 * similarly, it item_power is 0, the first check will always pass,
361 * but not the second one. 344 * but not the second one.
362 */ 345 */
363 if (ip > 2 *op->item_power && ip > (op->item_power + 3)) { 346 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
347 {
364 LOG(llevDebug,"Object %s seems to have too low item power? %d > %d\n", 348 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
365 op_debug_info (op), ip, op->item_power);
366 } 349 }
367 350
368 } 351 }
369 /* Old spellcasting object - need to load in the appropiate object */ 352 /* Old spellcasting object - need to load in the appropiate object */
370 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN 353 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
371 || op->type == FIREWALL ||
372 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 354 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
373 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) { 355 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)
356 {
374 object *tmp; 357 object *tmp;
375 358
376 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 359 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
377 * in that spell was stored in sp. 360 * in that spell was stored in sp.
378 */ 361 */
379 tmp = get_archetype(spell_mapping[op->type == FIREWALL?op->stats.dam:op->stats.sp]); 362 tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
380 insert_ob_in_ob(tmp, op); 363 insert_ob_in_ob (tmp, op);
381 op->randomitems = NULL; /* So another spell isn't created for this object */ 364 op->randomitems = NULL; /* So another spell isn't created for this object */
382 } 365 }
383 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 366 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
384 367
385 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) { 368 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)
369 {
386 object *tmp; 370 object *tmp;
387 371
388 tmp = get_archetype_by_object_name(op->slaying); 372 tmp = get_archetype_by_object_name (op->slaying);
389 insert_ob_in_ob(tmp, op); 373 insert_ob_in_ob (tmp, op);
390 op->randomitems = NULL; /* So another spell isn't created for this object */ 374 op->randomitems = NULL; /* So another spell isn't created for this object */
391 /* without this, value is all screwed up */ 375 /* without this, value is all screwed up */
392 op->value = op->arch->clone.value * op->inv->value; 376 op->value = op->arch->clone.value * op->inv->value;
393 } 377 }
394 378
395 if (QUERY_FLAG(op, FLAG_MONSTER)) { 379 if (QUERY_FLAG (op, FLAG_MONSTER))
380 {
396 if (op->stats.hp > op->stats.maxhp) 381 if (op->stats.hp > op->stats.maxhp)
397 LOG(llevDebug,"Monster %s has hp set higher than maxhp (%d>%d)\n", 382 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
398 op_debug_info (op),
399 op->stats.hp, op->stats.maxhp);
400 383
401 /* The archs just need to be updated for this */ 384 /* The archs just need to be updated for this */
402 if (op->move_type ==0) op->move_type = MOVE_WALK; 385 if (op->move_type == 0)
386 op->move_type = MOVE_WALK;
403 } 387 }
404 if ((QUERY_FLAG(op,FLAG_GENERATOR) && QUERY_FLAG(op,FLAG_CONTENT_ON_GEN)) 388
405 || op->type == CREATOR 389 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)
406 || op->type == CONVERTER) { 390 {
407 /* Object will duplicate it's content as part of the 391 /* Object will duplicate it's content as part of the
408 * generation process. To do this, we must flag inventory 392 * generation process. To do this, we must flag inventory
409 * so it remains unevaluated concerning the randomitems and 393 * so it remains unevaluated concerning the randomitems and
410 * the living (a demonlord shouldn't cast from inside generator!) 394 * the living (a demonlord shouldn't cast from inside generator!)
411 */ 395 */
412 flag_inv(op,FLAG_IS_A_TEMPLATE); 396 flag_inv (op, FLAG_IS_A_TEMPLATE);
413 } 397 }
414 398
415 /* Handle player movers. We use move_type for player movers 399 /* Handle player movers. We use move_type for player movers
416 * because they operate on their own time (move_on 400 * because they operate on their own time (move_on
417 * would potentially cause them to be triggered when someone steps 401 * would potentially cause them to be triggered when someone steps
418 * on them). If move_type is set, presume person knows what they 402 * on them). If move_type is set, presume person knows what they
419 * are doing, otherwise, set move_type based on maxhp value. 403 * are doing, otherwise, set move_type based on maxhp value.
420 */ 404 */
421 if (op->type == PLAYERMOVER) { 405 if (op->type == PLAYERMOVER)
406 {
422 if (!op->move_type) { 407 if (!op->move_type)
408 {
423 if (op->stats.maxhp) { 409 if (op->stats.maxhp)
410 {
424 op->move_type = MOVE_ALL; 411 op->move_type = MOVE_ALL;
425 op->stats.maxhp=0; 412 op->stats.maxhp = 0;
413 }
426 } else { 414 else
415 {
427 op->move_type = MOVE_WALK; 416 op->move_type = MOVE_WALK;
428 } 417 }
429 } 418 }
430 } 419 }
431 420
432} 421}
433 422
434static void 423static void
435set_move (MoveType &mt, const char *str) 424set_move (MoveType & mt, const char *str)
436{ 425{
437 if (!str) 426 if (!str)
438 { 427 {
439 mt = 0; 428 mt = 0;
440 return; 429 return;
… …
446 return; 435 return;
447 } 436 }
448 437
449 mt = 0; 438 mt = 0;
450 439
451 for (str = strtok ((char *)str, " "); str; str = strtok (0, " ")) 440 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
452 { 441 {
453 if (!strcasecmp (str, "all")) 442 if (!strcasecmp (str, "all"))
454 mt |= MOVE_ALL; 443 mt |= MOVE_ALL;
455 else 444 else
456 { 445 {
… …
460 { 449 {
461 negate = 1; 450 negate = 1;
462 str++; 451 str++;
463 } 452 }
464 453
465 for (i = 0; move_name [i]; i++) 454 for (i = 0; move_name[i]; i++)
466 { 455 {
467 if (!strcasecmp (move_name [i], str)) 456 if (!strcasecmp (move_name[i], str))
468 { 457 {
469 if (negate) 458 if (negate)
470 mt &= ~(1 << i); 459 mt &= ~(1 << i);
471 else 460 else
472 mt |= (1 << i); 461 mt |= (1 << i);
473 462
474 break; 463 break;
475 } 464 }
476 } 465 }
477 466
478 if (!move_name [i]) 467 if (!move_name[i])
479 { 468 {
480 /* fly is a special case - covers both fly_low and 469 /* fly is a special case - covers both fly_low and
481 * fly_high - since it doesn't match to a specific 470 * fly_high - since it doesn't match to a specific
482 * single bit, have to special case it. 471 * single bit, have to special case it.
483 */ 472 */
… …
499 if (thawer.get_sint32 ()) \ 488 if (thawer.get_sint32 ()) \
500 SET_FLAG (op, flag); \ 489 SET_FLAG (op, flag); \
501 else \ 490 else \
502 CLEAR_FLAG (op, flag) \ 491 CLEAR_FLAG (op, flag) \
503 492
493int
504int parse_object (object * op, object_thawer & thawer, int map_flags) 494parse_object (object *op, object_thawer & thawer, int map_flags)
505{ 495{
506 bool ismore = 0; 496 bool ismore = 0;
497 object *op_inv = op->inv;
507 498
508 for (;;) 499 for (;;)
509 { 500 {
510 keyword kw = thawer.get_kv (); 501 keyword kw = thawer.get_kv ();
511 502
512 switch (kw) 503 switch (kw)
513 { 504 {
505 case KW_Object: // uppercase alias
514 case KW_object: 506 case KW_object:
515 thawer.get (op->name); 507 thawer.get (op->name);
516 508
517 if (op->arch != NULL) 509 if (op->arch != NULL)
518 op->arch->name = op->name; 510 op->arch->name = op->name;
519 511
520 break; 512 break;
521 513
514 case KW_uuid:
515 if (const char *s = thawer.get_str ())
516 {
517 unsigned int version;
518 unsigned long long seq;
519
520 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
521 {
522 op->uuid.seq = seq;
523 break;
524 }
525 }
526
527 op->uuid = gen_uuid ();
528 break;
529
530 case KW_oid:
522 case KW_oid: thawer.get (op, thawer.get_sint32 ()); break; 531 thawer.get (op, thawer.get_sint32 ());
532 break;
523 533
524 case KW_name: thawer.get (op->name); break; 534 case KW_name:
525 case KW_name_pl: thawer.get (op->name_pl); break; 535 thawer.get (op->name);
526 case KW_title: thawer.get (op->title); break; 536 break;
527 case KW_custom_name: thawer.get (op->custom_name); break; 537 case KW_name_pl:
538 thawer.get (op->name_pl);
539 break;
540 case KW_title:
541 thawer.get (op->title);
542 break;
543 case KW_custom_name:
544 thawer.get (op->custom_name);
545 break;
546 case KW_attach:
528 case KW_attach: thawer.get_ornull (op->attach); break; 547 thawer.get_ornull (op->attach);
548 break;
549 case KW_skill:
529 case KW_skill: thawer.get_ornull (op->skill); break; 550 thawer.get_ornull (op->skill);
551 break;
552 case KW_race:
530 case KW_race: thawer.get_ornull (op->race); break; 553 thawer.get_ornull (op->race);
554 break;
555 case KW_slaying:
531 case KW_slaying: thawer.get_ornull (op->slaying); break; 556 thawer.get_ornull (op->slaying);
557 break;
532 558
533 case KW_arch: 559 case KW_arch:
534 { 560 {
535 const char *str = thawer.get_str (); 561 const char *str = thawer.get_str ();
536 562
… …
538 { 564 {
539 /* If op->arch has been set, then this new object 565 /* If op->arch has been set, then this new object
540 * must be part of the inventory. So process 566 * must be part of the inventory. So process
541 * appropriately. 567 * appropriately.
542 */ 568 */
543 archetype *arch = find_archetype (str); 569 archetype *arch = archetype::find (str);
544 570
545 object *tmp; 571 object *tmp;
546 572
547 if (arch != NULL) 573 if (arch != NULL)
548 tmp = arch_to_object (arch); 574 tmp = arch_to_object (arch);
… …
554 } 580 }
555 581
556 parse_object (tmp, thawer, map_flags); 582 parse_object (tmp, thawer, map_flags);
557 583
558 if (tmp->arch) 584 if (tmp->arch)
585 {
559 insert_ob_in_ob (tmp, op); 586 // was: insert_ob_in_ob (tmp, op);
587 // but manually adding it can improve map loading times a lot
588 // also, appending instead of prepending keeps the
589 // save ordering the same between repeated load/saves.
590 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
591 CLEAR_FLAG (tmp, FLAG_REMOVED);
592
593 if (!op_inv)
594 {
595 op->inv = tmp;
596 tmp->above = 0;
597 }
598 else
599 {
600 while (op_inv->below)
601 op_inv = op_inv->below;
602
603 op_inv->below = tmp;
604 tmp->above = op_inv;
605 }
606
607 tmp->below = 0;
608 tmp->env = op;
609 op_inv = tmp;
610 }
560 else 611 else
561 { 612 {
562 LOG (llevDebug, "Discarding object without arch: %s\n", 613 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
563 tmp->name ? (const char *) tmp->name : "(null)");
564 free_object (tmp); 614 free_object (tmp);
565 } 615 }
566 } 616 }
567 else 617 else
568 { 618 {
569 /* This is the actual archetype definition then */ 619 /* This is the actual archetype definition then */
570 op->arch = find_archetype (str); 620 op->arch = archetype::find (str);
571 621
572 if (op->arch != NULL) 622 if (op->arch != NULL)
573 copy_object (&op->arch->clone, op); 623 copy_object (&op->arch->clone, op);
574 else if (!arch_init) 624 else if (!arch_init)
575 /* record the name of the broken object */ 625 /* record the name of the broken object */
… …
577 } 627 }
578 } 628 }
579 break; 629 break;
580 630
581 case KW_other_arch: 631 case KW_other_arch:
582 op->other_arch = find_archetype (thawer.get_str ()); 632 op->other_arch = archetype::find (thawer.get_str ());
583 break; 633 break;
584 634
585 case KW_animation: 635 case KW_animation:
586 { 636 {
587 const char *str = thawer.get_str (); 637 const char *str = thawer.get_str ();
588 638
589 if (!str) 639 if (!str)
590 { 640 {
591 op->animation_id = 0; 641 op->animation_id = 0;
592 CLEAR_FLAG (op, FLAG_ANIMATE); 642 CLEAR_FLAG (op, FLAG_ANIMATE);
593 } 643 }
594 else 644 else
595 { 645 {
596 op->animation_id = find_animation (str); 646 op->animation_id = find_animation (str);
597 SET_FLAG (op, FLAG_ANIMATE); 647 SET_FLAG (op, FLAG_ANIMATE);
598 } 648 }
599 } 649 }
600 650
601 break; 651 break;
602 652
653 case KW_last_heal:
603 case KW_last_heal: thawer.get (op->last_heal); break; 654 thawer.get (op->last_heal);
604 case KW_last_sp: thawer.get (op->last_sp); break; 655 break;
605 case KW_last_grace: thawer.get (op->last_grace); break; 656 case KW_last_sp:
606 case KW_last_eat: thawer.get (op->last_eat); break; 657 thawer.get (op->last_sp);
607 case KW_speed_left: thawer.get (op->speed_left); break; 658 break;
659 case KW_last_grace:
660 thawer.get (op->last_grace);
661 break;
662 case KW_last_eat:
663 thawer.get (op->last_eat);
664 break;
665 case KW_speed_left:
666 thawer.get (op->speed_left);
667 break;
608 668
609 case KW_speed: 669 case KW_speed:
610 thawer.get (op->speed); 670 thawer.get (op->speed);
611 671
612 //TODO: maybe do in check_object 672 //TODO: maybe do in check_object
… …
627 687
628 case KW_face: 688 case KW_face:
629 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 689 op->face = &new_faces[FindFace (thawer.get_str (), 0)];
630 break; 690 break;
631 691
632 case KW_x: thawer.get (op->x); break; 692 case KW_x:
633 case KW_y: thawer.get (op->y); break; 693 thawer.get (op->x);
634 case KW_str: thawer.get (op->stats.Str); break; 694 break;
635 case KW_dex: thawer.get (op->stats.Dex); break; 695 case KW_y:
636 case KW_con: thawer.get (op->stats.Con); break; 696 thawer.get (op->y);
637 case KW_wis: thawer.get (op->stats.Wis); break; 697 break;
638 case KW_cha: thawer.get (op->stats.Cha); break; 698 case KW_Str: // uppercase alias
639 case KW_int: thawer.get (op->stats.Int); break; 699 case KW_str:
640 case KW_pow: thawer.get (op->stats.Pow); break; 700 thawer.get (op->stats.Str);
641 case KW_hp: thawer.get (op->stats.hp); break; 701 break;
642 case KW_maxhp: thawer.get (op->stats.maxhp); break; 702 case KW_Dex: // uppercase alias
643 case KW_sp: thawer.get (op->stats.sp); break; 703 case KW_dex:
644 case KW_maxsp: thawer.get (op->stats.maxsp); break; 704 thawer.get (op->stats.Dex);
645 case KW_grace: thawer.get (op->stats.grace); break; 705 break;
646 case KW_maxgrace: thawer.get (op->stats.maxgrace); break; 706 case KW_Con: // uppercase alias
707 case KW_con:
708 thawer.get (op->stats.Con);
709 break;
710 case KW_Wis: // uppercase alias
711 case KW_wis:
712 thawer.get (op->stats.Wis);
713 break;
714 case KW_Cha: // uppercase alias
715 case KW_cha:
716 thawer.get (op->stats.Cha);
717 break;
718 case KW_Int: // uppercase alias
719 case KW_int:
720 thawer.get (op->stats.Int);
721 break;
722 case KW_Pow: // uppercase alias
723 case KW_pow:
724 thawer.get (op->stats.Pow);
725 break;
726 case KW_hp:
727 thawer.get (op->stats.hp);
728 break;
729 case KW_maxhp:
730 thawer.get (op->stats.maxhp);
731 break;
732 case KW_sp:
733 thawer.get (op->stats.sp);
734 break;
735 case KW_maxsp:
736 thawer.get (op->stats.maxsp);
737 break;
738 case KW_grace:
739 thawer.get (op->stats.grace);
740 break;
741 case KW_maxgrace:
742 thawer.get (op->stats.maxgrace);
743 break;
647 744
648 case KW_exp: thawer.get (op->stats.exp); break; 745 case KW_exp:
649 case KW_perm_exp: thawer.get (op->perm_exp); break; 746 thawer.get (op->stats.exp);
650 case KW_food: thawer.get (op->stats.food); break; 747 break;
651 case KW_dam: thawer.get (op->stats.dam); break; 748 case KW_perm_exp:
652 case KW_wc: thawer.get (op->stats.wc); break; 749 thawer.get (op->perm_exp);
653 case KW_ac: thawer.get (op->stats.ac); break; 750 break;
654 case KW_nrof: thawer.get (op->nrof); break; 751 case KW_food:
655 case KW_level: thawer.get (op->level); break; 752 thawer.get (op->stats.food);
656 case KW_direction: thawer.get (op->direction); break; 753 break;
657 case KW_type: thawer.get (op->type); break; 754 case KW_dam:
658 case KW_subtype: thawer.get (op->subtype); break; 755 thawer.get (op->stats.dam);
659 case KW_value: thawer.get (op->value); break; 756 break;
660 case KW_weight: thawer.get (op->weight); break; 757 case KW_wc:
661 case KW_carrying: thawer.get (op->carrying); break; 758 thawer.get (op->stats.wc);
662 case KW_attacktype: thawer.get (op->attacktype); break; 759 break;
663 case KW_path_attuned: thawer.get (op->path_attuned); break; 760 case KW_ac:
664 case KW_path_repelled: thawer.get (op->path_repelled); break; 761 thawer.get (op->stats.ac);
665 case KW_path_denied: thawer.get (op->path_denied); break; 762 break;
666 case KW_invisible: thawer.get (op->invisible); break; 763 case KW_nrof:
667 case KW_magic: thawer.get (op->magic); break; 764 thawer.get (op->nrof);
668 case KW_state: thawer.get (op->state); break; 765 break;
669 case KW_move_slow_penalty:thawer.get (op->move_slow_penalty); break; 766 case KW_level:
670 case KW_material: thawer.get (op->material); break; 767 thawer.get (op->level);
671 case KW_materialname: thawer.get (op->materialname); break; 768 break;
769 case KW_direction:
770 thawer.get (op->direction);
771 break;
772 case KW_type:
773 thawer.get (op->type);
774 break;
775 case KW_subtype:
776 thawer.get (op->subtype);
777 break;
778 case KW_value:
779 thawer.get (op->value);
780 break;
781 case KW_weight:
782 thawer.get (op->weight);
783 break;
784 case KW_carrying:
785 thawer.get (op->carrying);
786 break;
787 case KW_attacktype:
788 thawer.get (op->attacktype);
789 break;
790 case KW_path_attuned:
791 thawer.get (op->path_attuned);
792 break;
793 case KW_path_repelled:
794 thawer.get (op->path_repelled);
795 break;
796 case KW_path_denied:
797 thawer.get (op->path_denied);
798 break;
799 case KW_invisible:
800 thawer.get (op->invisible);
801 break;
802 case KW_magic:
803 thawer.get (op->magic);
804 break;
805 case KW_state:
806 thawer.get (op->state);
807 break;
808 case KW_move_slow_penalty:
809 thawer.get (op->move_slow_penalty);
810 break;
811 case KW_material:
812 thawer.get (op->material);
813 break;
814 case KW_materialname:
815 thawer.get (op->materialname);
816 break;
672 817
673 /* These are the new values */ 818 /* These are the new values */
819 case KW_move_block:
674 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 820 set_move (op->move_block, thawer.get_str ());
821 break;
822 case KW_move_allow:
675 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 823 set_move (op->move_allow, thawer.get_str ());
824 break;
825 case KW_move_type:
676 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; 826 set_move (op->move_type, thawer.get_str ());
827 break;
828 case KW_move_on:
677 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; 829 set_move (op->move_on, thawer.get_str ());
830 break;
831 case KW_move_off:
678 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; 832 set_move (op->move_off, thawer.get_str ());
833 break;
834 case KW_move_slow:
679 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; 835 set_move (op->move_slow, thawer.get_str ());
836 break;
680 837
681 /* These are all legacy - any new objects should use the move_ .. values */ 838 /* These are all legacy - any new objects should use the move_ .. values */
682 case KW_no_pass: 839 case KW_no_pass:
683 { 840 {
684 if (thawer.get_sint32 ()) 841 if (thawer.get_sint32 ())
685 op->move_block = MOVE_ALL; 842 op->move_block = MOVE_ALL;
686 else 843 else
687 op->move_block = 0; 844 op->move_block = 0;
688 } 845 }
689 846
690 break; 847 break;
691 848
692 /* These are all legacy - any new objects should use the move_ .. values */ 849 /* These are all legacy - any new objects should use the move_ .. values */
693 case KW_walk_on: 850 case KW_walk_on:
694 { 851 {
695 if (thawer.get_sint32 ()) 852 if (thawer.get_sint32 ())
696 op->move_on |= MOVE_WALK; 853 op->move_on |= MOVE_WALK;
697 else 854 else
698 op->move_on &= ~MOVE_WALK; 855 op->move_on &= ~MOVE_WALK;
699 } 856 }
700 857
701 break; 858 break;
702 859
703 /* These are all legacy - any new objects should use the move_ .. values */ 860 /* These are all legacy - any new objects should use the move_ .. values */
704 case KW_walk_off: 861 case KW_walk_off:
705 { 862 {
706 if (thawer.get_sint32 ()) 863 if (thawer.get_sint32 ())
707 op->move_off |= MOVE_WALK; 864 op->move_off |= MOVE_WALK;
708 else 865 else
709 op->move_off &= ~MOVE_WALK; 866 op->move_off &= ~MOVE_WALK;
710 } 867 }
711 break; 868 break;
712 869
713 /* These are all legacy - any new objects should use the move_ .. values */ 870 /* These are all legacy - any new objects should use the move_ .. values */
714 case KW_fly_on: 871 case KW_fly_on:
715 { 872 {
716 if (thawer.get_sint32 ()) 873 if (thawer.get_sint32 ())
717 op->move_on |= MOVE_FLY_LOW; 874 op->move_on |= MOVE_FLY_LOW;
718 else 875 else
719 op->move_on &= ~MOVE_FLY_LOW; 876 op->move_on &= ~MOVE_FLY_LOW;
720 } 877 }
721 break; 878 break;
722 879
723 /* These are all legacy - any new objects should use the move_ .. values */ 880 /* These are all legacy - any new objects should use the move_ .. values */
724 case KW_fly_off: 881 case KW_fly_off:
725 { 882 {
726 if (thawer.get_sint32 ()) 883 if (thawer.get_sint32 ())
727 op->move_off |= MOVE_FLY_LOW; 884 op->move_off |= MOVE_FLY_LOW;
728 else 885 else
729 op->move_off &= ~MOVE_FLY_LOW; 886 op->move_off &= ~MOVE_FLY_LOW;
730 } 887 }
731 break; 888 break;
732 889
733 //TODO: remove these after convertign archetypes 890 //TODO: remove these after convertign archetypes
734 case KW_can_use_wand: GET_FLAG (op, FLAG_USE_RANGE); break; 891 case KW_can_use_wand:
892 GET_FLAG (op, FLAG_USE_RANGE);
893 break;
735 894
736 /* These are all legacy - any new objects should use the move_ .. values */ 895 /* These are all legacy - any new objects should use the move_ .. values */
737 case KW_flying: 896 case KW_flying:
738 { 897 {
739 if (thawer.get_sint32 ()) 898 if (thawer.get_sint32 ())
740 op->move_type |= MOVE_FLY_LOW; 899 op->move_type |= MOVE_FLY_LOW;
741 else 900 else
… …
773 //TODO: move to check_object or so 932 //TODO: move to check_object or so
774 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) 933 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
775 add_friendly_object (op); 934 add_friendly_object (op);
776 break; 935 break;
777 936
778 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 937 case KW_monster:
779 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 938 GET_FLAG (op, FLAG_MONSTER);
780 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 939 break;
781 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 940 case KW_neutral:
782 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 941 GET_FLAG (op, FLAG_NEUTRAL);
783 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 942 break;
784 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 943 case KW_no_attack:
785 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 944 GET_FLAG (op, FLAG_NO_ATTACK);
786 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break; 945 break;
787 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 946 case KW_no_damage:
788 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 947 GET_FLAG (op, FLAG_NO_DAMAGE);
789 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 948 break;
790 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 949 case KW_generator:
791 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 950 GET_FLAG (op, FLAG_GENERATOR);
792 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; 951 break;
793 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; 952 case KW_use_content_on_gen:
794 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; 953 GET_FLAG (op, FLAG_CONTENT_ON_GEN);
795 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; 954 break;
796 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; 955 case KW_is_thrown:
797 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; 956 GET_FLAG (op, FLAG_IS_THROWN);
798 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; 957 break;
799 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; 958 case KW_auto_apply:
800 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; 959 GET_FLAG (op, FLAG_AUTO_APPLY);
801 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; 960 break;
802 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; 961 case KW_treasure:
803 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; 962 GET_FLAG (op, FLAG_TREASURE);
804 case KW_scared: GET_FLAG (op, FLAG_SCARED); break; 963 break;
805 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; 964 case KW_see_invisible:
806 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; 965 GET_FLAG (op, FLAG_SEE_INVISIBLE);
807 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; 966 break;
808 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; 967 case KW_can_roll:
809 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; 968 GET_FLAG (op, FLAG_CAN_ROLL);
810 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 969 break;
811 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; 970 case KW_overlay_floor:
812 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; 971 GET_FLAG (op, FLAG_OVERLAY_FLOOR);
813 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; 972 break;
814 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; 973 case KW_is_turnable:
815 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; 974 GET_FLAG (op, FLAG_IS_TURNABLE);
816 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; 975 break;
817 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; 976 case KW_is_used_up:
818 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; 977 GET_FLAG (op, FLAG_IS_USED_UP);
819 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 978 break;
820 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 979 case KW_alive:
821 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 980 GET_FLAG (op, FLAG_ALIVE);
822 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 981 break;
823 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 982 case KW_applied:
824 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 983 GET_FLAG (op, FLAG_APPLIED);
825 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 984 break;
826 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 985 case KW_unpaid:
827 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 986 GET_FLAG (op, FLAG_UNPAID);
828 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 987 break;
829 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; 988 case KW_is_animated:
830 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 989 GET_FLAG (op, FLAG_ANIMATE);
831 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; 990 break;
832 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; 991 case KW_no_pick:
833 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; 992 GET_FLAG (op, FLAG_NO_PICK);
834 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; 993 break;
835 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; 994 case KW_reflecting:
836 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; 995 GET_FLAG (op, FLAG_REFLECTING);
837 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; 996 break;
838 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; 997 case KW_changing:
839 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; 998 GET_FLAG (op, FLAG_CHANGING);
840 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; 999 break;
841 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; 1000 case KW_splitting:
842 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; 1001 GET_FLAG (op, FLAG_SPLITTING);
843 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; 1002 break;
844 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; 1003 case KW_hitback:
845 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; 1004 GET_FLAG (op, FLAG_HITBACK);
846 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; 1005 break;
847 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; 1006 case KW_startequip:
848 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; 1007 GET_FLAG (op, FLAG_STARTEQUIP);
849 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; 1008 break;
850 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; 1009 case KW_blocksview:
851 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; 1010 GET_FLAG (op, FLAG_BLOCKSVIEW);
852 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; 1011 break;
853 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; 1012 case KW_undead:
854 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; 1013 GET_FLAG (op, FLAG_UNDEAD);
855 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; 1014 break;
856 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; 1015 case KW_scared:
857 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 1016 GET_FLAG (op, FLAG_SCARED);
858 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 1017 break;
859 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 1018 case KW_unaggressive:
860 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 1019 GET_FLAG (op, FLAG_UNAGGRESSIVE);
861 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 1020 break;
1021 case KW_reflect_missile:
1022 GET_FLAG (op, FLAG_REFL_MISSILE);
1023 break;
1024 case KW_reflect_spell:
1025 GET_FLAG (op, FLAG_REFL_SPELL);
1026 break;
1027 case KW_no_magic:
1028 GET_FLAG (op, FLAG_NO_MAGIC);
1029 break;
1030 case KW_no_drop:
1031 GET_FLAG (op, FLAG_NO_DROP);
1032 break;
1033 case KW_random_movement:
1034 GET_FLAG (op, FLAG_RANDOM_MOVE);
1035 break;
1036 case KW_was_wiz:
1037 GET_FLAG (op, FLAG_WAS_WIZ);
1038 break;
1039 case KW_no_fix_player:
1040 GET_FLAG (op, FLAG_NO_FIX_PLAYER);
1041 break;
1042 case KW_is_lightable:
1043 GET_FLAG (op, FLAG_IS_LIGHTABLE);
1044 break;
1045 case KW_tear_down:
1046 GET_FLAG (op, FLAG_TEAR_DOWN);
1047 break;
1048 case KW_can_use_shield:
1049 GET_FLAG (op, FLAG_USE_SHIELD);
1050 break;
1051 case KW_can_cast_spell:
1052 GET_FLAG (op, FLAG_CAST_SPELL);
1053 break;
1054 case KW_can_use_scroll:
1055 GET_FLAG (op, FLAG_USE_SCROLL);
1056 break;
1057 case KW_can_use_range:
1058 GET_FLAG (op, FLAG_USE_RANGE);
1059 break;
1060 case KW_can_use_bow:
1061 GET_FLAG (op, FLAG_USE_BOW);
1062 break;
1063 case KW_can_use_armour:
1064 GET_FLAG (op, FLAG_USE_ARMOUR);
1065 break;
1066 case KW_can_use_weapon:
1067 GET_FLAG (op, FLAG_USE_WEAPON);
1068 break;
1069 case KW_can_use_ring:
1070 GET_FLAG (op, FLAG_USE_RING);
1071 break;
1072 case KW_has_ready_bow:
1073 GET_FLAG (op, FLAG_READY_BOW);
1074 break;
1075 case KW_xrays:
1076 GET_FLAG (op, FLAG_XRAYS);
1077 break;
1078 case KW_is_floor:
1079 GET_FLAG (op, FLAG_IS_FLOOR);
1080 break;
1081 case KW_lifesave:
1082 GET_FLAG (op, FLAG_LIFESAVE);
1083 break;
1084 case KW_no_strength:
1085 GET_FLAG (op, FLAG_NO_STRENGTH);
1086 break;
1087 case KW_sleep:
1088 GET_FLAG (op, FLAG_SLEEP);
1089 break;
1090 case KW_stand_still:
1091 GET_FLAG (op, FLAG_STAND_STILL);
1092 break;
1093 case KW_random_move:
1094 GET_FLAG (op, FLAG_RANDOM_MOVE);
1095 break;
1096 case KW_only_attack:
1097 GET_FLAG (op, FLAG_ONLY_ATTACK);
1098 break;
1099 case KW_activate_on_push:
1100 GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH);
1101 break;
1102 case KW_activate_on_release:
1103 GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE);
1104 break;
1105 case KW_confused:
1106 GET_FLAG (op, FLAG_CONFUSED);
1107 break;
1108 case KW_stealth:
1109 GET_FLAG (op, FLAG_STEALTH);
1110 break;
1111 case KW_cursed:
1112 GET_FLAG (op, FLAG_CURSED);
1113 break;
1114 case KW_damned:
1115 GET_FLAG (op, FLAG_DAMNED);
1116 break;
1117 case KW_see_anywhere:
1118 GET_FLAG (op, FLAG_SEE_ANYWHERE);
1119 break;
1120 case KW_known_magical:
1121 GET_FLAG (op, FLAG_KNOWN_MAGICAL);
1122 break;
1123 case KW_known_cursed:
1124 GET_FLAG (op, FLAG_KNOWN_CURSED);
1125 break;
1126 case KW_can_use_skill:
1127 GET_FLAG (op, FLAG_CAN_USE_SKILL);
1128 break;
1129 case KW_been_applied:
1130 GET_FLAG (op, FLAG_BEEN_APPLIED);
1131 break;
1132 case KW_has_ready_scroll:
1133 GET_FLAG (op, FLAG_READY_SCROLL);
1134 break;
1135 case KW_can_use_rod:
1136 GET_FLAG (op, FLAG_USE_ROD);
1137 break;
1138 case KW_can_use_horn:
1139 GET_FLAG (op, FLAG_USE_HORN);
1140 break;
1141 case KW_unique:
1142 GET_FLAG (op, FLAG_UNIQUE);
1143 break;
1144 case KW_make_invisible:
1145 GET_FLAG (op, FLAG_MAKE_INVIS);
1146 break;
1147 case KW_inv_locked:
1148 GET_FLAG (op, FLAG_INV_LOCKED);
1149 break;
1150 case KW_is_wooded:
1151 GET_FLAG (op, FLAG_IS_WOODED);
1152 break;
1153 case KW_is_hilly:
1154 GET_FLAG (op, FLAG_IS_HILLY);
1155 break;
1156 case KW_is_water:
1157 GET_FLAG (op, FLAG_IS_WATER);
1158 break;
1159 case KW_has_ready_skill:
1160 GET_FLAG (op, FLAG_READY_SKILL);
1161 break;
1162 case KW_has_ready_weapon:
1163 GET_FLAG (op, FLAG_READY_WEAPON);
1164 break;
1165 case KW_no_skill_ident:
1166 GET_FLAG (op, FLAG_NO_SKILL_IDENT);
1167 break;
1168 case KW_is_blind:
1169 GET_FLAG (op, FLAG_BLIND);
1170 break;
1171 case KW_can_see_in_dark:
1172 GET_FLAG (op, FLAG_SEE_IN_DARK);
1173 break;
1174 case KW_is_cauldron:
1175 GET_FLAG (op, FLAG_IS_CAULDRON);
1176 break;
1177 case KW_no_steal:
1178 GET_FLAG (op, FLAG_NO_STEAL);
1179 break;
1180 case KW_one_hit:
1181 GET_FLAG (op, FLAG_ONE_HIT);
1182 break;
1183 case KW_berserk:
1184 GET_FLAG (op, FLAG_BERSERK);
1185 break;
1186 case KW_is_buildable:
1187 GET_FLAG (op, FLAG_IS_BUILDABLE);
1188 break;
862 1189
863 case KW_armour: thawer.get (op->resist [ATNR_PHYSICAL]); break; 1190 case KW_armour:
864 case KW_resist_physical: thawer.get (op->resist [ATNR_PHYSICAL]); break; 1191 thawer.get (op->resist[ATNR_PHYSICAL]);
865 case KW_resist_magic: thawer.get (op->resist [ATNR_MAGIC]); break; 1192 break;
866 case KW_resist_fire: thawer.get (op->resist [ATNR_FIRE]); break; 1193 case KW_resist_physical:
1194 thawer.get (op->resist[ATNR_PHYSICAL]);
1195 break;
1196 case KW_resist_magic:
1197 thawer.get (op->resist[ATNR_MAGIC]);
1198 break;
1199 case KW_resist_fire:
1200 thawer.get (op->resist[ATNR_FIRE]);
1201 break;
1202 case KW_resist_electricity:
867 case KW_resist_electricity: thawer.get (op->resist [ATNR_ELECTRICITY]); break; 1203 thawer.get (op->resist[ATNR_ELECTRICITY]);
868 case KW_resist_cold: thawer.get (op->resist [ATNR_COLD]); break; 1204 break;
869 case KW_resist_confusion: thawer.get (op->resist [ATNR_CONFUSION]); break; 1205 case KW_resist_cold:
870 case KW_resist_acid: thawer.get (op->resist [ATNR_ACID]); break; 1206 thawer.get (op->resist[ATNR_COLD]);
871 case KW_resist_drain: thawer.get (op->resist [ATNR_DRAIN]); break; 1207 break;
1208 case KW_resist_confusion:
1209 thawer.get (op->resist[ATNR_CONFUSION]);
1210 break;
1211 case KW_resist_acid:
1212 thawer.get (op->resist[ATNR_ACID]);
1213 break;
1214 case KW_resist_drain:
1215 thawer.get (op->resist[ATNR_DRAIN]);
1216 break;
1217 case KW_resist_weaponmagic:
872 case KW_resist_weaponmagic: thawer.get (op->resist [ATNR_WEAPONMAGIC]); break; 1218 thawer.get (op->resist[ATNR_WEAPONMAGIC]);
873 case KW_resist_ghosthit: thawer.get (op->resist [ATNR_GHOSTHIT]); break; 1219 break;
874 case KW_resist_poison: thawer.get (op->resist [ATNR_POISON]); break; 1220 case KW_resist_ghosthit:
875 case KW_resist_slow: thawer.get (op->resist [ATNR_SLOW]); break; 1221 thawer.get (op->resist[ATNR_GHOSTHIT]);
876 case KW_resist_paralyze: thawer.get (op->resist [ATNR_PARALYZE]); break; 1222 break;
1223 case KW_resist_poison:
1224 thawer.get (op->resist[ATNR_POISON]);
1225 break;
1226 case KW_resist_slow:
1227 thawer.get (op->resist[ATNR_SLOW]);
1228 break;
1229 case KW_resist_paralyze:
1230 thawer.get (op->resist[ATNR_PARALYZE]);
1231 break;
1232 case KW_resist_turn_undead:
877 case KW_resist_turn_undead: thawer.get (op->resist [ATNR_TURN_UNDEAD]); break; 1233 thawer.get (op->resist[ATNR_TURN_UNDEAD]);
878 case KW_resist_fear: thawer.get (op->resist [ATNR_FEAR]); break; 1234 break;
1235 case KW_resist_fear:
1236 thawer.get (op->resist[ATNR_FEAR]);
1237 break;
1238 case KW_resist_cancellation:
879 case KW_resist_cancellation: thawer.get (op->resist [ATNR_CANCELLATION]); break; 1239 thawer.get (op->resist[ATNR_CANCELLATION]);
880 case KW_resist_deplete: thawer.get (op->resist [ATNR_DEPLETE]); break; 1240 break;
881 case KW_resist_death: thawer.get (op->resist [ATNR_DEATH]); break; 1241 case KW_resist_deplete:
882 case KW_resist_chaos: thawer.get (op->resist [ATNR_CHAOS]); break; 1242 thawer.get (op->resist[ATNR_DEPLETE]);
1243 break;
1244 case KW_resist_death:
1245 thawer.get (op->resist[ATNR_DEATH]);
1246 break;
1247 case KW_resist_chaos:
1248 thawer.get (op->resist[ATNR_CHAOS]);
1249 break;
1250 case KW_resist_counterspell:
883 case KW_resist_counterspell: thawer.get (op->resist [ATNR_COUNTERSPELL]); break; 1251 thawer.get (op->resist[ATNR_COUNTERSPELL]);
884 case KW_resist_godpower: thawer.get (op->resist [ATNR_GODPOWER]); break; 1252 break;
885 case KW_resist_holyword: thawer.get (op->resist [ATNR_HOLYWORD]); break; 1253 case KW_resist_godpower:
886 case KW_resist_blind: thawer.get (op->resist [ATNR_BLIND]); break; 1254 thawer.get (op->resist[ATNR_GODPOWER]);
887 case KW_resist_internal: thawer.get (op->resist [ATNR_INTERNAL]); break; 1255 break;
888 case KW_resist_life_stealing: thawer.get (op->resist [ATNR_LIFE_STEALING]); break; 1256 case KW_resist_holyword:
889 case KW_resist_disease: thawer.get (op->resist [ATNR_DISEASE]); break; 1257 thawer.get (op->resist[ATNR_HOLYWORD]);
1258 break;
1259 case KW_resist_blind:
1260 thawer.get (op->resist[ATNR_BLIND]);
1261 break;
1262 case KW_resist_internal:
1263 thawer.get (op->resist[ATNR_INTERNAL]);
1264 break;
1265 case KW_resist_life_stealing:
1266 thawer.get (op->resist[ATNR_LIFE_STEALING]);
1267 break;
1268 case KW_resist_disease:
1269 thawer.get (op->resist[ATNR_DISEASE]);
1270 break;
890 1271
891 case KW_luck: thawer.get (op->stats.luck); break; 1272 case KW_luck:
892 case KW_run_away: thawer.get (op->run_away); break; 1273 thawer.get (op->stats.luck);
893 case KW_pick_up: thawer.get (op->pick_up); break; 1274 break;
894 case KW_item_power: thawer.get (op->item_power); break; 1275 case KW_run_away:
895 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; 1276 thawer.get (op->run_away);
896 case KW_anim_speed: thawer.get (op->anim_speed); break; 1277 break;
897 case KW_container: thawer.get (op->weight_limit); break; 1278 case KW_pick_up:
898 case KW_will_apply: thawer.get (op->will_apply); break; 1279 thawer.get (op->pick_up);
899 case KW_attack_movement: thawer.get (op->attack_movement); break; 1280 break;
900 case KW_move_state: thawer.get (op->move_status); break; 1281 case KW_item_power:
901 case KW_expmul: thawer.get (op->expmul); break; 1282 thawer.get (op->item_power);
902 case KW_glow_radius: thawer.get (op->glow_radius); break; 1283 break;
903 case KW_weapontype: thawer.get (op->weapontype); break; 1284 case KW_gen_sp_armour:
904 case KW_tooltype: thawer.get (op->tooltype); break; 1285 thawer.get (op->gen_sp_armour);
905 case KW_casting_time: thawer.get (op->casting_time); break; 1286 break;
906 case KW_elevation: thawer.get (op->elevation); break; 1287 case KW_anim_speed:
907 case KW_smoothlevel: thawer.get (op->smoothlevel); break; 1288 thawer.get (op->anim_speed);
908 case KW_client_type: thawer.get (op->client_type); break; 1289 break;
909 case KW_duration: thawer.get (op->duration); break; 1290 case KW_container:
910 case KW_range: thawer.get (op->range); break; 1291 thawer.get (op->weight_limit);
911 case KW_range_modifier: thawer.get (op->range_modifier); break; 1292 break;
912 case KW_dam_modifier: thawer.get (op->dam_modifier); break; 1293 case KW_will_apply:
913 case KW_duration_modifier: thawer.get (op->duration_modifier); break; 1294 thawer.get (op->will_apply);
1295 break;
1296 case KW_attack_movement:
1297 thawer.get (op->attack_movement);
1298 break;
1299 case KW_move_state:
1300 thawer.get (op->move_status);
1301 break;
1302 case KW_expmul:
1303 thawer.get (op->expmul);
1304 break;
1305 case KW_glow_radius:
1306 thawer.get (op->glow_radius);
1307 break;
1308 case KW_weapontype:
1309 thawer.get (op->weapontype);
1310 break;
1311 case KW_tooltype:
1312 thawer.get (op->tooltype);
1313 break;
1314 case KW_casting_time:
1315 thawer.get (op->casting_time);
1316 break;
1317 case KW_elevation:
1318 thawer.get (op->elevation);
1319 break;
1320 case KW_smoothlevel:
1321 thawer.get (op->smoothlevel);
1322 break;
1323 case KW_client_type:
1324 thawer.get (op->client_type);
1325 break;
1326 case KW_duration:
1327 thawer.get (op->duration);
1328 break;
1329 case KW_range:
1330 thawer.get (op->range);
1331 break;
1332 case KW_range_modifier:
1333 thawer.get (op->range_modifier);
1334 break;
1335 case KW_dam_modifier:
1336 thawer.get (op->dam_modifier);
1337 break;
1338 case KW_duration_modifier:
1339 thawer.get (op->duration_modifier);
1340 break;
914 1341
915 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 1342 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
916 //TODO: parse from other include files 1343 //TODO: parse from other include files
917 case KW_body_range: thawer.get (op->body_info [ 0]); break; 1344 case KW_body_range:
918 case KW_body_arm: thawer.get (op->body_info [ 1]); break; 1345 thawer.get (op->body_info[0]);
919 case KW_body_torso: thawer.get (op->body_info [ 2]); break; 1346 break;
920 case KW_body_head: thawer.get (op->body_info [ 3]); break; 1347 case KW_body_arm:
921 case KW_body_neck: thawer.get (op->body_info [ 4]); break; 1348 thawer.get (op->body_info[1]);
922 case KW_body_skill: thawer.get (op->body_info [ 5]); break; 1349 break;
923 case KW_body_finger: thawer.get (op->body_info [ 6]); break; 1350 case KW_body_torso:
924 case KW_body_shoulder: thawer.get (op->body_info [ 7]); break; 1351 thawer.get (op->body_info[2]);
925 case KW_body_foot: thawer.get (op->body_info [ 8]); break; 1352 break;
926 case KW_body_hand: thawer.get (op->body_info [ 9]); break; 1353 case KW_body_head:
927 case KW_body_wrist: thawer.get (op->body_info [10]); break; 1354 thawer.get (op->body_info[3]);
928 case KW_body_waist: thawer.get (op->body_info [11]); break; 1355 break;
1356 case KW_body_neck:
1357 thawer.get (op->body_info[4]);
1358 break;
1359 case KW_body_skill:
1360 thawer.get (op->body_info[5]);
1361 break;
1362 case KW_body_finger:
1363 thawer.get (op->body_info[6]);
1364 break;
1365 case KW_body_shoulder:
1366 thawer.get (op->body_info[7]);
1367 break;
1368 case KW_body_foot:
1369 thawer.get (op->body_info[8]);
1370 break;
1371 case KW_body_hand:
1372 thawer.get (op->body_info[9]);
1373 break;
1374 case KW_body_wrist:
1375 thawer.get (op->body_info[10]);
1376 break;
1377 case KW_body_waist:
1378 thawer.get (op->body_info[11]);
1379 break;
929 case KW_can_apply: 1380 case KW_can_apply:
930 break; 1381 break;
931 1382
932 case KW_connected: 1383 case KW_connected:
933 add_button_link (op, op->map, thawer.get_sint32 ()); 1384 add_button_link (op, op->map, thawer.get_sint32 ());
… …
950 break; 1401 break;
951 1402
952 case KW_lore: 1403 case KW_lore:
953 { 1404 {
954 shstr msgbuf; 1405 shstr msgbuf;
1406
955 thawer.get_ml (KW_endlore, op->lore); 1407 thawer.get_ml (KW_endlore, op->lore);
956 //TODO: allow longer messages 1408 //TODO: allow longer messages
957 /* Just print a warning so we can be reasonably safe 1409 /* Just print a warning so we can be reasonably safe
958 * about not overflowing the buffer. 1410 * about not overflowing the buffer.
959 */ 1411 */
… …
965 1417
966 case KW_editable: 1418 case KW_editable:
967 case KW_editor_folder: 1419 case KW_editor_folder:
968 break; 1420 break;
969 1421
1422 case KW_More: // uppercase alias
970 case KW_more: 1423 case KW_more:
971 /* We need to record that this is a multipart object, 1424 /* We need to record that this is a multipart object,
972 * so the calling function can glue things back together 1425 * so the calling function can glue things back together
973 */ 1426 */
974 ismore = 1; 1427 ismore = 1;
… …
984 1437
985 case KW_EOF: 1438 case KW_EOF:
986 return LL_EOF; 1439 return LL_EOF;
987 1440
988 case KW_ERROR: 1441 case KW_ERROR:
989 set_ob_key_value(op, thawer.line, thawer.last_value, true); 1442 set_ob_key_value (op, thawer.line, thawer.last_value, true);
990 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1443 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D
991 1444
992 // skip line, ugly 1445 //TODO: skip line, ugly, factor parsing better
1446 if (thawer.last_value)
1447 thawer.line = thawer.last_value;
1448
993 thawer.line = thawer.last_value + strlen (thawer.last_value) + 1; 1449 thawer.line += strlen (thawer.line) + 1;
1450
994 break; 1451 break;
995 1452
996 default: 1453 default:
997 printf ("kw abort %d\n", kw);//D 1454 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
998 abort (); 1455 break;
999 } 1456 }
1000 } 1457 }
1001} 1458}
1002 1459
1003/* 1460/*
… …
1013 * be reset. 1470 * be reset.
1014 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1471 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1015 * 1472 *
1016 */ 1473 */
1017 1474
1475int
1018int load_object(object_thawer &fp, object *op, int map_flags) { 1476load_object (object_thawer & fp, object *op, int map_flags)
1477{
1019 return parse_object(op, fp, map_flags); 1478 return parse_object (op, fp, map_flags);
1020} 1479}
1021 1480
1022 1481
1023/* This takes a buffer, scans it for variables, and sets those variables 1482/* This takes a buffer, scans it for variables, and sets those variables
1024 * as appropriate in op. 1483 * as appropriate in op.
1025 * 1484 *
1026 * This function appears to be used in only 2 places - in crossedit to 1485 * This function appears to be used in only 2 places - in crossedit to
1027 * override values and in c_wiz to mutate values. 1486 * override values and in c_wiz to mutate values.
1028 */ 1487 */
1488int
1029int set_variable(object *op,char *buf) { 1489set_variable (object *op, char *buf)
1490{
1491 return 0;
1030#if 0 1492#if 0
1031 int retval; 1493 int retval;
1032 object_thawer thawer (0); 1494 object_thawer thawer (0);
1033 1495
1034 strcpy(msgbuf, ""); 1496 strcpy (msgbuf, "");
1035 strcpy(lorebuf, ""); 1497 strcpy (lorebuf, "");
1036 retval=parse_object(op,thawer,0); 1498 retval = parse_object (op, thawer, 0);
1037 yy_switch_to_buffer(yycurbuf); 1499 yy_switch_to_buffer (yycurbuf);
1038 yy_delete_buffer(yybufstate); 1500 yy_delete_buffer (yybufstate);
1039 yy_pop_state(); 1501 yy_pop_state ();
1040 return retval; 1502 return retval;
1041#endif 1503#endif
1042} 1504}
1043 1505
1044/* This array equates the FLAG_ values with the V_ values. Use -1 to 1506/* This array equates the FLAG_ values with the V_ values. Use -1 to
1045 * put gaps in the array that should not be processed. 1507 * put gaps in the array that should not be processed.
1046 * The order matches the order of the define values in 'define.h'. 1508 * The order matches the order of the define values in 'define.h'.
1047 */ 1509 */
1510
1048/* This is a list of pointers that correspond to the FLAG_.. values. 1511/* This is a list of pointers that correspond to the FLAG_.. values.
1049 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then 1512 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1050 * the 15'th element of this array should match that name. 1513 * the 15'th element of this array should match that name.
1051 * If an entry is NULL, that is a flag not to loaded/saved. 1514 * If an entry is NULL, that is a flag not to loaded/saved.
1052 */ 1515 */
1053static const char *const flag_names[NUM_FLAGS+1] = { 1516static const char *const flag_names[NUM_FLAGS + 1] = {
1054"alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid", 1517 "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",
1055"can_use_shield", "no_pick", NULL /* walk_on*/, NULL /* no_pass */, /* 10 */ 1518 "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */
1056"is_animated", NULL /* slow_move */, 1519 "is_animated", NULL /* slow_move */ ,
1057NULL /* flying */, "monster", "friendly", "generator", 1520 NULL /* flying */ , "monster", "friendly", "generator",
1058"is_thrown", "auto_apply", "treasure", "player sold", /* 20 */ 1521 "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */
1059"see_invisible", "can_roll", "overlay_floor", 1522 "see_invisible", "can_roll", "overlay_floor",
1060"is_turnable", NULL /* walk_off */, NULL /* fly_on */, 1523 "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ ,
1061NULL /*fly_off*/, "is_used_up", "identified", "reflecting", /* 30 */ 1524 NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */
1062"changing", "splitting", "hitback", "startequip", 1525 "changing", "splitting", "hitback", "startequip",
1063"blocksview", "undead", "scared", "unaggressive", 1526 "blocksview", "undead", "scared", "unaggressive",
1064"reflect_missile", "reflect_spell", /* 40 */ 1527 "reflect_missile", "reflect_spell", /* 40 */
1065"no_magic", "no_fix_player", "is_lightable", "tear_down", 1528 "no_magic", "no_fix_player", "is_lightable", "tear_down",
1066"run_away", NULL /*pass_thru */, NULL /*can_pass_thru*/, 1529 "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ ,
1067"pick_up", "unique", "no_drop", /* 50 */ 1530 "pick_up", "unique", "no_drop", /* 50 */
1068NULL /* wizcast*/, "can_cast_spell", "can_use_scroll", "can_use_range", 1531 NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range",
1069"can_use_bow", "can_use_armour", "can_use_weapon", 1532 "can_use_bow", "can_use_armour", "can_use_weapon",
1070"can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */ 1533 "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */
1071"xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep", 1534 "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep",
1072"stand_still", "random_move", "only_attack", "confused", /* 70 */ 1535 "stand_still", "random_move", "only_attack", "confused", /* 70 */
1073 "stealth", NULL, NULL, "cursed", "damned", 1536 "stealth", NULL, NULL, "cursed", "damned",
1074"see_anywhere", "known_magical", "known_cursed", 1537 "see_anywhere", "known_magical", "known_cursed",
1075"can_use_skill", "been_applied", /* 80 */ 1538 "can_use_skill", "been_applied", /* 80 */
1076"has_ready_scroll", "can_use_rod", NULL, 1539 "has_ready_scroll", "can_use_rod", NULL,
1077"can_use_horn", "make_invisible", "inv_locked", "is_wooded", 1540 "can_use_horn", "make_invisible", "inv_locked", "is_wooded",
1078"is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */ 1541 "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */
1079"no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron", 1542 "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",
1080"is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */ 1543 "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */
1081"no_attack", "no_damage", NULL, NULL, "activate_on_push", 1544 "no_attack", "no_damage", NULL, NULL, "activate_on_push",
1082"activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */ 1545 "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */
1083NULL 1546 NULL
1084}; 1547};
1085 1548
1086 1549
1087/* 1550/*
1088 * Initialises the array of variable-names. Needed before any 1551 * Initialises the array of variable-names. Needed before any
1089 * objects can be loaded. Called by init_library(). 1552 * objects can be loaded. Called by init_library().
1090 */ 1553 */
1091 1554
1092void init_vars() { 1555void
1556init_vars ()
1557{
1093} 1558}
1094 1559
1095/* This returns a string of the integer movement type */ 1560/* This returns a string of the integer movement type */
1561#if 0
1562// unused function
1563static char *
1096static char* get_string_move_type(MoveType mt) 1564get_string_move_type (MoveType mt)
1097{ 1565{
1098 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; 1566 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1099 int i, all_count=0, count; 1567 int i, all_count = 0, count;
1100 1568
1101 strcpy(retbuf,""); 1569 strcpy (retbuf, "");
1102 strcpy(retbuf_all," all"); 1570 strcpy (retbuf_all, " all");
1103 1571
1104 /* Quick check, and probably fairly common */ 1572 /* Quick check, and probably fairly common */
1105 if (mt == MOVE_ALL) return retbuf_all+1; 1573 if (mt == MOVE_ALL)
1574 return retbuf_all + 1;
1106 if (mt == 0) { 1575 if (mt == 0)
1576 {
1107 strcpy(retbuf,"0"); 1577 strcpy (retbuf, "0");
1108 return retbuf; 1578 return retbuf;
1109 } 1579 }
1110 1580
1111 /* We basically slide the bits down. Why look at MOVE_ALL? 1581 /* We basically slide the bits down. Why look at MOVE_ALL?
1112 * because we may want to return a string like 'all -swim', 1582 * because we may want to return a string like 'all -swim',
1113 * and if we just looked at mt, we couldn't get that. 1583 * and if we just looked at mt, we couldn't get that.
1114 */ 1584 */
1115 for (i=MOVE_ALL, count=0; i!=0; i >>= 1, count++) { 1585 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1586 {
1116 if (mt & (1<<count)) { 1587 if (mt & (1 << count))
1588 {
1117 strcat(retbuf, " "); 1589 strcat (retbuf, " ");
1118 strcat(retbuf, move_name[count]); 1590 strcat (retbuf, move_name[count]);
1591 }
1119 } else { 1592 else
1593 {
1120 strcat(retbuf_all, " -"); 1594 strcat (retbuf_all, " -");
1121 strcat(retbuf_all, move_name[count]); 1595 strcat (retbuf_all, move_name[count]);
1122 all_count++; 1596 all_count++;
1123 } 1597 }
1124 } 1598 }
1125 /* Basically, if there is a single negation, return it, eg 1599 /* Basically, if there is a single negation, return it, eg
1126 * 'all -swim'. But more than that, just return the 1600 * 'all -swim'. But more than that, just return the
1127 * enumerated values. It doesn't make sense to return 1601 * enumerated values. It doesn't make sense to return
1128 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' 1602 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1129 */ 1603 */
1130 if (all_count <=1) return retbuf_all+1; 1604 if (all_count <= 1)
1605 return retbuf_all + 1;
1606 else
1131 else return retbuf+1; 1607 return retbuf + 1;
1132} 1608}
1133 1609#endif
1134 1610
1135// compare *op against *tmp and output differences 1611// compare *op against *tmp and output differences
1136void 1612void
1137put (object_freezer &f, object *op, object *tmp) 1613put (object_freezer &f, object *op, object *tmp)
1138{ 1614{
… …
1153 1629
1154 /* We don't need to worry about the arch's extra fields - they 1630 /* We don't need to worry about the arch's extra fields - they
1155 * will get taken care of the copy_object function. 1631 * will get taken care of the copy_object function.
1156 */ 1632 */
1157 1633
1634 {
1635 char uids[64];
1636 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1637 f.put (KW_uuid, (const char *)uids);
1638 }
1639
1158# define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1640#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v)
1159# define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1641#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v)
1160 1642
1161 CMP_OUT (name); 1643 CMP_OUT (name);
1162 CMP_OUT (name_pl); 1644 CMP_OUT (name_pl);
1163 CMP_OUT (custom_name); 1645 CMP_OUT (custom_name);
1164 CMP_OUT (title); 1646 CMP_OUT (title);
1165 CMP_OUT (race); 1647 CMP_OUT (race);
1166 CMP_OUT (slaying); 1648 CMP_OUT (slaying);
1167 1649
1168 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg); 1650 if (op->msg != tmp->msg)
1651 f.put (KW_msg, KW_endmsg, op->msg);
1652 if (op->lore != tmp->lore)
1169 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1653 f.put (KW_lore, KW_endlore, op->lore);
1170 1654
1171 CMP_OUT (other_arch); 1655 CMP_OUT (other_arch);
1172 CMP_OUT (face); 1656 CMP_OUT (face);
1657
1658 if (!op->face || !op->face->name)
1659 printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>"); //D
1173 1660
1174 if (op->animation_id != tmp->animation_id) 1661 if (op->animation_id != tmp->animation_id)
1175 if (op->animation_id) 1662 if (op->animation_id)
1176 { 1663 {
1177 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1664 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1178 1665
1179 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1666 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1180 f.put (KW_is_animated, 0); 1667 f.put (KW_is_animated, (sint32) 0);
1181 } 1668 }
1182 else 1669 else
1183 f.put (KW_animation, "NONE"); 1670 f.put (KW_animation, (const char *) 0);
1184 1671
1185 CMP_OUT2 (str , stats.Str); 1672 CMP_OUT2 (str, stats.Str);
1186 CMP_OUT2 (dex , stats.Dex); 1673 CMP_OUT2 (dex, stats.Dex);
1187 CMP_OUT2 (con , stats.Con); 1674 CMP_OUT2 (con, stats.Con);
1188 CMP_OUT2 (wis , stats.Wis); 1675 CMP_OUT2 (wis, stats.Wis);
1189 CMP_OUT2 (pow , stats.Pow); 1676 CMP_OUT2 (pow, stats.Pow);
1190 CMP_OUT2 (cha , stats.Cha); 1677 CMP_OUT2 (cha, stats.Cha);
1191 CMP_OUT2 (int , stats.Int); 1678 CMP_OUT2 (int, stats.Int);
1679
1192 CMP_OUT2 (hp , stats.hp); 1680 CMP_OUT2 (hp, stats.hp);
1193 CMP_OUT2 (maxhp , stats.maxhp); 1681 CMP_OUT2 (maxhp, stats.maxhp);
1194 CMP_OUT2 (sp , stats.sp); 1682 CMP_OUT2 (sp, stats.sp);
1195 CMP_OUT2 (maxsp , stats.maxsp); 1683 CMP_OUT2 (maxsp, stats.maxsp);
1196 CMP_OUT2 (grace , stats.grace); 1684 CMP_OUT2 (grace, stats.grace);
1197 CMP_OUT2 (maxgrace, stats.maxgrace); 1685 CMP_OUT2 (maxgrace, stats.maxgrace);
1198 CMP_OUT2 (exp , stats.exp); 1686 CMP_OUT2 (exp, stats.exp);
1199 1687
1200 CMP_OUT (perm_exp); 1688 CMP_OUT (perm_exp);
1201 CMP_OUT (expmul); 1689 CMP_OUT (expmul);
1202 1690
1203 CMP_OUT2 (food , stats.food); 1691 CMP_OUT2 (food, stats.food);
1204 CMP_OUT2 (dam , stats.dam); 1692 CMP_OUT2 (dam, stats.dam);
1205 CMP_OUT2 (luck , stats.luck); 1693 CMP_OUT2 (luck, stats.luck);
1206 CMP_OUT2 (wc , stats.wc); 1694 CMP_OUT2 (wc, stats.wc);
1207 CMP_OUT2 (ac , stats.ac); 1695 CMP_OUT2 (ac, stats.ac);
1208 1696
1209 CMP_OUT (x); 1697 CMP_OUT (x);
1210 CMP_OUT (y); 1698 CMP_OUT (y);
1211 CMP_OUT (speed); 1699 CMP_OUT (speed);
1212 CMP_OUT (speed_left); 1700 CMP_OUT (speed_left);
… …
1218 CMP_OUT (type); 1706 CMP_OUT (type);
1219 CMP_OUT (subtype); 1707 CMP_OUT (subtype);
1220 CMP_OUT (attacktype); 1708 CMP_OUT (attacktype);
1221 1709
1222 for (i = 0; i < NROFATTACKS; i++) 1710 for (i = 0; i < NROFATTACKS; i++)
1223 if (op->resist [i] != tmp->resist [i]) 1711 if (op->resist[i] != tmp->resist[i])
1224 f.put (resist_save [i], op->resist [i]); 1712 f.put (resist_save[i], op->resist[i]);
1225 1713
1226 CMP_OUT (path_attuned); 1714 CMP_OUT (path_attuned);
1227 CMP_OUT (path_repelled); 1715 CMP_OUT (path_repelled);
1228 CMP_OUT (path_denied); 1716 CMP_OUT (path_denied);
1229 CMP_OUT (material); 1717 CMP_OUT (material);
… …
1270 CMP_OUT (move_slow); 1758 CMP_OUT (move_slow);
1271 CMP_OUT (move_slow_penalty); 1759 CMP_OUT (move_slow_penalty);
1272 1760
1273 if (!COMPARE_FLAGS (op, tmp)) 1761 if (!COMPARE_FLAGS (op, tmp))
1274 for (i = 0; i <= NUM_FLAGS; i++) 1762 for (i = 0; i <= NUM_FLAGS; i++)
1275 if (flag_names [i]
1276 && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1763 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))
1277 f.put (flag_names [i], QUERY_FLAG (op, i) ? "1" : 0); 1764 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0");
1278 1765
1279 /* Save body locations */ 1766 /* Save body locations */
1280 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1767 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1281 if (op->body_info[i] != tmp->body_info[i]) 1768 if (op->body_info[i] != tmp->body_info[i])
1282 f.put (body_locations[i].save_name, op->body_info[i]); 1769 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1289 * If bit 1 of flag is set, don't remove the object after save. As of now, 1776 * If bit 1 of flag is set, don't remove the object after save. As of now,
1290 * all of the callers are setting this. 1777 * all of the callers are setting this.
1291 */ 1778 */
1292 1779
1293void 1780void
1294save_object (object_freezer &fp, object *op, int flag) 1781save_object (object_freezer & fp, object *op, int flag)
1295{ 1782{
1296 archetype *at; 1783 archetype *at;
1297 object *tmp, *old; 1784 object *tmp, *old;
1298 1785
1299 /* Even if the object does have an owner, it would seem that we should 1786 /* Even if the object does have an owner, it would seem that we should
1300 * still save it. 1787 * still save it.
1301 */ 1788 */
1302 if (op->owner != NULL) 1789 if (op->owner)
1303 return; 1790 return;
1304 1791
1305 /* If it is unpaid and we don't want to save those, just return. */ 1792 /* If it is unpaid and we don't want to save those, just return. */
1306 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1793 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))
1307 return; 1794 return;

Diff Legend

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