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.50 by root, Fri Jan 19 18:06:51 2007 UTC vs.
Revision 1.78 by root, Mon May 7 06:01:47 2007 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7	*	7	*
…		…
24		24
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
27	variable. */	27	variable. */
28		28
29
30	#include <global.h>	29	#include <global.h>
31	#include <loader.h>	30	#include <loader.h>
32	#include <sproto.h>	31	#include <sproto.h>
33		32
34	// future resource loader base class	33	/////////////////////////////////////////////////////////////////////////////
35	struct loader_base
36	{
37	const char *filename;
38	virtual const char *type () const = 0;
39
40	virtual archetype *get_arch (const char *name);
41	virtual void put_arch (archetype *arch);
42
43	virtual object *get_object (const char *name);
44	virtual void put_object (object *op);
45
46	virtual player *get_player ();
47	virtual void put_player (player *pl);
48
49	virtual region *get_region (const char *name);
50	virtual void put_region (region *region);
51
52	virtual facetile *get_face (const char *name);
53	virtual void put_face (facetile *face);
54
55	virtual treasurelist *get_treasure (const char *name, bool one = false);
56	virtual void put_treasure (treasurelist *treasure);
57
58	virtual animation *get_animation (const char *name);
59	virtual void put_animation (animation *anim);
60	};
61
62	// future generic resource loader
63	// handles generic stuff valid in most files, such as
64	// animations, treasures, faces and so on
65	struct loader_generic : loader_base
66	{
67	const char *type () const = 0;
68
69	region *get_region ();
70	void put_region (region *region);
71
72	facetile *get_face (const char *name);
73	void put_face (facetile *face);
74
75	treasurelist *get_treasure (const char *name, bool one = false);
76	void put_treasure (treasurelist *treasure);
77
78	animation *get_animation (const char *name);
79	void put_animation (animation *anim);
80	};
81
82	// the base class warns about and skips everything
83	archetype *
84	loader_base::get_arch (const char *name)
85	{
86	LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n",
87	filename, name, type ());
88
89	return new archetype;
90	}
91
92	object *
93	loader_base::get_object (const char *name)
94	{
95	LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n",
96	filename, name, type ());
97
98	return object::create ();
99	}
100
101	player *
102	loader_base::get_player ()
103	{
104	LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n",
105	filename, type ());
106
107	return player::create ();
108	}
109
110	region *
111	loader_base::get_region (const char *name)
112	{
113	LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n",
114	filename, name, type ());
115
116	return new region;
117	}
118
119	facetile *
120	loader_base::get_face (const char *name)
121	{
122	LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n",
123	filename, name, type ());
124
125	return new facetile;
126	}
127
128	treasurelist *
129	loader_base::get_treasure (const char *name, bool one)
130	{
131	LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n",
132	filename, name, type ());
133
134	return new treasurelist;//D
135	}
136
137	animation *
138	loader_base::get_animation (const char *name)
139	{
140	LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n",
141	filename, name, type ());
142
143	return new animation;
144	}
145
146	void
147	loader_base::put_arch (archetype *arch)
148	{
149	delete arch;
150	}
151
152	void
153	loader_base::put_object (object *op)
154	{
155	op->destroy ();
156	}
157
158	void
159	loader_base::put_player (player *pl)
160	{
161	delete pl;
162	}
163
164	void
165	loader_base::put_region (region *region)
166	{
167	delete region;
168	}
169
170	void
171	loader_base::put_face (facetile *face)
172	{
173	delete face;
174	}
175
176	void
177	loader_base::put_treasure (treasurelist *treasure)
178	{
179	delete treasure;
180	}
181
182	void
183	loader_base::put_animation (animation *anim)
184	{
185	delete anim;
186	}
187
188	/* Maps the MOVE_* values to names */
189	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
190		34
191	/* This table is only necessary to convert objects that existed before the	35	/* This table is only necessary to convert objects that existed before the
192	* spell object conversion to the new object. It was not practical	36	* spell object conversion to the new object. It was not practical
193	* to go through every mapping looking for every potion, rod, wand, etc	37	* to go through every mapping looking for every potion, rod, wand, etc
194	* that had a sp set and update to the new value. So this maps the	38	* that had a sp set and update to the new value. So this maps the
…		…
406	"spell_cause_rabies", /* 204 */	250	"spell_cause_rabies", /* 204 */
407	"spell_glyph", /* 205 */	251	"spell_glyph", /* 205 */
408	NULL	252	NULL
409	};	253	};
410		254
411	extern int arch_init;	255	extern bool loading_arch;
412		256
413	/* This function checks the object after it has been loaded (when we	257	/* This function checks the object after it has been loaded (when we
414	* get the 'end' in the input stream). This function can be used to	258	* get the 'end' in the input stream). This function can be used to
415	* deal with legacy objects where fields may have changed. It can also be used	259	* deal with legacy objects where fields may have changed. It can also be used
416	* to check for objects to make sure there are no common errors.	260	* to check for objects to make sure there are no common errors.
417	*/	261	*/
418	static void	262	void
419	check_loaded_object (object *op)	263	object::post_load_check ()
420	{	264	{
421	int ip;	265	// as a kind of a hack, we now adjust the range, shield and combat slots
		266	switch (type)
		267	{
		268	case BOW:
		269	case WAND:
		270	case ROD:
		271	case HORN:
		272	case SKILL: // maybe have to think about this one, as skills get applied togethr with their governing weapons
		273	case SKILL_TOOL:
		274	if (slot [body_range].info != 1)
		275	{
		276	LOG (llevInfo, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
		277	slot [body_range].info = 1;
		278	}
		279	break;
		280
		281	case WEAPON:
		282	if (slot [body_combat].info != 1)
		283	{
		284	LOG (llevInfo, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
		285	slot [body_combat].info = 1;
		286	}
		287	break;
		288
		289	case SHIELD:
		290	if (slot [body_shield].info != 1)
		291	{
		292	LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
		293	slot [body_shield].info = 1;
		294	}
		295	break;
		296
		297	case PLAYER:
		298	if (slot [body_shield].info != 1)
		299	{
		300	LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
		301	slot [body_shield].info = 1;
		302	}
		303
		304	if (slot [body_combat].info != 1)
		305	{
		306	LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_combat].info);
		307	slot [body_combat].info = 1;
		308	}
		309	break;
		310	}
422		311
423	/* We do some specialised handling to handle legacy cases of name_pl.	312	/* We do some specialised handling to handle legacy cases of name_pl.
424	* If the object doesn't have a name_pl, we just use the object name -	313	* If the object doesn't have a name_pl, we just use the object name -
425	* this isn't perfect (things won't be properly pluralised), but works to	314	* this isn't perfect (things won't be properly pluralised), but works to
426	* that degree (5 heart is still quite understandable). But the case we	315	* that degree (5 heart is still quite understandable). But the case we
427	* also have to catch is if this object is not using the normal name for	316	* also have to catch is if this object is not using the normal name for
428	* the object. In that case, we also want to use the loaded name.	317	* the object. In that case, we also want to use the loaded name.
429	* Otherwise, what happens is that the the plural name will lose	318	* Otherwise, what happens is that the the plural name will lose
430	* information (appear as just 'hearts' and not 'goblins heart')	319	* information (appear as just 'hearts' and not 'goblins heart')
431	*/	320	*/
432	if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)	321	if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl)
433	op->name_pl = NULL;	322	name_pl = 0;
434		323
435	if (!op->name_pl)	324	if (!name_pl)
436	op->name_pl = op->name;	325	name_pl = name;
437		326
438	/* objects now have a materialname. try to patch it in */	327	/* objects now have a materialname. try to patch it in */
439	if (!(op->is_weapon () && op->level > 0))	328	if (!(is_weapon () && level > 0))
440	{	329	{
441	if (op->map != NULL)	330	if (map != NULL)
442	set_materialname (op, op->map->difficulty, NULL);	331	set_materialname (this, map->difficulty, NULL);
443	else	332	else
444	set_materialname (op, 5, NULL);	333	set_materialname (this, 5, NULL);
445	}	334	}
		335
446	/* only do these when program is first run - a bit	336	/* only do these when program is first run - a bit
447	* excessive to do this at every run - most of this is	337	* excessive to do this at every run - most of this is
448	* really just to catch any errors - program will still run, but	338	* really just to catch any errors - program will still run, but
449	* not in the ideal fashion.	339	* not in the ideal fashion.
450	*/	340	*/
451	if ((op->type == WEAPON || op->type == BOW) && arch_init)	341	if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
452	{	342	{
453	if (!op->skill)	343	if (!skill)
454	{
455	LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());	344	LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ());
456	}
457	else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||	345	else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) ||
458	(!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))	346	(!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2))
459	{
460	LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);	347	LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
461	}
462	}	348	}
463		349
464	/* We changed last_heal to gen_sp_armour, which is what it	350	/* We changed last_heal to gen_sp_armour, which is what it
465	* really does for many objects. Need to catch any in maps	351	* really does for many objects. Need to catch any in maps
466	* that may have an old value.	352	* that may have an old value.
467	*/	353	*/
468	if ((op->type == WEAPON) ||	354	if (type == WEAPON
469	(op->type == ARMOUR) || (op->type == HELMET) ||	355	|| type == ARMOUR || type == HELMET
470	(op->type == SHIELD) || (op->type == RING) ||	356	|| type == SHIELD || type == RING
471	(op->type == BOOTS) || (op->type == GLOVES) ||	357	|| type == BOOTS || type == GLOVES
472	(op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))	358	|| type == AMULET || type == GIRDLE
		359	|| type == BRACERS || type == CLOAK)
473	{	360	{
474	if (op->last_heal)	361	if (last_heal)
475	{	362	{
476	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());	363	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
477	op->gen_sp_armour = op->last_heal;	364	gen_sp_armour = last_heal;
478	op->last_heal = 0;	365	last_heal = 0;
479	}	366	}
480		367
481	ip = calc_item_power (op, 0);	368	int ip = calc_item_power (this, 0);
		369
482	/* Legacy objects from before item power was in the game */	370	/* Legacy objects from before item power was in the game */
483	if (!op->item_power && ip)	371	if (!item_power && ip)
484	{	372	{
485	if (ip > 3)	373	if (ip > 3)
486	{
487	LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);	374	LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip);
488	}	375
489	op->item_power = ip;	376	item_power = ip;
490	}	377	}
		378
491	/* Check for possibly bogus values. Has to meet both these criteria -	379	/* Check for possibly bogus values. Has to meet both these criteria -
492	* something that has item_power 1 is probably just fine if our calculated	380	* something that has item_power 1 is probably just fine if our calculated
493	* value is 1 or 2 - these values are small enough that hard to be precise.	381	* value is 1 or 2 - these values are small enough that hard to be precise.
494	* similarly, it item_power is 0, the first check will always pass,	382	* similarly, it item_power is 0, the first check will always pass,
495	* but not the second one.	383	* but not the second one.
496	*/	384	*/
497	if (ip > 2 * op->item_power && ip > (op->item_power + 3))	385	if (ip > 2 * item_power && ip > (item_power + 3))
498	{
499	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);
500	}
501
502	}	387	}
		388
503	/* Old spellcasting object - need to load in the appropiate object */	389	/* Old spellcasting object - need to load in the appropiate object */
504	if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||	390	if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
505	/* POTIONS and ALTARS don't always cast spells, but if they do, update them */	391	/* POTIONS and ALTARS don't always cast spells, but if they do, update them */
506	((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)	392	((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
507	{	393	{
508	object *tmp;
509
510	/* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'	394	/* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
511	* in that spell was stored in sp.	395	* in that spell was stored in sp.
512	*/	396	*/
513	tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);	397	object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
514	insert_ob_in_ob (tmp, op);	398	insert_ob_in_ob (tmp, this);
515	op->randomitems = NULL; /* So another spell isn't created for this object */	399	randomitems = NULL; /* So another spell isn't created for this object */
516	}	400	}
		401
517	/* spellbooks & runes use slaying. But not to arch name, but to spell name */	402	/* spellbooks & runes use slaying. But not to arch name, but to spell name */
518
519	if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)	403	if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
520	{	404	{
521	object *tmp;
522
523	tmp = get_archetype_by_object_name (op->slaying);	405	object *tmp = get_archetype_by_object_name (slaying);
524	insert_ob_in_ob (tmp, op);	406	insert_ob_in_ob (tmp, this);
525	op->randomitems = NULL; /* So another spell isn't created for this object */	407	randomitems = NULL; /* So another spell isn't created for this object */
526	/* without this, value is all screwed up */	408	/* without this, value is all screwed up */
527	op->value = op->arch->clone.value * op->inv->value;	409	value = arch->clone.value * inv->value;
528	}	410	}
529		411
530	if (QUERY_FLAG (op, FLAG_MONSTER))	412	if (QUERY_FLAG (this, FLAG_MONSTER))
531	{	413	{
532	if (op->stats.hp > op->stats.maxhp)	414	if (stats.hp > stats.maxhp)
533	{	415	{
534	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);	416	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
535	op->stats.maxhp = op->stats.hp;	417	stats.maxhp = stats.hp;
536	}	418	}
537		419
538	/* The archs just need to be updated for this */	420	/* The archs just need to be updated for this */
539	if (op->move_type == 0)	421	if (move_type == 0)
540	op->move_type = MOVE_WALK;	422	move_type = MOVE_WALK;
541	}	423	}
542		424
543	if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)	425	if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
544	{	426	{
545	/* Object will duplicate it's content as part of the	427	/* Object will duplicate it's content as part of the
546	* generation process. To do this, we must flag inventory	428	* generation process. To do this, we must flag inventory
547	* so it remains unevaluated concerning the randomitems and	429	* so it remains unevaluated concerning the randomitems and
548	* the living (a demonlord shouldn't cast from inside generator!)	430	* the living (a demonlord shouldn't cast from inside generator!)
549	*/	431	*/
550	flag_inv (op, FLAG_IS_A_TEMPLATE);	432	flag_inv (this, FLAG_IS_A_TEMPLATE);
551	}	433	}
552		434
553	/* Handle player movers. We use move_type for player movers	435	/* Handle player movers. We use move_type for player movers
554	* because they operate on their own time (move_on	436	* because they operate on their own time (move_on
555	* would potentially cause them to be triggered when someone steps	437	* would potentially cause them to be triggered when someone steps
556	* on them). If move_type is set, presume person knows what they	438	* on them). If move_type is set, presume person knows what they
557	* are doing, otherwise, set move_type based on maxhp value.	439	* are doing, otherwise, set move_type based on maxhp value.
558	*/	440	*/
559	if (op->type == PLAYERMOVER)	441	if (type == PLAYERMOVER)
560	{	442	{
561	if (!op->move_type)	443	if (!move_type)
562	{	444	{
563	if (op->stats.maxhp)	445	if (stats.maxhp)
564	{	446	{
565	op->move_type = MOVE_ALL;	447	move_type = MOVE_ALL;
566	op->stats.maxhp = 0;	448	stats.maxhp = 0;
567	}	449	}
568	else	450	else
		451	move_type = MOVE_WALK;
		452	}
		453	}
		454	}
		455
		456	static void
		457	set_move (MoveType &mt, const char *str)
		458	{
		459	static const struct flagstr {
		460	const char *name;
		461	MoveType flags;
		462	} move_flags[] = {
		463	{ "walk" , MOVE_WALK },
		464	{ "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
		465	{ "fly_low" , MOVE_FLY_LOW },
		466	{ "fly_high", MOVE_FLY_HIGH },
		467	{ "swim" , MOVE_SWIM },
		468	{ "boat" , MOVE_BOAT },
		469	{ "ship" , MOVE_SHIP },
		470	{ "all" , MOVE_ALL },
		471	};
		472
		473	if (!str)
		474	{
		475	mt = 0;
		476	return;
		477	}
		478
		479	if (isdigit (*str))
		480	{
		481	mt = atoi (str);
		482	return;
		483	}
		484
		485	mt = 0;
		486
		487	for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
		488	{
		489	bool negate = 0;
		490
		491	if (*str == '-')
		492	{
		493	negate = 1;
		494	str++;
		495	}
		496
		497	for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
		498	{
		499	if (!strcmp (f->name, str))
569	{	500	{
570	op->move_type = MOVE_WALK;	501	if (negate)
		502	mt &= ~f->flags;
		503	else
		504	mt |= f->flags;
		505
		506	goto next;
571	}	507	}
572	}	508	}
573	}
574		509
		510	LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
		511
		512	next: ;
		513	}
575	}	514	}
576		515
577	static void
578	set_move (MoveType & mt, const char *str)
579	{
580	if (!str)
581	{
582	mt = 0;
583	return;
584	}
585
586	if (isdigit (*str))
587	{
588	mt = atoi (str);
589	return;
590	}
591
592	mt = 0;
593
594	for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
595	{
596	if (!strcasecmp (str, "all"))
597	mt |= MOVE_ALL;
598	else
599	{
600	int i, negate = 0;
601
602	if (*str == '-')
603	{
604	negate = 1;
605	str++;
606	}
607
608	for (i = 0; move_name[i]; i++)
609	{
610	if (!strcasecmp (move_name[i], str))
611	{
612	if (negate)
613	mt &= ~(1 << i);
614	else
615	mt |= (1 << i);
616
617	break;
618	}
619	}
620
621	if (!move_name[i])
622	{
623	/* fly is a special case - covers both fly_low and
624	* fly_high - since it doesn't match to a specific
625	* single bit, have to special case it.
626	*/
627	if (!strcasecmp (str, "flying"))
628	{
629	if (negate)
630	mt &= ~MOVE_FLYING;
631	else
632	mt |= MOVE_FLYING;
633	}
634	else
635	LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str);
636	}
637	}
638	}
639	}
640
641	#define GET_FLAG(op,flag) \	516	#define GET_FLAG(op,flag) \
642	if (thawer.get_sint32 ()) \	517	if (f.get_sint32 ()) \
643	SET_FLAG (op, flag); \	518	SET_FLAG (op, flag); \
644	else \	519	else \
645	CLEAR_FLAG (op, flag) \	520	CLEAR_FLAG (op, flag) \
646		521
647	int	522	bool
648	parse_object (object *op, object_thawer &thawer, int map_flags)	523	object::parse_kv (object_thawer &f)
649	{	524	{
650	bool ismore = 0;
651	object *op_inv = op->inv;	525	object *op_inv = inv;
652		526
653	for (;;)	527	for (;;)
654	{	528	{
655	keyword kw = thawer.get_kv ();
656
657	switch (kw)	529	switch (f.kw)
658	{	530	{
659	case KW_Object: // uppercase alias
660	case KW_object:
661	thawer.get (op->name);
662
663	if (op->arch)
664	op->arch->name = op->name;
665
666	break;
667
668	case KW_uuid:	531	case KW_uuid:
669	if (const char *s = thawer.get_str ())	532	if (const char *s = f.get_str ())
670	{	533	{
671	unsigned int version;	534	unsigned int version;
672	unsigned long long seq;	535	unsigned long long seq;
673		536
674	if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)	537	if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
675	{	538	{
676	op->uuid.seq = seq;	539	uuid.seq = seq;
677	break;	540	break;
678	}	541	}
679	}	542	}
680		543
681	op->uuid = gen_uuid ();	544	uuid = gen_uuid ();
682	break;	545	break;
683		546
684	case KW_oid:	547	case KW_oid:
685	thawer.get (op, thawer.get_sint32 ());	548	f.get (this, f.get_sint32 ());
686	break;	549	break;
687		550
688	case KW_name: thawer.get (op->name); break;	551	case KW_name: f.get (name); break;
689	case KW_name_pl: thawer.get (op->name_pl); break;	552	case KW_name_pl: f.get (name_pl); break;
690	case KW_title: thawer.get (op->title); break;	553	case KW_title: f.get (title); break;
691	case KW_custom_name: thawer.get (op->custom_name); break;	554	case KW_custom_name: f.get (custom_name); break;
692		555
693	case KW_attach: thawer.get_ornull (op->attach); break;	556	case KW_attach: f.get_ornull (attach); break;
694	case KW_skill: thawer.get_ornull (op->skill); break;	557	case KW_skill: f.get_ornull (skill); break;
695	case KW_race: thawer.get_ornull (op->race); break;	558	case KW_race: f.get_ornull (race); break;
696	case KW_slaying: thawer.get_ornull (op->slaying); break;	559	case KW_slaying: f.get_ornull (slaying); break;
697		560
698	case KW_arch:	561	case KW_arch:
699	{	562	{
700	const char *str = thawer.get_str ();
701
702	if (op->arch)
703	{
704	/* If op->arch has been set, then this new object
705	* must be part of the inventory. So process
706	* appropriately.
707	*/
708	archetype *arch = archetype::find (str);
709
710	object *tmp;
711
712	if (arch)
713	tmp = arch_to_object (arch);
714	else
715	{
716	tmp = object::create ();	563	object *tmp = object::read (f);
717	/* record the name of the broken object */
718	tmp->name = str;
719	}
720
721	// decativate the object we, as we are still going
722	// to read the speed value. Objects should be activated
723	// when the map, object or player is completly loaded.
724	tmp->deactivate ();	564	tmp->deactivate ();
725		565
726	parse_object (tmp, thawer, map_flags);
727
728	if (tmp->arch)
729	{	566	{
730	// was: insert_ob_in_ob (tmp, op);	567	// was: insert_ob_in_ob (tmp, op);
731	// but manually adding it can improve map loading times a lot	568	// but manually adding it can improve map loading times a lot
732	// also, appending instead of prepending keeps the	569	// also, appending instead of prepending keeps the
733	// save ordering the same between repeated load/saves.	570	// save ordering the same between repeated load/saves.
734	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);	571	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
735	CLEAR_FLAG (tmp, FLAG_REMOVED);	572	CLEAR_FLAG (tmp, FLAG_REMOVED);
736		573
737	if (!op_inv)	574	if (!op_inv)
738	{	575	{
739	op->inv = tmp;
740	tmp->above = 0;
741	}
742	else
743	{
744	while (op_inv->below)
745	op_inv = op_inv->below;
746
747	op_inv->below = tmp;
748	tmp->above = op_inv;
749	}
750
751	tmp->below = 0;
752	tmp->env = op;
753	op_inv = tmp;	576	inv = tmp;
		577	tmp->above = 0;
754	}	578	}
755	else	579	else
756	{	580	{
757	LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");	581	while (op_inv->below)
758	tmp->destroy ();	582	op_inv = op_inv->below;
		583
		584	op_inv->below = tmp;
		585	tmp->above = op_inv;
759	}	586	}
		587
		588	tmp->below = 0;
		589	tmp->env = this;
		590	op_inv = tmp;
760	}	591	}
761	else
762	{
763	/* This is the actual archetype definition then */
764	op->arch = archetype::find (str);
765
766	if (op->arch)
767	{
768	op->arch->clone.copy_to (op);
769	// copy_to activates, this should be fixed properly
770	op->deactivate ();
771	}
772	else if (!arch_init)
773	/* record the name of the broken object */
774	op->name = str;
775	}
776	}	592	}
777	break;	593	continue;
778		594
779	case KW_other_arch:	595	case KW_other_arch:
		596	other_arch =
		597	loading_arch
		598	? archetype::get (f.get_str ())
780	op->other_arch = archetype::find (thawer.get_str ());	599	: archetype::find (f.get_str ());
		600
		601	if (!other_arch)
		602	LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
781	break;	603	break;
782		604
783	case KW_animation:	605	case KW_animation:
784	{	606	{
		607	CLEAR_FLAG (this, FLAG_ANIMATE);
		608	animation_id = 0;
		609
785	const char *str = thawer.get_str ();	610	const char *str = f.get_str ();
786
787	if (!str)
788	{
789	op->animation_id = 0;
790	CLEAR_FLAG (op, FLAG_ANIMATE);
791	}
792	else if ((op->animation_id = find_animation (str)))	611	if (str && (animation_id = find_animation (str)))
793	SET_FLAG (op, FLAG_ANIMATE);	612	SET_FLAG (this, FLAG_ANIMATE);
794	}	613	}
795
796	break;	614	break;
797		615
798	case KW_last_heal: thawer.get (op->last_heal); break;	616	case KW_last_heal: f.get (last_heal); break;
799	case KW_last_sp: thawer.get (op->last_sp); break;	617	case KW_last_sp: f.get (last_sp); break;
800	case KW_last_grace: thawer.get (op->last_grace); break;	618	case KW_last_grace: f.get (last_grace); break;
801	case KW_last_eat: thawer.get (op->last_eat); break;	619	case KW_last_eat: f.get (last_eat); break;
802	case KW_speed_left: thawer.get (op->speed_left); break;	620	case KW_speed_left: f.get (speed_left); break;
803		621
804	case KW_speed:	622	case KW_speed:
805	thawer.get (op->speed);	623	f.get (speed);
806		624
807	//TODO: maybe do in check_object	625	//TODO: maybe do in check_object
808	// removed check for style maps	626	// removed check for style maps
809	if (op->speed < 0)	627	if (speed < 0)
810	op->speed_left = op->speed_left - rndm ();	628	speed_left = speed_left - rndm ();
811		629
812	break;	630	break;
813		631
814	case KW_slow_move:	632	case KW_slow_move:
815	op->move_slow |= MOVE_WALK;	633	move_slow |= MOVE_WALK;
816	thawer.get (op->move_slow_penalty);	634	f.get (move_slow_penalty);
817	break;	635	break;
818		636
819	case KW_face:	637	case KW_face:
820	op->face = &new_faces[FindFace (thawer.get_str (), 0)];	638	face = face_find (f.get_str ());
821	break;	639	break;
822		640
823	case KW_x: thawer.get (op->x); break;	641	case KW_x: f.get (x); break;
824	case KW_y: thawer.get (op->y); break;	642	case KW_y: f.get (y); break;
825		643
826	case KW_Str: // uppercase alias	644	case KW_Str: // uppercase alias
827	case KW_str: thawer.get (op->stats.Str); break;	645	case KW_str: f.get (stats.Str); break;
828	case KW_Dex: // uppercase alias	646	case KW_Dex: // uppercase alias
829	case KW_dex: thawer.get (op->stats.Dex); break;	647	case KW_dex: f.get (stats.Dex); break;
830	case KW_Con: // uppercase alias	648	case KW_Con: // uppercase alias
831	case KW_con: thawer.get (op->stats.Con); break;	649	case KW_con: f.get (stats.Con); break;
832	case KW_Wis: // uppercase alias	650	case KW_Wis: // uppercase alias
833	case KW_wis: thawer.get (op->stats.Wis); break;	651	case KW_wis: f.get (stats.Wis); break;
834	case KW_Cha: // uppercase alias	652	case KW_Cha: // uppercase alias
835	case KW_cha: thawer.get (op->stats.Cha); break;	653	case KW_cha: f.get (stats.Cha); break;
836	case KW_Int: // uppercase alias	654	case KW_Int: // uppercase alias
837	case KW_int: thawer.get (op->stats.Int); break;	655	case KW_int: f.get (stats.Int); break;
838	case KW_Pow: // uppercase alias	656	case KW_Pow: // uppercase alias
839	case KW_pow: thawer.get (op->stats.Pow); break;	657	case KW_pow: f.get (stats.Pow); break;
840		658
841	case KW_hp: thawer.get (op->stats.hp); break;	659	case KW_hp: f.get (stats.hp); break;
842	case KW_maxhp: thawer.get (op->stats.maxhp); break;	660	case KW_maxhp: f.get (stats.maxhp); break;
843	case KW_sp: thawer.get (op->stats.sp); break;	661	case KW_sp: f.get (stats.sp); break;
844	case KW_maxsp: thawer.get (op->stats.maxsp); break;	662	case KW_maxsp: f.get (stats.maxsp); break;
845	case KW_grace: thawer.get (op->stats.grace); break;	663	case KW_grace: f.get (stats.grace); break;
846	case KW_maxgrace: thawer.get (op->stats.maxgrace); break;	664	case KW_maxgrace: f.get (stats.maxgrace); break;
847		665
848	case KW_exp: thawer.get (op->stats.exp); break;	666	case KW_exp: f.get (stats.exp); break;
849	case KW_perm_exp: thawer.get (op->perm_exp); break;	667	case KW_perm_exp: f.get (perm_exp); break;
850	case KW_food: thawer.get (op->stats.food); break;	668	case KW_food: f.get (stats.food); break;
851	case KW_dam: thawer.get (op->stats.dam); break;	669	case KW_dam: f.get (stats.dam); break;
852	case KW_wc: thawer.get (op->stats.wc); break;	670	case KW_wc: f.get (stats.wc); break;
853	case KW_ac: thawer.get (op->stats.ac); break;	671	case KW_ac: f.get (stats.ac); break;
854	case KW_nrof: thawer.get (op->nrof); break;	672	case KW_nrof: f.get (nrof); break;
855	case KW_level: thawer.get (op->level); break;	673	case KW_level: f.get (level); break;
856	case KW_direction: thawer.get (op->direction); break;	674	case KW_direction: f.get (direction); break;
857	case KW_type: thawer.get (op->type); break;	675	case KW_type: f.get (type); break;
858	case KW_subtype: thawer.get (op->subtype); break;	676	case KW_subtype: f.get (subtype); break;
859	case KW_value: thawer.get (op->value); break;	677	case KW_value: f.get (value); break;
860	case KW_weight: thawer.get (op->weight); break;	678	case KW_weight: f.get (weight); break;
861	case KW_carrying: thawer.get (op->carrying); break;	679	case KW_carrying: f.get (carrying); break;
862	case KW_attacktype: thawer.get (op->attacktype); break;	680	case KW_attacktype: f.get (attacktype); break;
863	case KW_path_attuned: thawer.get (op->path_attuned); break;	681	case KW_path_attuned: f.get (path_attuned); break;
864	case KW_path_repelled: thawer.get (op->path_repelled); break;	682	case KW_path_repelled: f.get (path_repelled); break;
865	case KW_path_denied: thawer.get (op->path_denied); break;	683	case KW_path_denied: f.get (path_denied); break;
866	case KW_invisible: thawer.get (op->invisible); break;	684	case KW_invisible: f.get (invisible); break;
867	case KW_magic: thawer.get (op->magic); break;	685	case KW_magic: f.get (magic); break;
868	case KW_state: thawer.get (op->state); break;	686	case KW_state: f.get (state); break;
869	case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;	687	case KW_move_slow_penalty: f.get (move_slow_penalty); break;
870	case KW_material: thawer.get (op->material); break;	688	case KW_material: f.get (materials); break; //TODO: nuke
871	case KW_materialname: thawer.get (op->materialname); break;	689	case KW_materialname: f.get (materialname); break;
872		690
873	/* These are the new values */	691	/* These are the new values */
874	case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;	692	case KW_move_block: set_move (move_block, f.get_str ()); break;
875	case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;	693	case KW_move_allow: set_move (move_allow, f.get_str ()); break;
876	case KW_move_type: set_move (op->move_type, thawer.get_str ()); break;	694	case KW_move_type: set_move (move_type, f.get_str ()); break;
877	case KW_move_on: set_move (op->move_on, thawer.get_str ()); break;	695	case KW_move_on: set_move (move_on, f.get_str ()); break;
878	case KW_move_off: set_move (op->move_off, thawer.get_str ()); break;	696	case KW_move_off: set_move (move_off, f.get_str ()); break;
879	case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break;	697	case KW_move_slow: set_move (move_slow, f.get_str ()); break;
880		698
881	/* These are all legacy - any new objects should use the move_ .. values */	699	/* These are all legacy - any new objects should use the move_ .. values */
882	case KW_no_pass:	700	case KW_no_pass:
883	{	701	{
884	if (thawer.get_sint32 ())	702	if (f.get_sint32 ())
885	op->move_block = MOVE_ALL;	703	move_block = MOVE_ALL;
886	else	704	else
887	op->move_block = 0;	705	move_block = 0;
888	}	706	}
889		707
890	break;	708	break;
891		709
892	/* These are all legacy - any new objects should use the move_ .. values */	710	/* These are all legacy - any new objects should use the move_ .. values */
893	case KW_walk_on:	711	case KW_walk_on:
894	{	712	{
895	if (thawer.get_sint32 ())	713	if (f.get_sint32 ())
896	op->move_on |= MOVE_WALK;	714	move_on |= MOVE_WALK;
897	else	715	else
898	op->move_on &= ~MOVE_WALK;	716	move_on &= ~MOVE_WALK;
899	}	717	}
900		718
901	break;	719	break;
902		720
903	/* These are all legacy - any new objects should use the move_ .. values */	721	/* These are all legacy - any new objects should use the move_ .. values */
904	case KW_walk_off:	722	case KW_walk_off:
905	{	723	{
906	if (thawer.get_sint32 ())	724	if (f.get_sint32 ())
907	op->move_off |= MOVE_WALK;	725	move_off |= MOVE_WALK;
908	else	726	else
909	op->move_off &= ~MOVE_WALK;	727	move_off &= ~MOVE_WALK;
910	}	728	}
911	break;	729	break;
912		730
913	/* These are all legacy - any new objects should use the move_ .. values */	731	/* These are all legacy - any new objects should use the move_ .. values */
914	case KW_fly_on:	732	case KW_fly_on:
915	{	733	{
916	if (thawer.get_sint32 ())	734	if (f.get_sint32 ())
917	op->move_on |= MOVE_FLY_LOW;	735	move_on |= MOVE_FLY_LOW;
918	else	736	else
919	op->move_on &= ~MOVE_FLY_LOW;	737	move_on &= ~MOVE_FLY_LOW;
920	}	738	}
921	break;	739	break;
922		740
923	/* 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 */
924	case KW_fly_off:	742	case KW_fly_off:
925	{	743	{
926	if (thawer.get_sint32 ())	744	if (f.get_sint32 ())
927	op->move_off |= MOVE_FLY_LOW;	745	move_off |= MOVE_FLY_LOW;
928	else	746	else
929	op->move_off &= ~MOVE_FLY_LOW;	747	move_off &= ~MOVE_FLY_LOW;
930	}	748	}
931	break;	749	break;
932		750
933	//TODO: remove these after converting archetypes	751	//TODO: remove these after converting archetypes
934	case KW_can_use_wand:	752	case KW_can_use_wand:
935	GET_FLAG (op, FLAG_USE_RANGE);	753	GET_FLAG (this, FLAG_USE_RANGE);
936	break;	754	break;
937		755
938	/* These are all legacy - any new objects should use the move_ .. values */	756	/* These are all legacy - any new objects should use the move_ .. values */
939	case KW_flying:	757	case KW_flying:
940	{	758	{
941	if (thawer.get_sint32 ())	759	if (f.get_sint32 ())
942	op->move_type |= MOVE_FLY_LOW;	760	move_type |= MOVE_FLY_LOW;
943	else	761	else
944	op->move_type &= ~MOVE_FLY_LOW;	762	move_type &= ~MOVE_FLY_LOW;
945	}	763	}
946	break;	764	break;
947		765
948		766
949	case KW_identified:	767	case KW_identified:
950	GET_FLAG (op, FLAG_IDENTIFIED);	768	GET_FLAG (this, FLAG_IDENTIFIED);
951	//TODO: move to check_object or so	769	//TODO: move to check_object or so
952	if (QUERY_FLAG (op, FLAG_IDENTIFIED))	770	if (QUERY_FLAG (this, FLAG_IDENTIFIED))
953	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);	771	CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
954		772
955	break;	773	break;
956		774
957	case KW_wiz:	775	case KW_wiz:
958	GET_FLAG (op, FLAG_WIZ);	776	GET_FLAG (this, FLAG_WIZ);
959	//TODO: move to check_object	777	//TODO: move to check_object
960	if (QUERY_FLAG (op, FLAG_WIZ))	778	if (QUERY_FLAG (this, FLAG_WIZ))
961	{	779	{
962	SET_FLAG (op, FLAG_WAS_WIZ);	780	SET_FLAG (this, FLAG_WAS_WIZ);
963	SET_FLAG (op, FLAG_WIZPASS);	781	SET_FLAG (this, FLAG_WIZPASS);
964	SET_FLAG (op, FLAG_WIZCAST);	782	SET_FLAG (this, FLAG_WIZCAST);
965	}	783	}
966	else	784	else
967	{	785	{
968	CLEAR_FLAG (op, FLAG_WIZPASS);	786	CLEAR_FLAG (this, FLAG_WIZPASS);
969	CLEAR_FLAG (op, FLAG_WIZCAST);	787	CLEAR_FLAG (this, FLAG_WIZCAST);
970	}	788	}
971	break;	789	break;
972		790
973	case KW_friendly:	791	case KW_friendly:
974	if (thawer.get_sint32 ())	792	if (f.get_sint32 ())
975	if (op->type != PLAYER)	793	if (type != PLAYER)
976	add_friendly_object (op);	794	add_friendly_object (this);
977		795
978	break;	796	break;
979		797
980	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;	798	case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
981	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;	799	case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
982	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;	800	case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
983	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;	801	case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
984	case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;	802	case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
985	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;	803	case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
986	case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;	804	case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
987	case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;	805	case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
988	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;	806	case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
989	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;	807	case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
990	case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;	808	case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
991	case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;	809	case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
992	case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;	810	case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
993	case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;	811	case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
994	case KW_alive: GET_FLAG (op, FLAG_ALIVE); break;	812	case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
995	case KW_applied: GET_FLAG (op, FLAG_APPLIED); break;	813	case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
996	case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break;	814	case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
997	case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break;	815	case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
998	case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break;	816	case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
999	case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break;	817	case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
1000	case KW_changing: GET_FLAG (op, FLAG_CHANGING); break;	818	case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
1001	case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break;	819	case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
1002	case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break;	820	case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
1003	case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break;	821	case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
1004	case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break;	822	case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
1005	case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break;	823	case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
1006	case KW_scared: GET_FLAG (op, FLAG_SCARED); break;	824	case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
1007	case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break;	825	case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
1008	case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break;	826	case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
1009	case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break;	827	case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
1010	case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break;	828	case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
1011	case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break;	829	case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
1012	case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break;	830	case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
1013	case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break;	831	case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
1014	case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break;	832	case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
1015	case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break;	833	case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
1016	case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break;	834	case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
1017	case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break;	835	case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
1018	case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break;	836	case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
1019	case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break;	837	case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
1020	case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break;	838	case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
1021	case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;	839	case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
1022	case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;	840	case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
1023	case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;	841	case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
1024	case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;	842	case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
1025	case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;	843	case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
1026	case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;	844	case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
1027	case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;	845	case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
1028	case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;	846	case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
1029	case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;	847	case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
1030	case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;	848	case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
1031	case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;	849	case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
1032	case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break;	850	case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
1033	case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break;	851	case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
1034	case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break;	852	case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
1035	case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break;	853	case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
1036	case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break;	854	case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
1037	case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break;	855	case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
1038	case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break;	856	case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
1039	case KW_cursed: GET_FLAG (op, FLAG_CURSED); break;	857	case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
1040	case KW_damned: GET_FLAG (op, FLAG_DAMNED); break;	858	case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
1041	case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break;	859	case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
1042	case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break;	860	case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
1043	case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break;	861	case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
1044	case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break;	862	case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
1045	case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break;	863	case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
1046	case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break;	864	case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
1047	case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break;	865	case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
1048	case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break;	866	case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
1049	case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break;	867	case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
1050	case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break;	868	case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
1051	case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break;	869	case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
1052	case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break;	870	case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
1053	case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break;	871	case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
1054	case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break;	872	case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
1055	case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break;	873	case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
1056	case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break;	874	case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
1057	case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break;	875	case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
1058	case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break;	876	case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
1059	case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break;	877	case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
1060	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;	878	case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
1061	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;	879	case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
1062	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;	880	case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
1063	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;	881	case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
1064	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;	882	case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
1065	case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;	883	case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
		884	case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
		885	case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
1066		886
1067	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;	887	case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
1068	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;	888	case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
1069	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;	889	case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
1070	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;	890	case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
1071	case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break;	891	case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
1072	case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break;	892	case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
1073	case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break;	893	case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
1074	case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break;	894	case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
1075	case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break;	895	case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
1076	case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break;	896	case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
1077	case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break;	897	case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
1078	case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break;	898	case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
1079	case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break;	899	case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
1080	case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break;	900	case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
1081	case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break;	901	case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
1082	case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break;	902	case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
1083	case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break;	903	case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
1084	case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break;	904	case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
1085	case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break;	905	case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
1086	case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break;	906	case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
1087	case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break;	907	case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
1088	case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break;	908	case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
1089	case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break;	909	case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
1090	case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break;	910	case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
1091	case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break;	911	case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
1092	case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break;	912	case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
1093	case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break;	913	case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
1094		914
1095	case KW_luck: thawer.get (op->stats.luck); break;	915	case KW_luck: f.get (stats.luck); break;
1096	case KW_run_away: thawer.get (op->run_away); break;	916	case KW_run_away: f.get (run_away); break;
1097	case KW_pick_up: thawer.get (op->pick_up); break;	917	case KW_pick_up: f.get (pick_up); break;
1098	case KW_item_power: thawer.get (op->item_power); break;	918	case KW_item_power: f.get (item_power); break;
1099	case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break;	919	case KW_gen_sp_armour: f.get (gen_sp_armour); break;
1100	case KW_anim_speed: thawer.get (op->anim_speed); break;	920	case KW_anim_speed: f.get (anim_speed); break;
1101	case KW_container: thawer.get (op->weight_limit); break;	921	case KW_container: f.get (weight_limit); break;
1102	case KW_will_apply: thawer.get (op->will_apply); break;	922	case KW_will_apply: f.get (will_apply); break;
1103	case KW_attack_movement: thawer.get (op->attack_movement); break;	923	case KW_attack_movement: f.get (attack_movement); break;
1104	case KW_move_state: thawer.get (op->move_status); break;	924	case KW_move_state: f.get (move_status); break;
1105	case KW_expmul: thawer.get (op->expmul); break;	925	case KW_expmul: f.get (expmul); break;
1106	case KW_glow_radius: thawer.get (op->glow_radius); break;	926	case KW_glow_radius: f.get (glow_radius); break;
1107	case KW_weapontype: thawer.get (op->weapontype); break;	927	case KW_weapontype: f.get (weapontype); break;
1108	case KW_tooltype: thawer.get (op->tooltype); break;	928	case KW_tooltype: f.get (tooltype); break;
1109	case KW_casting_time: thawer.get (op->casting_time); break;	929	case KW_casting_time: f.get (casting_time); break;
1110	case KW_elevation: thawer.get (op->elevation); break;	930	case KW_elevation: f.get (elevation); break;
1111	case KW_smoothlevel: thawer.get (op->smoothlevel); break;	931	case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
1112	case KW_client_type: thawer.get (op->client_type); break;	932	case KW_client_type: f.get (client_type); break;
1113	case KW_duration: thawer.get (op->duration); break;	933	case KW_duration: f.get (duration); break;
1114	case KW_range: thawer.get (op->range); break;	934	case KW_range: f.get (range); break;
1115	case KW_range_modifier: thawer.get (op->range_modifier); break;	935	case KW_range_modifier: f.get (range_modifier); break;
1116	case KW_dam_modifier: thawer.get (op->dam_modifier); break;	936	case KW_dam_modifier: f.get (dam_modifier); break;
1117	case KW_duration_modifier: thawer.get (op->duration_modifier); break;	937	case KW_duration_modifier: f.get (duration_modifier); break;
1118		938
1119	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess	939	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1120	//TODO: parse from other include files	940	//TODO: parse from other include files
1121	case KW_body_range: thawer.get (op->body_info[0]); break;	941	case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
1122	case KW_body_arm: thawer.get (op->body_info[1]); break;	942	case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
1123	case KW_body_torso: thawer.get (op->body_info[2]); break;	943	case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
1124	case KW_body_head: thawer.get (op->body_info[3]); break;	944	case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
1125	case KW_body_neck: thawer.get (op->body_info[4]); break;	945	case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
1126	case KW_body_skill: thawer.get (op->body_info[5]); break;	946	case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
1127	case KW_body_finger: thawer.get (op->body_info[6]); break;	947	case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
1128	case KW_body_shoulder: thawer.get (op->body_info[7]); break;	948	case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
1129	case KW_body_foot: thawer.get (op->body_info[8]); break;	949	case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
1130	case KW_body_hand: thawer.get (op->body_info[9]); break;	950	case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
1131	case KW_body_wrist: thawer.get (op->body_info[10]); break;	951	case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
1132	case KW_body_waist: thawer.get (op->body_info[11]); break;	952	case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
		953	case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
		954	case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
1133	case KW_can_apply:	955	case KW_can_apply:
1134	break;	956	break;
1135		957
1136	case KW_connected:	958	case KW_connected:
1137	add_button_link (op, op->map, thawer.get_sint32 ());	959	add_button_link (this, map, f.get_sint32 ());
1138	break;	960	break;
1139		961
1140	case KW_randomitems:	962	case KW_randomitems:
1141	op->randomitems = find_treasurelist (thawer.get_str ());	963	if (f.get_str ())
		964	{
		965	randomitems =
		966	loading_arch
		967	? treasurelist::get (f.get_str ())
		968	: treasurelist::find (f.get_str ());
		969
		970	if (!randomitems)
		971	LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
		972	}
		973	else
		974	randomitems = 0;
1142	break;	975	break;
1143		976
1144	case KW_msg:	977	case KW_msg:
1145	thawer.get_ml (KW_endmsg, op->msg);	978	f.get_ml (KW_endmsg, msg);
1146	//TODO: allow longer messages	979	//TODO: allow longer messages
1147	if (strlen (op->msg) >= HUGE_BUF)	980	if (strlen (msg) >= HUGE_BUF)
1148	{	981	{
1149	LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);	982	LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
1150	op->msg = "ERROR, please report: string too long, winged.\n";	983	msg = "ERROR, please report: string too long, winged.\n";
1151	}	984	}
1152	break;	985	break;
1153		986
1154	case KW_lore:	987	case KW_lore:
1155	thawer.get_ml (KW_endlore, op->lore);	988	f.get_ml (KW_endlore, lore);
1156	//TODO: allow longer messages	989	//TODO: allow longer messages
1157	/* Just print a warning so we can be reasonably safe	990	/* Just print a warning so we can be reasonably safe
1158	* about not overflowing the buffer.	991	* about not overflowing the buffer.
1159	*/	992	*/
1160	if (strlen (op->lore) > (HUGE_BUF / 2))	993	if (strlen (lore) > (HUGE_BUF / 2))
1161	LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",	994	LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1162	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);	995	HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
1163	break;	996	break;
1164		997
1165	case KW_editable:	998	case KW_editable:
1166	case KW_editor_folder:	999	case KW_editor_folder:
1167	break;	1000	break;
1168		1001
1169	case KW_More: // uppercase alias
1170	case KW_more:
1171	/* We need to record that this is a multipart object,
1172	* so the calling function can glue things back together
1173	*/
1174	ismore = 1;
1175	break;
1176
1177	case KW_end:	1002	case KW_end:
1178	check_loaded_object (op);
1179
1180	if (!arch_init)	1003	if (!loading_arch)
1181	op->instantiate ();	1004	instantiate ();
1182		1005
1183	return ismore ? LL_MORE : LL_NORMAL;	1006	f.next ();
1184
1185	case KW_EOF:
1186	return LL_EOF;	1007	return true;
1187		1008
1188	case KW_ERROR:	1009	case KW_ERROR:
1189	set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);	1010	set_ob_key_value (this, f.kw_str, f.value, true);
1190	//fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D	1011	//fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1191	break;	1012	break;
1192		1013
1193	default:	1014	default:
1194	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);	1015	if (!f.parse_error ("object", name))
		1016	return false;
1195	break;	1017	break;
1196	}	1018	}
		1019
		1020	f.next ();
1197	}	1021	}
1198	}	1022	}
1199		1023
1200	/*	1024	object *
1201	* Loads an object from the given file-pointer.	1025	object::read (object_thawer &f, maptile *map)
1202	* Variables will be read and parsed and patched into the object
1203	* until the string "end" is reached, or the end of the file.
1204	*
1205	* bufstat is used to determine various file attributes:
1206	* LO_REPATE (0): We are reading from the same buffer as the last call.
1207	* LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1208	* will also be reading from this (treasure file, artifacts.)
1209	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1210	* be reset.
1211	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1212	*
1213	*/
1214	int
1215	load_object (object_thawer &fp, object *op, int map_flags)
1216	{	1026	{
1217	coroapi::cede_every (1000); // cede once in a while	1027	assert (f.kw == KW_arch);
1218		1028
1219	return parse_object (op, fp, map_flags);	1029	archetype *arch = archetype::find (f.get_str ());
		1030
		1031	if (!arch)
		1032	{
		1033	LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
		1034	arch = archetype::find ("earthwall");
		1035	}
		1036
		1037	assert (arch); //D maybe use exception handling of sorts?
		1038
		1039	f.next ();
		1040
		1041	object *op = object::create ();
		1042
		1043	op->map = map;
		1044	arch->clone.copy_to (op);
		1045	// copy_to activates, this should be fixed properly
		1046	op->deactivate ();
		1047
		1048	if (!op->parse_kv (f))
		1049	{
		1050	op->destroy (true);
		1051	return 0;
		1052	}
		1053
		1054	op->post_load_check ();
		1055	return op;
1220	}	1056	}
1221		1057
1222	/* This takes a buffer, scans it for variables, and sets those variables	1058	/* This takes a buffer, scans it for variables, and sets those variables
1223	* as appropriate in op.	1059	* as appropriate in op.
1224	*	1060	*
…		…
1226	* override values and in c_wiz to mutate values.	1062	* override values and in c_wiz to mutate values.
1227	*/	1063	*/
1228	int	1064	int
1229	set_variable (object *op, char *buf)	1065	set_variable (object *op, char *buf)
1230	{	1066	{
1231	object_thawer thawer (buf, (AV *)0);	1067	object_thawer f (buf, (AV *)0);
1232		1068
1233	return parse_object (op, thawer, 0);	1069	f.next ();
1234	}	1070	return op->parse_kv (f);
1235
1236	/*
1237	* Initialises the array of variable-names. Needed before any
1238	* objects can be loaded. Called by init_library().
1239	*/
1240
1241	void
1242	init_vars ()
1243	{
1244	}	1071	}
1245		1072
1246	/* This returns a string of the integer movement type */	1073	/* This returns a string of the integer movement type */
1247	#if 0	1074	#if 0
1248	// unused function	1075	// unused function
…		…
1293	return retbuf + 1;	1120	return retbuf + 1;
1294	}	1121	}
1295	#endif	1122	#endif
1296		1123
1297	// compare *op against *tmp and output differences	1124	// compare *op against *tmp and output differences
1298	void	1125	static void
1299	put (object_freezer &f, object *op, object *tmp)	1126	write_diff (object_freezer &f, object *op, object *tmp)
1300	{	1127	{
1301	static const keyword resist_save[NROFATTACKS] = {	1128	static const keyword resist_save[NROFATTACKS] = {
1302	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,	1129	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1303	# include "attackinc.h"	1130	# include "attackinc.h"
1304	# undef def	1131	# undef def
…		…
1328	KW_monster,	1155	KW_monster,
1329	KW_friendly,	1156	KW_friendly,
1330	KW_generator,	1157	KW_generator,
1331	KW_is_thrown,	1158	KW_is_thrown,
1332	KW_auto_apply,	1159	KW_auto_apply,
1333	KW_NULL, // was KW_treasure	1160	KW_treasure_env,
1334	KW_player_sold,	1161	KW_player_sold,
1335	/* 20 */	1162	/* 20 */
1336	KW_see_invisible,	1163	KW_see_invisible,
1337	KW_can_roll,	1164	KW_can_roll,
1338	KW_overlay_floor,	1165	KW_overlay_floor,
…		…
1399	KW_can_use_skill,	1226	KW_can_use_skill,
1400	KW_been_applied,	1227	KW_been_applied,
1401	/* 80 */	1228	/* 80 */
1402	KW_has_ready_scroll,	1229	KW_has_ready_scroll,
1403	KW_can_use_rod,	1230	KW_can_use_rod,
1404	KW_NULL,	1231	KW_precious,
1405	KW_can_use_horn,	1232	KW_can_use_horn,
1406	KW_make_invisible,	1233	KW_make_invisible,
1407	KW_inv_locked,	1234	KW_inv_locked,
1408	KW_is_wooded,	1235	KW_is_wooded,
1409	KW_is_hilly,	1236	KW_is_hilly,
…		…
1475	f.put (KW_msg, KW_endmsg, op->msg);	1302	f.put (KW_msg, KW_endmsg, op->msg);
1476	if (op->lore != tmp->lore)	1303	if (op->lore != tmp->lore)
1477	f.put (KW_lore, KW_endlore, op->lore);	1304	f.put (KW_lore, KW_endlore, op->lore);
1478		1305
1479	CMP_OUT (other_arch);	1306	CMP_OUT (other_arch);
1480	CMP_OUT (face);	1307
		1308	if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1481		1309
1482	if (op->animation_id != tmp->animation_id)	1310	if (op->animation_id != tmp->animation_id)
1483	if (op->animation_id)	1311	if (op->animation_id)
1484	{	1312	{
1485	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);	1313	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
…		…
1533	f.put (resist_save[i], op->resist[i]);	1361	f.put (resist_save[i], op->resist[i]);
1534		1362
1535	CMP_OUT (path_attuned);	1363	CMP_OUT (path_attuned);
1536	CMP_OUT (path_repelled);	1364	CMP_OUT (path_repelled);
1537	CMP_OUT (path_denied);	1365	CMP_OUT (path_denied);
1538	CMP_OUT (material);	1366	CMP_OUT2 (material, materials);//TODO: nuke
1539	CMP_OUT (materialname);	1367	CMP_OUT (materialname);
1540	CMP_OUT (value);	1368	CMP_OUT (value);
1541	CMP_OUT (carrying);	1369	CMP_OUT (carrying);
1542	CMP_OUT (weight);	1370	CMP_OUT (weight);
1543	CMP_OUT (invisible);	1371	CMP_OUT (invisible);
…		…
1582	if (op->flag != tmp->flag)	1410	if (op->flag != tmp->flag)
1583	for (i = 0; i <= NUM_FLAGS; i++)	1411	for (i = 0; i <= NUM_FLAGS; i++)
1584	if (flag_names [i] && op->flag [i] != tmp->flag [i])	1412	if (flag_names [i] && op->flag [i] != tmp->flag [i])
1585	f.put (flag_names [i], op->flag [i] ? "1" : "0");	1413	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1586		1414
1587	/* Save body locations */	1415	// save body locations
1588	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1416	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1589	if (op->body_info[i] != tmp->body_info[i])	1417	if (op->slot[i].info != tmp->slot[i].info)
1590	f.put (body_locations[i].save_name, op->body_info[i]);	1418	f.put (body_locations[i].save_name, op->slot[i].info);
1591	}	1419	}
1592		1420
1593	/*	1421	/*
1594	* Dumps all variables in an object to a file.	1422	* Dumps all variables in an object to a file.
1595	* 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,
1596	* 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.
1597	*/	1425	*/
1598	void	1426	bool
1599	save_object (object_freezer &fp, object *op, int flag)	1427	object::write (object_freezer &f)
1600	{	1428	{
1601	/* Even if the object does have an owner, it would seem that we should	1429	/* Even if the object does have an owner, it would seem that we should
1602	* still save it.	1430	* still save it.
1603	*/	1431	*/
1604	if (op->owner)	1432	if (owner)
1605	return;	1433	return true;
1606		1434
1607	/* If it is unpaid and we don't want to save those, just return. */
1608	if (!(flag & 1) && op->flag [FLAG_UNPAID])
1609	return;
1610
1611	archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;	1435	archetype *at = arch ? (archetype *)arch : empty_archetype;
1612		1436
1613	fp.put (KW_arch, at->name);	1437	f.put (KW_arch, at->name);
1614	put (fp, op, &at->clone);	1438	write_diff (f, this, &at->clone);
1615		1439
1616	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1617
1618	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1440	for (object *tmp = inv; tmp; tmp = tmp->below)
1619	save_object (fp, tmp, flag);	1441	tmp->write (f);
1620		1442
1621	fp.put (op);	1443	f.put (this);
1622	fp.put (KW_end);	1444	f.put (KW_end);
		1445
		1446	return true;
1623	}	1447	}
1624		1448
		1449	/////////////////////////////////////////////////////////////////////////////
		1450
		1451	// generic resource file load,
		1452	// currently supports: region, treasures, archetypes
		1453	bool load_resource_file (const char *filename)
		1454	{
		1455	object_thawer f (filename);
		1456
		1457	bool success = false;
		1458	bool seen_arch = false;
		1459
		1460	f.next ();
		1461
		1462	for (;;)
		1463	{
		1464	switch (f.kw)
		1465	{
		1466	case KW_region:
		1467	if (!region::read (f))
		1468	goto finish;
		1469	break;
		1470
		1471	case KW_treasure:
		1472	case KW_treasureone:
		1473	if (!treasurelist::read (f))
		1474	goto finish;
		1475	break;
		1476
		1477	case KW_object:
		1478	seen_arch = true;
		1479	if (!archetype::read (f))
		1480	goto finish;
		1481	break;
		1482
		1483	case KW_EOF:
		1484	success = true;
		1485	goto finish;
		1486
		1487	default:
		1488	if (!f.parse_error ("resource file"))
		1489	goto finish;
		1490
		1491	f.next ();
		1492	break;
		1493	}
		1494	}
		1495
		1496	finish:
		1497	if (seen_arch)
		1498	init_archetype_pointers ();
		1499
		1500	return success;
		1501	}
		1502

Diff Legend

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