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

Diff Legend

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