ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/loader.C

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

Diff Legend

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