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.15 by root, Wed Sep 13 02:05:19 2006 UTC vs.
Revision 1.174 by root, Fri Feb 3 02:04:11 2012 UTC

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

Diff Legend

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