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.22 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.80 by root, Sat May 12 16:06:41 2007 UTC

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

Diff Legend

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