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.17 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.161 by root, Sat May 15 23:41:05 2010 UTC

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

Diff Legend

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