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.57 by root, Sat Feb 10 01:52:25 2007 UTC vs.
Revision 1.180 by root, Wed Nov 14 19:40:44 2018 UTC

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

Diff Legend

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