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

Diff Legend

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