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.5 by root, Mon Sep 4 16:46:32 2006 UTC vs.
Revision 1.14 by root, Tue Sep 12 19:20:06 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 {
514 case KW_Object: // uppercase alias 505 case KW_Object: // uppercase alias
515 case KW_object: 506 case KW_object:
516 thawer.get (op->name); 507 thawer.get (op->name);
517 508
518 if (op->arch != NULL) 509 if (op->arch != NULL)
519 op->arch->name = op->name; 510 op->arch->name = op->name;
520 511
521 break; 512 break;
522 513
514 case KW_oid:
523 case KW_oid: thawer.get (op, thawer.get_sint32 ()); break; 515 thawer.get (op, thawer.get_sint32 ());
516 break;
524 517
518 case KW_name:
525 case KW_name: thawer.get (op->name); break; 519 thawer.get (op->name);
520 break;
521 case KW_name_pl:
526 case KW_name_pl: thawer.get (op->name_pl); break; 522 thawer.get (op->name_pl);
523 break;
524 case KW_title:
527 case KW_title: thawer.get (op->title); break; 525 thawer.get (op->title);
528 case KW_custom_name: thawer.get (op->custom_name); break; 526 break;
527 case KW_custom_name:
528 thawer.get (op->custom_name);
529 break;
530 case KW_attach:
529 case KW_attach: thawer.get_ornull (op->attach); break; 531 thawer.get_ornull (op->attach);
532 break;
533 case KW_skill:
530 case KW_skill: thawer.get_ornull (op->skill); break; 534 thawer.get_ornull (op->skill);
535 break;
536 case KW_race:
531 case KW_race: thawer.get_ornull (op->race); break; 537 thawer.get_ornull (op->race);
538 break;
539 case KW_slaying:
532 case KW_slaying: thawer.get_ornull (op->slaying); break; 540 thawer.get_ornull (op->slaying);
541 break;
533 542
534 case KW_arch: 543 case KW_arch:
535 { 544 {
536 const char *str = thawer.get_str (); 545 const char *str = thawer.get_str ();
537 546
538 if (op->arch) 547 if (op->arch)
548 {
549 /* If op->arch has been set, then this new object
550 * must be part of the inventory. So process
551 * appropriately.
552 */
553 archetype *arch = find_archetype (str);
554
555 object *tmp;
556
557 if (arch != NULL)
558 tmp = arch_to_object (arch);
559 else
560 {
561 tmp = get_object ();
562 /* record the name of the broken object */
563 tmp->name = str;
564 }
565
566 parse_object (tmp, thawer, map_flags);
567
568 if (tmp->arch)
569 {
570 // was: insert_ob_in_ob (tmp, op);
571 // but manually adding it can improve map loading times a lot
572 // also, appending instead of prepending keeps the
573 // save ordering the same between repeated load/saves.
574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
575 CLEAR_FLAG (tmp, FLAG_REMOVED);
576
577 if (!op_inv)
578 {
579 op->inv = tmp;
580 tmp->above = 0;
581 }
582 else
583 {
584 while (op_inv->below)
585 op_inv = op_inv->below;
586
587 op_inv->below = tmp;
588 tmp->above = op_inv;
589 }
590
591 tmp->below = 0;
592 tmp->env = op;
593 op_inv = tmp;
594 }
595 else
596 {
597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
598 free_object (tmp);
599 }
600 }
601 else
602 {
603 /* This is the actual archetype definition then */
604 op->arch = find_archetype (str);
605
606 if (op->arch != NULL)
607 copy_object (&op->arch->clone, op);
608 else if (!arch_init)
609 /* record the name of the broken object */
610 op->name = str;
611 }
612 }
613 break;
614
615 case KW_other_arch:
616 op->other_arch = find_archetype (thawer.get_str ());
617 break;
618
619 case KW_animation:
620 {
621 const char *str = thawer.get_str ();
622
623 if (!str)
624 {
625 op->animation_id = 0;
626 CLEAR_FLAG (op, FLAG_ANIMATE);
627 }
628 else
629 {
630 op->animation_id = find_animation (str);
631 SET_FLAG (op, FLAG_ANIMATE);
632 }
633 }
634
635 break;
636
637 case KW_last_heal:
638 thawer.get (op->last_heal);
639 break;
640 case KW_last_sp:
641 thawer.get (op->last_sp);
642 break;
643 case KW_last_grace:
644 thawer.get (op->last_grace);
645 break;
646 case KW_last_eat:
647 thawer.get (op->last_eat);
648 break;
649 case KW_speed_left:
650 thawer.get (op->speed_left);
651 break;
652
653 case KW_speed:
654 thawer.get (op->speed);
655
656 //TODO: maybe do in check_object
657 if (!(map_flags & MAP_STYLE))
539 { 658 {
540 /* If op->arch has been set, then this new object 659 if (op->speed < 0)
541 * must be part of the inventory. So process 660 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
542 * appropriately. 661
662 update_ob_speed (op);
543 */ 663 }
544 archetype *arch = find_archetype (str);
545 664
546 object *tmp; 665 break;
547 666
548 if (arch != NULL) 667 case KW_slow_move:
549 tmp = arch_to_object (arch); 668 op->move_slow |= MOVE_WALK;
669 thawer.get (op->move_slow_penalty);
670 break;
671
672 case KW_face:
673 op->face = &new_faces[FindFace (thawer.get_str (), 0)];
674 break;
675
676 case KW_x:
677 thawer.get (op->x);
678 break;
679 case KW_y:
680 thawer.get (op->y);
681 break;
682 case KW_Str: // uppercase alias
683 case KW_str:
684 thawer.get (op->stats.Str);
685 break;
686 case KW_Dex: // uppercase alias
687 case KW_dex:
688 thawer.get (op->stats.Dex);
689 break;
690 case KW_Con: // uppercase alias
691 case KW_con:
692 thawer.get (op->stats.Con);
693 break;
694 case KW_Wis: // uppercase alias
695 case KW_wis:
696 thawer.get (op->stats.Wis);
697 break;
698 case KW_Cha: // uppercase alias
699 case KW_cha:
700 thawer.get (op->stats.Cha);
701 break;
702 case KW_Int: // uppercase alias
703 case KW_int:
704 thawer.get (op->stats.Int);
705 break;
706 case KW_Pow: // uppercase alias
707 case KW_pow:
708 thawer.get (op->stats.Pow);
709 break;
710 case KW_hp:
711 thawer.get (op->stats.hp);
712 break;
713 case KW_maxhp:
714 thawer.get (op->stats.maxhp);
715 break;
716 case KW_sp:
717 thawer.get (op->stats.sp);
718 break;
719 case KW_maxsp:
720 thawer.get (op->stats.maxsp);
721 break;
722 case KW_grace:
723 thawer.get (op->stats.grace);
724 break;
725 case KW_maxgrace:
726 thawer.get (op->stats.maxgrace);
727 break;
728
729 case KW_exp:
730 thawer.get (op->stats.exp);
731 break;
732 case KW_perm_exp:
733 thawer.get (op->perm_exp);
734 break;
735 case KW_food:
736 thawer.get (op->stats.food);
737 break;
738 case KW_dam:
739 thawer.get (op->stats.dam);
740 break;
741 case KW_wc:
742 thawer.get (op->stats.wc);
743 break;
744 case KW_ac:
745 thawer.get (op->stats.ac);
746 break;
747 case KW_nrof:
748 thawer.get (op->nrof);
749 break;
750 case KW_level:
751 thawer.get (op->level);
752 break;
753 case KW_direction:
754 thawer.get (op->direction);
755 break;
756 case KW_type:
757 thawer.get (op->type);
758 break;
759 case KW_subtype:
760 thawer.get (op->subtype);
761 break;
762 case KW_value:
763 thawer.get (op->value);
764 break;
765 case KW_weight:
766 thawer.get (op->weight);
767 break;
768 case KW_carrying:
769 thawer.get (op->carrying);
770 break;
771 case KW_attacktype:
772 thawer.get (op->attacktype);
773 break;
774 case KW_path_attuned:
775 thawer.get (op->path_attuned);
776 break;
777 case KW_path_repelled:
778 thawer.get (op->path_repelled);
779 break;
780 case KW_path_denied:
781 thawer.get (op->path_denied);
782 break;
783 case KW_invisible:
784 thawer.get (op->invisible);
785 break;
786 case KW_magic:
787 thawer.get (op->magic);
788 break;
789 case KW_state:
790 thawer.get (op->state);
791 break;
792 case KW_move_slow_penalty:
793 thawer.get (op->move_slow_penalty);
794 break;
795 case KW_material:
796 thawer.get (op->material);
797 break;
798 case KW_materialname:
799 thawer.get (op->materialname);
800 break;
801
802 /* These are the new values */
803 case KW_move_block:
804 set_move (op->move_block, thawer.get_str ());
805 break;
806 case KW_move_allow:
807 set_move (op->move_allow, thawer.get_str ());
808 break;
809 case KW_move_type:
810 set_move (op->move_type, thawer.get_str ());
811 break;
812 case KW_move_on:
813 set_move (op->move_on, thawer.get_str ());
814 break;
815 case KW_move_off:
816 set_move (op->move_off, thawer.get_str ());
817 break;
818 case KW_move_slow:
819 set_move (op->move_slow, thawer.get_str ());
820 break;
821
822 /* These are all legacy - any new objects should use the move_ .. values */
823 case KW_no_pass:
824 {
825 if (thawer.get_sint32 ())
826 op->move_block = MOVE_ALL;
550 else 827 else
551 { 828 op->move_block = 0;
552 tmp = get_object ();
553 /* record the name of the broken object */
554 tmp->name = str;
555 } 829 }
556 830
557 parse_object (tmp, thawer, map_flags); 831 break;
558 832
559 if (tmp->arch) 833 /* These are all legacy - any new objects should use the move_ .. values */
834 case KW_walk_on:
560 { 835 {
561 // was: insert_ob_in_ob (tmp, op); 836 if (thawer.get_sint32 ())
562 // but manually addint it can improve map loading times a lot 837 op->move_on |= MOVE_WALK;
563 tmp->env = op;
564
565 if (!op->inv)
566 op->inv = tmp;
567 else
568 {
569 tmp->below = op->inv;
570 tmp->below->above = tmp;
571 op->inv = tmp;
572 }
573 }
574 else 838 else
839 op->move_on &= ~MOVE_WALK;
840 }
841
842 break;
843
844 /* These are all legacy - any new objects should use the move_ .. values */
845 case KW_walk_off:
846 {
847 if (thawer.get_sint32 ())
848 op->move_off |= MOVE_WALK;
849 else
850 op->move_off &= ~MOVE_WALK;
851 }
852 break;
853
854 /* These are all legacy - any new objects should use the move_ .. values */
855 case KW_fly_on:
856 {
857 if (thawer.get_sint32 ())
858 op->move_on |= MOVE_FLY_LOW;
859 else
860 op->move_on &= ~MOVE_FLY_LOW;
861 }
862 break;
863
864 /* These are all legacy - any new objects should use the move_ .. values */
865 case KW_fly_off:
866 {
867 if (thawer.get_sint32 ())
868 op->move_off |= MOVE_FLY_LOW;
869 else
870 op->move_off &= ~MOVE_FLY_LOW;
871 }
872 break;
873
874 //TODO: remove these after convertign archetypes
875 case KW_can_use_wand:
876 GET_FLAG (op, FLAG_USE_RANGE);
877 break;
878
879 /* These are all legacy - any new objects should use the move_ .. values */
880 case KW_flying:
881 {
882 if (thawer.get_sint32 ())
883 op->move_type |= MOVE_FLY_LOW;
884 else
885 op->move_type &= ~MOVE_FLY_LOW;
886 }
887 break;
888
889
890 case KW_identified:
891 GET_FLAG (op, FLAG_IDENTIFIED);
892 //TODO: move to check_object or so
893 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
894 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
895
896 break;
897
898 case KW_wiz:
899 GET_FLAG (op, FLAG_WIZ);
900 //TODO: move to check_object
901 if (QUERY_FLAG (op, FLAG_WIZ))
575 { 902 {
576 LOG (llevDebug, "Discarding object without arch: %s\n", 903 SET_FLAG (op, FLAG_WAS_WIZ);
577 tmp->name ? (const char *) tmp->name : "(null)"); 904 SET_FLAG (op, FLAG_WIZPASS);
578 free_object (tmp); 905 SET_FLAG (op, FLAG_WIZCAST);
579 }
580 } 906 }
581 else 907 else
582 { 908 {
583 /* This is the actual archetype definition then */ 909 CLEAR_FLAG (op, FLAG_WIZPASS);
584 op->arch = find_archetype (str); 910 CLEAR_FLAG (op, FLAG_WIZCAST);
585
586 if (op->arch != NULL)
587 copy_object (&op->arch->clone, op);
588 else if (!arch_init)
589 /* record the name of the broken object */
590 op->name = str;
591 } 911 }
592 }
593 break; 912 break;
594 913
595 case KW_other_arch: 914 case KW_friendly:
596 op->other_arch = find_archetype (thawer.get_str ()); 915 GET_FLAG (op, FLAG_FRIENDLY);
916 //TODO: move to check_object or so
917 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
918 add_friendly_object (op);
597 break; 919 break;
598 920
599 case KW_animation: 921 case KW_monster:
600 {
601 const char *str = thawer.get_str ();
602
603 if (!str)
604 {
605 op->animation_id = 0;
606 CLEAR_FLAG (op, FLAG_ANIMATE);
607 }
608 else
609 {
610 op->animation_id = find_animation (str);
611 SET_FLAG (op, FLAG_ANIMATE); 922 GET_FLAG (op, FLAG_MONSTER);
612 }
613 }
614
615 break; 923 break;
616 924 case KW_neutral:
617 case KW_last_heal: thawer.get (op->last_heal); break; 925 GET_FLAG (op, FLAG_NEUTRAL);
618 case KW_last_sp: thawer.get (op->last_sp); break; 926 break;
619 case KW_last_grace: thawer.get (op->last_grace); break; 927 case KW_no_attack:
620 case KW_last_eat: thawer.get (op->last_eat); break; 928 GET_FLAG (op, FLAG_NO_ATTACK);
621 case KW_speed_left: thawer.get (op->speed_left); break; 929 break;
622 930 case KW_no_damage:
931 GET_FLAG (op, FLAG_NO_DAMAGE);
932 break;
933 case KW_generator:
934 GET_FLAG (op, FLAG_GENERATOR);
935 break;
936 case KW_use_content_on_gen:
937 GET_FLAG (op, FLAG_CONTENT_ON_GEN);
938 break;
939 case KW_is_thrown:
940 GET_FLAG (op, FLAG_IS_THROWN);
941 break;
942 case KW_auto_apply:
943 GET_FLAG (op, FLAG_AUTO_APPLY);
944 break;
945 case KW_treasure:
946 GET_FLAG (op, FLAG_TREASURE);
947 break;
948 case KW_see_invisible:
949 GET_FLAG (op, FLAG_SEE_INVISIBLE);
950 break;
951 case KW_can_roll:
952 GET_FLAG (op, FLAG_CAN_ROLL);
953 break;
954 case KW_overlay_floor:
955 GET_FLAG (op, FLAG_OVERLAY_FLOOR);
956 break;
957 case KW_is_turnable:
958 GET_FLAG (op, FLAG_IS_TURNABLE);
959 break;
960 case KW_is_used_up:
961 GET_FLAG (op, FLAG_IS_USED_UP);
962 break;
963 case KW_alive:
964 GET_FLAG (op, FLAG_ALIVE);
965 break;
966 case KW_applied:
967 GET_FLAG (op, FLAG_APPLIED);
968 break;
969 case KW_unpaid:
970 GET_FLAG (op, FLAG_UNPAID);
971 break;
972 case KW_is_animated:
973 GET_FLAG (op, FLAG_ANIMATE);
974 break;
975 case KW_no_pick:
976 GET_FLAG (op, FLAG_NO_PICK);
977 break;
978 case KW_reflecting:
979 GET_FLAG (op, FLAG_REFLECTING);
980 break;
981 case KW_changing:
982 GET_FLAG (op, FLAG_CHANGING);
983 break;
984 case KW_splitting:
985 GET_FLAG (op, FLAG_SPLITTING);
986 break;
987 case KW_hitback:
988 GET_FLAG (op, FLAG_HITBACK);
989 break;
990 case KW_startequip:
991 GET_FLAG (op, FLAG_STARTEQUIP);
992 break;
993 case KW_blocksview:
994 GET_FLAG (op, FLAG_BLOCKSVIEW);
995 break;
996 case KW_undead:
997 GET_FLAG (op, FLAG_UNDEAD);
998 break;
999 case KW_scared:
1000 GET_FLAG (op, FLAG_SCARED);
1001 break;
1002 case KW_unaggressive:
1003 GET_FLAG (op, FLAG_UNAGGRESSIVE);
1004 break;
1005 case KW_reflect_missile:
1006 GET_FLAG (op, FLAG_REFL_MISSILE);
1007 break;
1008 case KW_reflect_spell:
1009 GET_FLAG (op, FLAG_REFL_SPELL);
1010 break;
1011 case KW_no_magic:
1012 GET_FLAG (op, FLAG_NO_MAGIC);
1013 break;
1014 case KW_no_drop:
1015 GET_FLAG (op, FLAG_NO_DROP);
1016 break;
1017 case KW_random_movement:
1018 GET_FLAG (op, FLAG_RANDOM_MOVE);
1019 break;
1020 case KW_was_wiz:
1021 GET_FLAG (op, FLAG_WAS_WIZ);
1022 break;
1023 case KW_no_fix_player:
1024 GET_FLAG (op, FLAG_NO_FIX_PLAYER);
1025 break;
1026 case KW_is_lightable:
1027 GET_FLAG (op, FLAG_IS_LIGHTABLE);
1028 break;
1029 case KW_tear_down:
1030 GET_FLAG (op, FLAG_TEAR_DOWN);
1031 break;
1032 case KW_can_use_shield:
1033 GET_FLAG (op, FLAG_USE_SHIELD);
1034 break;
1035 case KW_can_cast_spell:
1036 GET_FLAG (op, FLAG_CAST_SPELL);
1037 break;
1038 case KW_can_use_scroll:
1039 GET_FLAG (op, FLAG_USE_SCROLL);
1040 break;
1041 case KW_can_use_range:
1042 GET_FLAG (op, FLAG_USE_RANGE);
1043 break;
1044 case KW_can_use_bow:
1045 GET_FLAG (op, FLAG_USE_BOW);
1046 break;
1047 case KW_can_use_armour:
1048 GET_FLAG (op, FLAG_USE_ARMOUR);
1049 break;
1050 case KW_can_use_weapon:
1051 GET_FLAG (op, FLAG_USE_WEAPON);
1052 break;
1053 case KW_can_use_ring:
1054 GET_FLAG (op, FLAG_USE_RING);
1055 break;
1056 case KW_has_ready_bow:
1057 GET_FLAG (op, FLAG_READY_BOW);
1058 break;
1059 case KW_xrays:
1060 GET_FLAG (op, FLAG_XRAYS);
1061 break;
1062 case KW_is_floor:
1063 GET_FLAG (op, FLAG_IS_FLOOR);
1064 break;
1065 case KW_lifesave:
1066 GET_FLAG (op, FLAG_LIFESAVE);
1067 break;
1068 case KW_no_strength:
1069 GET_FLAG (op, FLAG_NO_STRENGTH);
1070 break;
623 case KW_speed: 1071 case KW_sleep:
1072 GET_FLAG (op, FLAG_SLEEP);
1073 break;
1074 case KW_stand_still:
1075 GET_FLAG (op, FLAG_STAND_STILL);
1076 break;
1077 case KW_random_move:
1078 GET_FLAG (op, FLAG_RANDOM_MOVE);
1079 break;
1080 case KW_only_attack:
1081 GET_FLAG (op, FLAG_ONLY_ATTACK);
1082 break;
1083 case KW_activate_on_push:
1084 GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH);
1085 break;
1086 case KW_activate_on_release:
1087 GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE);
1088 break;
1089 case KW_confused:
1090 GET_FLAG (op, FLAG_CONFUSED);
1091 break;
1092 case KW_stealth:
1093 GET_FLAG (op, FLAG_STEALTH);
1094 break;
1095 case KW_cursed:
1096 GET_FLAG (op, FLAG_CURSED);
1097 break;
1098 case KW_damned:
1099 GET_FLAG (op, FLAG_DAMNED);
1100 break;
1101 case KW_see_anywhere:
1102 GET_FLAG (op, FLAG_SEE_ANYWHERE);
1103 break;
1104 case KW_known_magical:
1105 GET_FLAG (op, FLAG_KNOWN_MAGICAL);
1106 break;
1107 case KW_known_cursed:
1108 GET_FLAG (op, FLAG_KNOWN_CURSED);
1109 break;
1110 case KW_can_use_skill:
1111 GET_FLAG (op, FLAG_CAN_USE_SKILL);
1112 break;
1113 case KW_been_applied:
1114 GET_FLAG (op, FLAG_BEEN_APPLIED);
1115 break;
1116 case KW_has_ready_scroll:
1117 GET_FLAG (op, FLAG_READY_SCROLL);
1118 break;
1119 case KW_can_use_rod:
1120 GET_FLAG (op, FLAG_USE_ROD);
1121 break;
1122 case KW_can_use_horn:
1123 GET_FLAG (op, FLAG_USE_HORN);
1124 break;
1125 case KW_unique:
1126 GET_FLAG (op, FLAG_UNIQUE);
1127 break;
1128 case KW_make_invisible:
1129 GET_FLAG (op, FLAG_MAKE_INVIS);
1130 break;
1131 case KW_inv_locked:
1132 GET_FLAG (op, FLAG_INV_LOCKED);
1133 break;
1134 case KW_is_wooded:
1135 GET_FLAG (op, FLAG_IS_WOODED);
1136 break;
1137 case KW_is_hilly:
1138 GET_FLAG (op, FLAG_IS_HILLY);
1139 break;
1140 case KW_is_water:
1141 GET_FLAG (op, FLAG_IS_WATER);
1142 break;
1143 case KW_has_ready_skill:
1144 GET_FLAG (op, FLAG_READY_SKILL);
1145 break;
1146 case KW_has_ready_weapon:
1147 GET_FLAG (op, FLAG_READY_WEAPON);
1148 break;
1149 case KW_no_skill_ident:
1150 GET_FLAG (op, FLAG_NO_SKILL_IDENT);
1151 break;
1152 case KW_is_blind:
1153 GET_FLAG (op, FLAG_BLIND);
1154 break;
1155 case KW_can_see_in_dark:
1156 GET_FLAG (op, FLAG_SEE_IN_DARK);
1157 break;
1158 case KW_is_cauldron:
1159 GET_FLAG (op, FLAG_IS_CAULDRON);
1160 break;
1161 case KW_no_steal:
1162 GET_FLAG (op, FLAG_NO_STEAL);
1163 break;
1164 case KW_one_hit:
1165 GET_FLAG (op, FLAG_ONE_HIT);
1166 break;
1167 case KW_berserk:
1168 GET_FLAG (op, FLAG_BERSERK);
1169 break;
1170 case KW_is_buildable:
1171 GET_FLAG (op, FLAG_IS_BUILDABLE);
1172 break;
1173
1174 case KW_armour:
1175 thawer.get (op->resist[ATNR_PHYSICAL]);
1176 break;
1177 case KW_resist_physical:
1178 thawer.get (op->resist[ATNR_PHYSICAL]);
1179 break;
1180 case KW_resist_magic:
1181 thawer.get (op->resist[ATNR_MAGIC]);
1182 break;
1183 case KW_resist_fire:
1184 thawer.get (op->resist[ATNR_FIRE]);
1185 break;
1186 case KW_resist_electricity:
1187 thawer.get (op->resist[ATNR_ELECTRICITY]);
1188 break;
1189 case KW_resist_cold:
1190 thawer.get (op->resist[ATNR_COLD]);
1191 break;
1192 case KW_resist_confusion:
1193 thawer.get (op->resist[ATNR_CONFUSION]);
1194 break;
1195 case KW_resist_acid:
1196 thawer.get (op->resist[ATNR_ACID]);
1197 break;
1198 case KW_resist_drain:
1199 thawer.get (op->resist[ATNR_DRAIN]);
1200 break;
1201 case KW_resist_weaponmagic:
1202 thawer.get (op->resist[ATNR_WEAPONMAGIC]);
1203 break;
1204 case KW_resist_ghosthit:
1205 thawer.get (op->resist[ATNR_GHOSTHIT]);
1206 break;
1207 case KW_resist_poison:
1208 thawer.get (op->resist[ATNR_POISON]);
1209 break;
1210 case KW_resist_slow:
1211 thawer.get (op->resist[ATNR_SLOW]);
1212 break;
1213 case KW_resist_paralyze:
1214 thawer.get (op->resist[ATNR_PARALYZE]);
1215 break;
1216 case KW_resist_turn_undead:
1217 thawer.get (op->resist[ATNR_TURN_UNDEAD]);
1218 break;
1219 case KW_resist_fear:
1220 thawer.get (op->resist[ATNR_FEAR]);
1221 break;
1222 case KW_resist_cancellation:
1223 thawer.get (op->resist[ATNR_CANCELLATION]);
1224 break;
1225 case KW_resist_deplete:
1226 thawer.get (op->resist[ATNR_DEPLETE]);
1227 break;
1228 case KW_resist_death:
1229 thawer.get (op->resist[ATNR_DEATH]);
1230 break;
1231 case KW_resist_chaos:
1232 thawer.get (op->resist[ATNR_CHAOS]);
1233 break;
1234 case KW_resist_counterspell:
1235 thawer.get (op->resist[ATNR_COUNTERSPELL]);
1236 break;
1237 case KW_resist_godpower:
1238 thawer.get (op->resist[ATNR_GODPOWER]);
1239 break;
1240 case KW_resist_holyword:
1241 thawer.get (op->resist[ATNR_HOLYWORD]);
1242 break;
1243 case KW_resist_blind:
1244 thawer.get (op->resist[ATNR_BLIND]);
1245 break;
1246 case KW_resist_internal:
1247 thawer.get (op->resist[ATNR_INTERNAL]);
1248 break;
1249 case KW_resist_life_stealing:
1250 thawer.get (op->resist[ATNR_LIFE_STEALING]);
1251 break;
1252 case KW_resist_disease:
1253 thawer.get (op->resist[ATNR_DISEASE]);
1254 break;
1255
1256 case KW_luck:
1257 thawer.get (op->stats.luck);
1258 break;
1259 case KW_run_away:
1260 thawer.get (op->run_away);
1261 break;
1262 case KW_pick_up:
1263 thawer.get (op->pick_up);
1264 break;
1265 case KW_item_power:
1266 thawer.get (op->item_power);
1267 break;
1268 case KW_gen_sp_armour:
1269 thawer.get (op->gen_sp_armour);
1270 break;
1271 case KW_anim_speed:
624 thawer.get (op->speed); 1272 thawer.get (op->anim_speed);
1273 break;
1274 case KW_container:
1275 thawer.get (op->weight_limit);
1276 break;
1277 case KW_will_apply:
1278 thawer.get (op->will_apply);
1279 break;
1280 case KW_attack_movement:
1281 thawer.get (op->attack_movement);
1282 break;
1283 case KW_move_state:
1284 thawer.get (op->move_status);
1285 break;
1286 case KW_expmul:
1287 thawer.get (op->expmul);
1288 break;
1289 case KW_glow_radius:
1290 thawer.get (op->glow_radius);
1291 break;
1292 case KW_weapontype:
1293 thawer.get (op->weapontype);
1294 break;
1295 case KW_tooltype:
1296 thawer.get (op->tooltype);
1297 break;
1298 case KW_casting_time:
1299 thawer.get (op->casting_time);
1300 break;
1301 case KW_elevation:
1302 thawer.get (op->elevation);
1303 break;
1304 case KW_smoothlevel:
1305 thawer.get (op->smoothlevel);
1306 break;
1307 case KW_client_type:
1308 thawer.get (op->client_type);
1309 break;
1310 case KW_duration:
1311 thawer.get (op->duration);
1312 break;
1313 case KW_range:
1314 thawer.get (op->range);
1315 break;
1316 case KW_range_modifier:
1317 thawer.get (op->range_modifier);
1318 break;
1319 case KW_dam_modifier:
1320 thawer.get (op->dam_modifier);
1321 break;
1322 case KW_duration_modifier:
1323 thawer.get (op->duration_modifier);
1324 break;
625 1325
626 //TODO: maybe do in check_object 1326 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
627 if (!(map_flags & MAP_STYLE)) 1327 //TODO: parse from other include files
1328 case KW_body_range:
1329 thawer.get (op->body_info[0]);
1330 break;
1331 case KW_body_arm:
1332 thawer.get (op->body_info[1]);
1333 break;
1334 case KW_body_torso:
1335 thawer.get (op->body_info[2]);
1336 break;
1337 case KW_body_head:
1338 thawer.get (op->body_info[3]);
1339 break;
1340 case KW_body_neck:
1341 thawer.get (op->body_info[4]);
1342 break;
1343 case KW_body_skill:
1344 thawer.get (op->body_info[5]);
1345 break;
1346 case KW_body_finger:
1347 thawer.get (op->body_info[6]);
1348 break;
1349 case KW_body_shoulder:
1350 thawer.get (op->body_info[7]);
1351 break;
1352 case KW_body_foot:
1353 thawer.get (op->body_info[8]);
1354 break;
1355 case KW_body_hand:
1356 thawer.get (op->body_info[9]);
1357 break;
1358 case KW_body_wrist:
1359 thawer.get (op->body_info[10]);
1360 break;
1361 case KW_body_waist:
1362 thawer.get (op->body_info[11]);
1363 break;
1364 case KW_can_apply:
1365 break;
1366
1367 case KW_connected:
1368 add_button_link (op, op->map, thawer.get_sint32 ());
1369 break;
1370
1371 case KW_randomitems:
1372 op->randomitems = find_treasurelist (thawer.get_str ());
1373 break;
1374
1375 case KW_msg:
628 { 1376 {
629 if (op->speed < 0) 1377 thawer.get_ml (KW_endmsg, op->msg);
630 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 1378 //TODO: allow longer messages
631 1379 if (strlen (op->msg) >= HUGE_BUF)
632 update_ob_speed (op); 1380 {
1381 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
1382 op->msg = "ERROR, please report: string too long, winged.\n";
1383 }
633 } 1384 }
634
635 break; 1385 break;
636 1386
637 case KW_slow_move:
638 op->move_slow |= MOVE_WALK;
639 thawer.get (op->move_slow_penalty);
640 break;
641
642 case KW_face:
643 if (const char *str = thawer.get_str ())
644 op->face = &new_faces[FindFace (str, 0)];
645 else
646 op->face = 0;
647 break;
648
649 case KW_x: thawer.get (op->x); break;
650 case KW_y: thawer.get (op->y); break;
651 case KW_Str: // uppercase alias
652 case KW_str: thawer.get (op->stats.Str); break;
653 case KW_Dex: // uppercase alias
654 case KW_dex: thawer.get (op->stats.Dex); break;
655 case KW_Con: // uppercase alias
656 case KW_con: thawer.get (op->stats.Con); break;
657 case KW_Wis: // uppercase alias
658 case KW_wis: thawer.get (op->stats.Wis); break;
659 case KW_Cha: // uppercase alias
660 case KW_cha: thawer.get (op->stats.Cha); break;
661 case KW_Int: // uppercase alias
662 case KW_int: thawer.get (op->stats.Int); break;
663 case KW_Pow: // uppercase alias
664 case KW_pow: thawer.get (op->stats.Pow); break;
665 case KW_hp: thawer.get (op->stats.hp); break;
666 case KW_maxhp: thawer.get (op->stats.maxhp); break;
667 case KW_sp: thawer.get (op->stats.sp); break;
668 case KW_maxsp: thawer.get (op->stats.maxsp); break;
669 case KW_grace: thawer.get (op->stats.grace); break;
670 case KW_maxgrace: thawer.get (op->stats.maxgrace); break;
671
672 case KW_exp: thawer.get (op->stats.exp); break;
673 case KW_perm_exp: thawer.get (op->perm_exp); break;
674 case KW_food: thawer.get (op->stats.food); break;
675 case KW_dam: thawer.get (op->stats.dam); break;
676 case KW_wc: thawer.get (op->stats.wc); break;
677 case KW_ac: thawer.get (op->stats.ac); break;
678 case KW_nrof: thawer.get (op->nrof); break;
679 case KW_level: thawer.get (op->level); break;
680 case KW_direction: thawer.get (op->direction); break;
681 case KW_type: thawer.get (op->type); break;
682 case KW_subtype: thawer.get (op->subtype); break;
683 case KW_value: thawer.get (op->value); break;
684 case KW_weight: thawer.get (op->weight); break;
685 case KW_carrying: thawer.get (op->carrying); break;
686 case KW_attacktype: thawer.get (op->attacktype); break;
687 case KW_path_attuned: thawer.get (op->path_attuned); break;
688 case KW_path_repelled: thawer.get (op->path_repelled); break;
689 case KW_path_denied: thawer.get (op->path_denied); break;
690 case KW_invisible: thawer.get (op->invisible); break;
691 case KW_magic: thawer.get (op->magic); break;
692 case KW_state: thawer.get (op->state); break;
693 case KW_move_slow_penalty:thawer.get (op->move_slow_penalty); break;
694 case KW_material: thawer.get (op->material); break;
695 case KW_materialname: thawer.get (op->materialname); break;
696
697 /* These are the new values */
698 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
699 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
700 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break;
701 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break;
702 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break;
703 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break;
704
705 /* These are all legacy - any new objects should use the move_ .. values */
706 case KW_no_pass:
707 {
708 if (thawer.get_sint32 ())
709 op->move_block = MOVE_ALL;
710 else
711 op->move_block = 0;
712 }
713
714 break;
715
716 /* These are all legacy - any new objects should use the move_ .. values */
717 case KW_walk_on:
718 {
719 if (thawer.get_sint32 ())
720 op->move_on |= MOVE_WALK;
721 else
722 op->move_on &= ~MOVE_WALK;
723 }
724
725 break;
726
727 /* These are all legacy - any new objects should use the move_ .. values */
728 case KW_walk_off:
729 {
730 if (thawer.get_sint32 ())
731 op->move_off |= MOVE_WALK;
732 else
733 op->move_off &= ~MOVE_WALK;
734 }
735 break;
736
737 /* These are all legacy - any new objects should use the move_ .. values */
738 case KW_fly_on: 1387 case KW_lore:
739 {
740 if (thawer.get_sint32 ())
741 op->move_on |= MOVE_FLY_LOW;
742 else
743 op->move_on &= ~MOVE_FLY_LOW;
744 }
745 break;
746
747 /* These are all legacy - any new objects should use the move_ .. values */
748 case KW_fly_off:
749 {
750 if (thawer.get_sint32 ())
751 op->move_off |= MOVE_FLY_LOW;
752 else
753 op->move_off &= ~MOVE_FLY_LOW;
754 }
755 break;
756
757 //TODO: remove these after convertign archetypes
758 case KW_can_use_wand: GET_FLAG (op, FLAG_USE_RANGE); break;
759
760 /* These are all legacy - any new objects should use the move_ .. values */
761 case KW_flying:
762 {
763 if (thawer.get_sint32 ())
764 op->move_type |= MOVE_FLY_LOW;
765 else
766 op->move_type &= ~MOVE_FLY_LOW;
767 }
768 break;
769
770
771 case KW_identified:
772 GET_FLAG (op, FLAG_IDENTIFIED);
773 //TODO: move to check_object or so
774 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
775 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
776
777 break;
778
779 case KW_wiz:
780 GET_FLAG (op, FLAG_WIZ);
781 //TODO: move to check_object
782 if (QUERY_FLAG (op, FLAG_WIZ))
783 { 1388 {
784 SET_FLAG (op, FLAG_WAS_WIZ); 1389 shstr msgbuf;
785 SET_FLAG (op, FLAG_WIZPASS); 1390
786 SET_FLAG (op, FLAG_WIZCAST); 1391 thawer.get_ml (KW_endlore, op->lore);
1392 //TODO: allow longer messages
1393 /* Just print a warning so we can be reasonably safe
1394 * about not overflowing the buffer.
1395 */
1396 if (strlen (op->lore) > (HUGE_BUF / 2))
1397 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1398 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
787 } 1399 }
788 else
789 {
790 CLEAR_FLAG (op, FLAG_WIZPASS);
791 CLEAR_FLAG (op, FLAG_WIZCAST);
792 }
793 break; 1400 break;
794 1401
795 case KW_friendly: 1402 case KW_editable:
796 GET_FLAG (op, FLAG_FRIENDLY); 1403 case KW_editor_folder:
797 //TODO: move to check_object or so
798 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
799 add_friendly_object (op);
800 break; 1404 break;
801 1405
802 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 1406 case KW_More: // uppercase alias
803 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
804 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
805 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
806 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
807 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
808 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
809 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
810 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
811 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
812 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
813 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
814 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
815 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
816 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break;
817 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break;
818 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break;
819 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break;
820 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break;
821 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break;
822 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break;
823 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break;
824 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break;
825 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break;
826 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break;
827 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break;
828 case KW_scared: GET_FLAG (op, FLAG_SCARED); break;
829 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break;
830 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break;
831 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break;
832 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break;
833 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break;
834 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
835 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break;
836 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break;
837 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break;
838 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break;
839 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break;
840 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break;
841 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break;
842 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break;
843 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
844 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
845 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
846 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
847 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
848 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
849 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
850 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
851 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
852 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
853 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break;
854 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
855 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break;
856 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break;
857 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break;
858 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break;
859 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break;
860 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break;
861 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break;
862 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break;
863 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break;
864 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break;
865 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break;
866 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break;
867 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break;
868 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break;
869 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break;
870 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break;
871 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break;
872 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break;
873 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break;
874 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break;
875 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break;
876 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break;
877 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break;
878 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break;
879 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break;
880 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break;
881 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
882 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
883 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
884 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
885 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
886
887 case KW_armour: thawer.get (op->resist [ATNR_PHYSICAL]); break;
888 case KW_resist_physical: thawer.get (op->resist [ATNR_PHYSICAL]); break;
889 case KW_resist_magic: thawer.get (op->resist [ATNR_MAGIC]); break;
890 case KW_resist_fire: thawer.get (op->resist [ATNR_FIRE]); break;
891 case KW_resist_electricity: thawer.get (op->resist [ATNR_ELECTRICITY]); break;
892 case KW_resist_cold: thawer.get (op->resist [ATNR_COLD]); break;
893 case KW_resist_confusion: thawer.get (op->resist [ATNR_CONFUSION]); break;
894 case KW_resist_acid: thawer.get (op->resist [ATNR_ACID]); break;
895 case KW_resist_drain: thawer.get (op->resist [ATNR_DRAIN]); break;
896 case KW_resist_weaponmagic: thawer.get (op->resist [ATNR_WEAPONMAGIC]); break;
897 case KW_resist_ghosthit: thawer.get (op->resist [ATNR_GHOSTHIT]); break;
898 case KW_resist_poison: thawer.get (op->resist [ATNR_POISON]); break;
899 case KW_resist_slow: thawer.get (op->resist [ATNR_SLOW]); break;
900 case KW_resist_paralyze: thawer.get (op->resist [ATNR_PARALYZE]); break;
901 case KW_resist_turn_undead: thawer.get (op->resist [ATNR_TURN_UNDEAD]); break;
902 case KW_resist_fear: thawer.get (op->resist [ATNR_FEAR]); break;
903 case KW_resist_cancellation: thawer.get (op->resist [ATNR_CANCELLATION]); break;
904 case KW_resist_deplete: thawer.get (op->resist [ATNR_DEPLETE]); break;
905 case KW_resist_death: thawer.get (op->resist [ATNR_DEATH]); break;
906 case KW_resist_chaos: thawer.get (op->resist [ATNR_CHAOS]); break;
907 case KW_resist_counterspell: thawer.get (op->resist [ATNR_COUNTERSPELL]); break;
908 case KW_resist_godpower: thawer.get (op->resist [ATNR_GODPOWER]); break;
909 case KW_resist_holyword: thawer.get (op->resist [ATNR_HOLYWORD]); break;
910 case KW_resist_blind: thawer.get (op->resist [ATNR_BLIND]); break;
911 case KW_resist_internal: thawer.get (op->resist [ATNR_INTERNAL]); break;
912 case KW_resist_life_stealing: thawer.get (op->resist [ATNR_LIFE_STEALING]); break;
913 case KW_resist_disease: thawer.get (op->resist [ATNR_DISEASE]); break;
914
915 case KW_luck: thawer.get (op->stats.luck); break;
916 case KW_run_away: thawer.get (op->run_away); break;
917 case KW_pick_up: thawer.get (op->pick_up); break;
918 case KW_item_power: thawer.get (op->item_power); break;
919 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break;
920 case KW_anim_speed: thawer.get (op->anim_speed); break;
921 case KW_container: thawer.get (op->weight_limit); break;
922 case KW_will_apply: thawer.get (op->will_apply); break;
923 case KW_attack_movement: thawer.get (op->attack_movement); break;
924 case KW_move_state: thawer.get (op->move_status); break;
925 case KW_expmul: thawer.get (op->expmul); break;
926 case KW_glow_radius: thawer.get (op->glow_radius); break;
927 case KW_weapontype: thawer.get (op->weapontype); break;
928 case KW_tooltype: thawer.get (op->tooltype); break;
929 case KW_casting_time: thawer.get (op->casting_time); break;
930 case KW_elevation: thawer.get (op->elevation); break;
931 case KW_smoothlevel: thawer.get (op->smoothlevel); break;
932 case KW_client_type: thawer.get (op->client_type); break;
933 case KW_duration: thawer.get (op->duration); break;
934 case KW_range: thawer.get (op->range); break;
935 case KW_range_modifier: thawer.get (op->range_modifier); break;
936 case KW_dam_modifier: thawer.get (op->dam_modifier); break;
937 case KW_duration_modifier: thawer.get (op->duration_modifier); break;
938
939 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
940 //TODO: parse from other include files
941 case KW_body_range: thawer.get (op->body_info [ 0]); break;
942 case KW_body_arm: thawer.get (op->body_info [ 1]); break;
943 case KW_body_torso: thawer.get (op->body_info [ 2]); break;
944 case KW_body_head: thawer.get (op->body_info [ 3]); break;
945 case KW_body_neck: thawer.get (op->body_info [ 4]); break;
946 case KW_body_skill: thawer.get (op->body_info [ 5]); break;
947 case KW_body_finger: thawer.get (op->body_info [ 6]); break;
948 case KW_body_shoulder: thawer.get (op->body_info [ 7]); break;
949 case KW_body_foot: thawer.get (op->body_info [ 8]); break;
950 case KW_body_hand: thawer.get (op->body_info [ 9]); break;
951 case KW_body_wrist: thawer.get (op->body_info [10]); break;
952 case KW_body_waist: thawer.get (op->body_info [11]); break;
953 case KW_can_apply:
954 break;
955
956 case KW_connected:
957 add_button_link (op, op->map, thawer.get_sint32 ());
958 break;
959
960 case KW_randomitems:
961 op->randomitems = find_treasurelist (thawer.get_str ());
962 break;
963
964 case KW_msg:
965 {
966 thawer.get_ml (KW_endmsg, op->msg);
967 //TODO: allow longer messages
968 if (strlen (op->msg) >= HUGE_BUF)
969 {
970 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
971 op->msg = "ERROR, please report: string too long, winged.\n";
972 }
973 }
974 break;
975
976 case KW_lore: 1407 case KW_more:
977 { 1408 /* We need to record that this is a multipart object,
978 shstr msgbuf; 1409 * so the calling function can glue things back together
979 thawer.get_ml (KW_endlore, op->lore);
980 //TODO: allow longer messages
981 /* Just print a warning so we can be reasonably safe
982 * about not overflowing the buffer.
983 */ 1410 */
984 if (strlen (op->lore) > (HUGE_BUF / 2))
985 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
986 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
987 }
988 break;
989
990 case KW_editable:
991 case KW_editor_folder:
992 break;
993
994 case KW_More: // uppercase alias
995 case KW_more:
996 /* We need to record that this is a multipart object,
997 * so the calling function can glue things back together
998 */
999 ismore = 1; 1411 ismore = 1;
1000 break; 1412 break;
1001 1413
1002 case KW_end: 1414 case KW_end:
1003 check_loaded_object (op); 1415 check_loaded_object (op);
1004 1416
1005 if (!arch_init) 1417 if (!arch_init)
1006 op->instantiate (); 1418 op->instantiate ();
1007 1419
1008 return ismore ? LL_MORE : LL_NORMAL; 1420 return ismore ? LL_MORE : LL_NORMAL;
1009 1421
1010 case KW_EOF: 1422 case KW_EOF:
1011 return LL_EOF; 1423 return LL_EOF;
1012 1424
1013 case KW_ERROR: 1425 case KW_ERROR:
1014 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1426 set_ob_key_value (op, thawer.line, thawer.last_value, true);
1015 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1427 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D
1016 1428
1017 //TODO: skip line, ugly, factor parsing better 1429 //TODO: skip line, ugly, factor parsing better
1018 if (thawer.last_value) 1430 if (thawer.last_value)
1019 thawer.line = thawer.last_value; 1431 thawer.line = thawer.last_value;
1020 1432
1021 thawer.line += strlen (thawer.line) + 1; 1433 thawer.line += strlen (thawer.line) + 1;
1022 1434
1023 break; 1435 break;
1024 1436
1025 default: 1437 default:
1026 printf ("kw abort %s\n", keyword_str [kw]);//D 1438 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1027 abort (); 1439 break;
1028 } 1440 }
1029 } 1441 }
1030} 1442}
1031 1443
1032/* 1444/*
… …
1042 * be reset. 1454 * be reset.
1043 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1455 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1044 * 1456 *
1045 */ 1457 */
1046 1458
1459int
1047int load_object(object_thawer &fp, object *op, int map_flags) { 1460load_object (object_thawer & fp, object *op, int map_flags)
1461{
1048 return parse_object(op, fp, map_flags); 1462 return parse_object (op, fp, map_flags);
1049} 1463}
1050 1464
1051 1465
1052/* This takes a buffer, scans it for variables, and sets those variables 1466/* This takes a buffer, scans it for variables, and sets those variables
1053 * as appropriate in op. 1467 * as appropriate in op.
1054 * 1468 *
1055 * This function appears to be used in only 2 places - in crossedit to 1469 * This function appears to be used in only 2 places - in crossedit to
1056 * override values and in c_wiz to mutate values. 1470 * override values and in c_wiz to mutate values.
1057 */ 1471 */
1472int
1058int set_variable(object *op,char *buf) { 1473set_variable (object *op, char *buf)
1474{
1475 return 0;
1059#if 0 1476#if 0
1060 int retval; 1477 int retval;
1061 object_thawer thawer (0); 1478 object_thawer thawer (0);
1062 1479
1063 strcpy(msgbuf, ""); 1480 strcpy (msgbuf, "");
1064 strcpy(lorebuf, ""); 1481 strcpy (lorebuf, "");
1065 retval=parse_object(op,thawer,0); 1482 retval = parse_object (op, thawer, 0);
1066 yy_switch_to_buffer(yycurbuf); 1483 yy_switch_to_buffer (yycurbuf);
1067 yy_delete_buffer(yybufstate); 1484 yy_delete_buffer (yybufstate);
1068 yy_pop_state(); 1485 yy_pop_state ();
1069 return retval; 1486 return retval;
1070#endif 1487#endif
1071} 1488}
1072 1489
1073/* This array equates the FLAG_ values with the V_ values. Use -1 to 1490/* This array equates the FLAG_ values with the V_ values. Use -1 to
1074 * put gaps in the array that should not be processed. 1491 * put gaps in the array that should not be processed.
1075 * The order matches the order of the define values in 'define.h'. 1492 * The order matches the order of the define values in 'define.h'.
1076 */ 1493 */
1494
1077/* This is a list of pointers that correspond to the FLAG_.. values. 1495/* This is a list of pointers that correspond to the FLAG_.. values.
1078 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then 1496 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1079 * the 15'th element of this array should match that name. 1497 * the 15'th element of this array should match that name.
1080 * If an entry is NULL, that is a flag not to loaded/saved. 1498 * If an entry is NULL, that is a flag not to loaded/saved.
1081 */ 1499 */
1082static const char *const flag_names[NUM_FLAGS+1] = { 1500static const char *const flag_names[NUM_FLAGS + 1] = {
1083"alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid", 1501 "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",
1084"can_use_shield", "no_pick", NULL /* walk_on*/, NULL /* no_pass */, /* 10 */ 1502 "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */
1085"is_animated", NULL /* slow_move */, 1503 "is_animated", NULL /* slow_move */ ,
1086NULL /* flying */, "monster", "friendly", "generator", 1504 NULL /* flying */ , "monster", "friendly", "generator",
1087"is_thrown", "auto_apply", "treasure", "player sold", /* 20 */ 1505 "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */
1088"see_invisible", "can_roll", "overlay_floor", 1506 "see_invisible", "can_roll", "overlay_floor",
1089"is_turnable", NULL /* walk_off */, NULL /* fly_on */, 1507 "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ ,
1090NULL /*fly_off*/, "is_used_up", "identified", "reflecting", /* 30 */ 1508 NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */
1091"changing", "splitting", "hitback", "startequip", 1509 "changing", "splitting", "hitback", "startequip",
1092"blocksview", "undead", "scared", "unaggressive", 1510 "blocksview", "undead", "scared", "unaggressive",
1093"reflect_missile", "reflect_spell", /* 40 */ 1511 "reflect_missile", "reflect_spell", /* 40 */
1094"no_magic", "no_fix_player", "is_lightable", "tear_down", 1512 "no_magic", "no_fix_player", "is_lightable", "tear_down",
1095"run_away", NULL /*pass_thru */, NULL /*can_pass_thru*/, 1513 "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ ,
1096"pick_up", "unique", "no_drop", /* 50 */ 1514 "pick_up", "unique", "no_drop", /* 50 */
1097NULL /* wizcast*/, "can_cast_spell", "can_use_scroll", "can_use_range", 1515 NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range",
1098"can_use_bow", "can_use_armour", "can_use_weapon", 1516 "can_use_bow", "can_use_armour", "can_use_weapon",
1099"can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */ 1517 "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */
1100"xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep", 1518 "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep",
1101"stand_still", "random_move", "only_attack", "confused", /* 70 */ 1519 "stand_still", "random_move", "only_attack", "confused", /* 70 */
1102 "stealth", NULL, NULL, "cursed", "damned", 1520 "stealth", NULL, NULL, "cursed", "damned",
1103"see_anywhere", "known_magical", "known_cursed", 1521 "see_anywhere", "known_magical", "known_cursed",
1104"can_use_skill", "been_applied", /* 80 */ 1522 "can_use_skill", "been_applied", /* 80 */
1105"has_ready_scroll", "can_use_rod", NULL, 1523 "has_ready_scroll", "can_use_rod", NULL,
1106"can_use_horn", "make_invisible", "inv_locked", "is_wooded", 1524 "can_use_horn", "make_invisible", "inv_locked", "is_wooded",
1107"is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */ 1525 "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */
1108"no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron", 1526 "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",
1109"is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */ 1527 "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */
1110"no_attack", "no_damage", NULL, NULL, "activate_on_push", 1528 "no_attack", "no_damage", NULL, NULL, "activate_on_push",
1111"activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */ 1529 "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */
1112NULL 1530 NULL
1113}; 1531};
1114 1532
1115 1533
1116/* 1534/*
1117 * Initialises the array of variable-names. Needed before any 1535 * Initialises the array of variable-names. Needed before any
1118 * objects can be loaded. Called by init_library(). 1536 * objects can be loaded. Called by init_library().
1119 */ 1537 */
1120 1538
1121void init_vars() { 1539void
1540init_vars ()
1541{
1122} 1542}
1123 1543
1124/* This returns a string of the integer movement type */ 1544/* This returns a string of the integer movement type */
1545#if 0
1546// unused function
1547static char *
1125static char* get_string_move_type(MoveType mt) 1548get_string_move_type (MoveType mt)
1126{ 1549{
1127 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; 1550 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1128 int i, all_count=0, count; 1551 int i, all_count = 0, count;
1129 1552
1130 strcpy(retbuf,""); 1553 strcpy (retbuf, "");
1131 strcpy(retbuf_all," all"); 1554 strcpy (retbuf_all, " all");
1132 1555
1133 /* Quick check, and probably fairly common */ 1556 /* Quick check, and probably fairly common */
1134 if (mt == MOVE_ALL) return retbuf_all+1; 1557 if (mt == MOVE_ALL)
1558 return retbuf_all + 1;
1135 if (mt == 0) { 1559 if (mt == 0)
1560 {
1136 strcpy(retbuf,"0"); 1561 strcpy (retbuf, "0");
1137 return retbuf; 1562 return retbuf;
1138 } 1563 }
1139 1564
1140 /* We basically slide the bits down. Why look at MOVE_ALL? 1565 /* We basically slide the bits down. Why look at MOVE_ALL?
1141 * because we may want to return a string like 'all -swim', 1566 * because we may want to return a string like 'all -swim',
1142 * and if we just looked at mt, we couldn't get that. 1567 * and if we just looked at mt, we couldn't get that.
1143 */ 1568 */
1144 for (i=MOVE_ALL, count=0; i!=0; i >>= 1, count++) { 1569 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1570 {
1145 if (mt & (1<<count)) { 1571 if (mt & (1 << count))
1572 {
1146 strcat(retbuf, " "); 1573 strcat (retbuf, " ");
1147 strcat(retbuf, move_name[count]); 1574 strcat (retbuf, move_name[count]);
1575 }
1148 } else { 1576 else
1577 {
1149 strcat(retbuf_all, " -"); 1578 strcat (retbuf_all, " -");
1150 strcat(retbuf_all, move_name[count]); 1579 strcat (retbuf_all, move_name[count]);
1151 all_count++; 1580 all_count++;
1152 } 1581 }
1153 } 1582 }
1154 /* Basically, if there is a single negation, return it, eg 1583 /* Basically, if there is a single negation, return it, eg
1155 * 'all -swim'. But more than that, just return the 1584 * 'all -swim'. But more than that, just return the
1156 * enumerated values. It doesn't make sense to return 1585 * enumerated values. It doesn't make sense to return
1157 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' 1586 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1158 */ 1587 */
1159 if (all_count <=1) return retbuf_all+1; 1588 if (all_count <= 1)
1589 return retbuf_all + 1;
1590 else
1160 else return retbuf+1; 1591 return retbuf + 1;
1161} 1592}
1162 1593#endif
1594
1163// compare *op against *tmp and output differences 1595// compare *op against *tmp and output differences
1164void 1596void
1165put (object_freezer &f, object *op, object *tmp) 1597put (object_freezer & f, object *op, object *tmp)
1166{ 1598{
1167 int i; 1599 int i;
1168 1600
1169 /* This saves the key/value lists. We do it first so that any 1601 /* This saves the key/value lists. We do it first so that any
1170 * keys that match field names will be overwritten by the loader. 1602 * keys that match field names will be overwritten by the loader.
… …
1181 1613
1182 /* We don't need to worry about the arch's extra fields - they 1614 /* We don't need to worry about the arch's extra fields - they
1183 * will get taken care of the copy_object function. 1615 * will get taken care of the copy_object function.
1184 */ 1616 */
1185 1617
1186# define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1618#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v)
1187# define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1619#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v)
1188 1620
1189 CMP_OUT (name); 1621 CMP_OUT (name);
1190 CMP_OUT (name_pl); 1622 CMP_OUT (name_pl);
1191 CMP_OUT (custom_name); 1623 CMP_OUT (custom_name);
1192 CMP_OUT (title); 1624 CMP_OUT (title);
1193 CMP_OUT (race); 1625 CMP_OUT (race);
1194 CMP_OUT (slaying); 1626 CMP_OUT (slaying);
1195 1627
1196 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg); 1628 if (op->msg != tmp->msg)
1629 f.put (KW_msg, KW_endmsg, op->msg);
1630 if (op->lore != tmp->lore)
1197 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1631 f.put (KW_lore, KW_endlore, op->lore);
1198 1632
1199 CMP_OUT (other_arch); 1633 CMP_OUT (other_arch);
1200 CMP_OUT (face); 1634 CMP_OUT (face);
1201 1635
1202 if (!op->face || !op->face->name) 1636 if (!op->face || !op->face->name)
1203 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 1637 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
1204 1638
1205 if (op->animation_id != tmp->animation_id) 1639 if (op->animation_id != tmp->animation_id)
1206 if (op->animation_id) 1640 if (op->animation_id)
1207 { 1641 {
1208 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1642 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1209 1643
1210 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1644 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1211 f.put (KW_is_animated, (sint32)0); 1645 f.put (KW_is_animated, (sint32) 0);
1212 } 1646 }
1213 else 1647 else
1214 f.put (KW_animation, (const char *)0); 1648 f.put (KW_animation, (const char *) 0);
1215 1649
1216 CMP_OUT2 (str , stats.Str); 1650 CMP_OUT2 (str, stats.Str);
1217 CMP_OUT2 (dex , stats.Dex); 1651 CMP_OUT2 (dex, stats.Dex);
1218 CMP_OUT2 (con , stats.Con); 1652 CMP_OUT2 (con, stats.Con);
1219 CMP_OUT2 (wis , stats.Wis); 1653 CMP_OUT2 (wis, stats.Wis);
1220 CMP_OUT2 (pow , stats.Pow); 1654 CMP_OUT2 (pow, stats.Pow);
1221 CMP_OUT2 (cha , stats.Cha); 1655 CMP_OUT2 (cha, stats.Cha);
1222 CMP_OUT2 (int , stats.Int); 1656 CMP_OUT2 (int, stats.Int);
1657
1223 CMP_OUT2 (hp , stats.hp); 1658 CMP_OUT2 (hp, stats.hp);
1224 CMP_OUT2 (maxhp , stats.maxhp); 1659 CMP_OUT2 (maxhp, stats.maxhp);
1225 CMP_OUT2 (sp , stats.sp); 1660 CMP_OUT2 (sp, stats.sp);
1226 CMP_OUT2 (maxsp , stats.maxsp); 1661 CMP_OUT2 (maxsp, stats.maxsp);
1227 CMP_OUT2 (grace , stats.grace); 1662 CMP_OUT2 (grace, stats.grace);
1228 CMP_OUT2 (maxgrace, stats.maxgrace); 1663 CMP_OUT2 (maxgrace, stats.maxgrace);
1229 CMP_OUT2 (exp , stats.exp); 1664 CMP_OUT2 (exp, stats.exp);
1230 1665
1231 CMP_OUT (perm_exp); 1666 CMP_OUT (perm_exp);
1232 CMP_OUT (expmul); 1667 CMP_OUT (expmul);
1233 1668
1234 CMP_OUT2 (food , stats.food); 1669 CMP_OUT2 (food, stats.food);
1235 CMP_OUT2 (dam , stats.dam); 1670 CMP_OUT2 (dam, stats.dam);
1236 CMP_OUT2 (luck , stats.luck); 1671 CMP_OUT2 (luck, stats.luck);
1237 CMP_OUT2 (wc , stats.wc); 1672 CMP_OUT2 (wc, stats.wc);
1238 CMP_OUT2 (ac , stats.ac); 1673 CMP_OUT2 (ac, stats.ac);
1239 1674
1240 CMP_OUT (x); 1675 CMP_OUT (x);
1241 CMP_OUT (y); 1676 CMP_OUT (y);
1242 CMP_OUT (speed); 1677 CMP_OUT (speed);
1243 CMP_OUT (speed_left); 1678 CMP_OUT (speed_left);
… …
1249 CMP_OUT (type); 1684 CMP_OUT (type);
1250 CMP_OUT (subtype); 1685 CMP_OUT (subtype);
1251 CMP_OUT (attacktype); 1686 CMP_OUT (attacktype);
1252 1687
1253 for (i = 0; i < NROFATTACKS; i++) 1688 for (i = 0; i < NROFATTACKS; i++)
1254 if (op->resist [i] != tmp->resist [i]) 1689 if (op->resist[i] != tmp->resist[i])
1255 f.put (resist_save [i], op->resist [i]); 1690 f.put (resist_save[i], op->resist[i]);
1256 1691
1257 CMP_OUT (path_attuned); 1692 CMP_OUT (path_attuned);
1258 CMP_OUT (path_repelled); 1693 CMP_OUT (path_repelled);
1259 CMP_OUT (path_denied); 1694 CMP_OUT (path_denied);
1260 CMP_OUT (material); 1695 CMP_OUT (material);
… …
1301 CMP_OUT (move_slow); 1736 CMP_OUT (move_slow);
1302 CMP_OUT (move_slow_penalty); 1737 CMP_OUT (move_slow_penalty);
1303 1738
1304 if (!COMPARE_FLAGS (op, tmp)) 1739 if (!COMPARE_FLAGS (op, tmp))
1305 for (i = 0; i <= NUM_FLAGS; i++) 1740 for (i = 0; i <= NUM_FLAGS; i++)
1306 if (flag_names [i]
1307 && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1741 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))
1308 f.put (flag_names [i], QUERY_FLAG (op, i) ? "1" : "0"); 1742 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0");
1309 1743
1310 /* Save body locations */ 1744 /* Save body locations */
1311 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1745 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1312 if (op->body_info[i] != tmp->body_info[i]) 1746 if (op->body_info[i] != tmp->body_info[i])
1313 f.put (body_locations[i].save_name, op->body_info[i]); 1747 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1320 * If bit 1 of flag is set, don't remove the object after save. As of now, 1754 * If bit 1 of flag is set, don't remove the object after save. As of now,
1321 * all of the callers are setting this. 1755 * all of the callers are setting this.
1322 */ 1756 */
1323 1757
1324void 1758void
1325save_object (object_freezer &fp, object *op, int flag) 1759save_object (object_freezer & fp, object *op, int flag)
1326{ 1760{
1327 archetype *at; 1761 archetype *at;
1328 object *tmp, *old; 1762 object *tmp, *old;
1329 1763
1330 /* Even if the object does have an owner, it would seem that we should 1764 /* Even if the object does have an owner, it would seem that we should
1331 * still save it. 1765 * still save it.
1332 */ 1766 */
1333 if (op->owner != NULL) 1767 if (op->owner)
1334 return; 1768 return;
1335 1769
1336 /* If it is unpaid and we don't want to save those, just return. */ 1770 /* If it is unpaid and we don't want to save those, just return. */
1337 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1771 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))
1338 return; 1772 return;
… …
1376 } 1810 }
1377 1811
1378 fp.put (op); 1812 fp.put (op);
1379 fprintf (fp, "end\n"); 1813 fprintf (fp, "end\n");
1380} 1814}
1381

Diff Legend

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