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.4 by root, Mon Sep 4 15:51:24 2006 UTC vs.
Revision 1.70 by root, Tue Apr 17 18:40:31 2007 UTC

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

Diff Legend

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