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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.8 by pippijn, Thu Sep 7 09:37:12 2006 UTC vs.
Revision 1.183 by root, Sat Nov 17 23:33:17 2018 UTC

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

Diff Legend

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