ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/loader.C

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

Diff Legend

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