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

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

Diff Legend

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