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

Diff Legend

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