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.8 by pippijn, Thu Sep 7 09:37:12 2006 UTC vs.
Revision 1.52 by root, Thu Feb 1 19:15:38 2007 UTC

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

Diff Legend

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