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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.1 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.57 by root, Sat Feb 10 01:52:25 2007 UTC

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

Diff Legend

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