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

Diff Legend

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