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

Diff Legend

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