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

Diff Legend

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