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

Diff Legend

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