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.38 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.120 by root, Thu Sep 11 12:43:17 2008 UTC

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

Diff Legend

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