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

Diff Legend

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