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.17 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.82 by root, Thu May 17 14:14:54 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	if (slot [body_range].info != -1)
		272	{
		273	LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
		274	slot [body_range].info = -1;
		275	}
		276	break;
268		277
		278	case WEAPON:
		279	if (slot [body_combat].info != -1)
		280	{
		281	LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
		282	slot [body_combat].info = -1;
		283	}
		284	break;
		285
		286	case SHIELD:
		287	if (slot [body_shield].info != -1)
		288	{
		289	LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
		290	slot [body_shield].info = -1;
		291	}
		292	break;
		293
		294	case PLAYER:
		295	if (slot [body_shield].info != 1)
		296	{
		297	LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
		298	slot [body_shield].info = 1;
		299	}
		300
		301	if (slot [body_combat].info != 1)
		302	{
		303	LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
		304	slot [body_combat].info = 1;
		305	}
		306
		307	if (slot [body_range].info != 1)
		308	{
		309	LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
		310	slot [body_range].info = 1;
		311	}
		312	break;
		313	}
		314
269	/* We do some specialized handling to handle legacy cases of name_pl.	315	/* 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 -	316	* 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	317	* 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	318	* 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	319	* 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.	320	* 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	321	* Otherwise, what happens is that the the plural name will lose
276	* information (appear as just 'hearts' and not 'goblins heart')	322	* information (appear as just 'hearts' and not 'goblins heart')
277	*/	323	*/
278	if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)	324	if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl)
279	op->name_pl = NULL;	325	name_pl = 0;
280		326
281	if (!op->name_pl)	327	if (!name_pl)
282	op->name_pl = op->name;	328	name_pl = name;
283		329
284	/* objects now have a materialname. try to patch it in */	330	/* objects now have a materialname. try to patch it in */
285	if (!(IS_WEAPON (op) && op->level > 0))	331	if (!(is_weapon () && level > 0))
286	{	332	set_materialname (this, map ? map->difficulty : 5, 0);
287	if (op->map != NULL)	333
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	334	/* only do these when program is first run - a bit
293	* excessive to do this at every run - most of this is	335	* excessive to do this at every run - most of this is
294	* really just to catch any errors - program will still run, but	336	* really just to catch any errors - program will still run, but
295	* not in the ideal fashion.	337	* not in the ideal fashion.
296	*/	338	*/
297	if ((op->type == WEAPON || op->type == BOW) && arch_init)	339	if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
298	{	340	{
299	if (!op->skill)	341	if (!skill)
300	{
301	LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());	342	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) ||	343	else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) ||
304	(!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))	344	(!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);	345	LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
307	}
308	}	346	}
309		347
310	/* We changed last_heal to gen_sp_armour, which is what it	348	/* We changed last_heal to gen_sp_armour, which is what it
311	* really does for many objects. Need to catch any in maps	349	* really does for many objects. Need to catch any in maps
312	* that may have an old value.	350	* that may have an old value.
313	*/	351	*/
314	if ((op->type == WEAPON) ||	352	if (type == WEAPON
315	(op->type == ARMOUR) || (op->type == HELMET) ||	353	|| type == ARMOUR || type == HELMET
316	(op->type == SHIELD) || (op->type == RING) ||	354	|| type == SHIELD || type == RING
317	(op->type == BOOTS) || (op->type == GLOVES) ||	355	|| type == BOOTS || type == GLOVES
318	(op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))	356	|| type == AMULET || type == GIRDLE
		357	|| type == BRACERS || type == CLOAK)
319	{	358	{
320	if (op->last_heal)	359	if (last_heal)
321	{	360	{
322	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());	361	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
323	op->gen_sp_armour = op->last_heal;	362	gen_sp_armour = last_heal;
324	op->last_heal = 0;	363	last_heal = 0;
325	}	364	}
326	if (editor)	365
327	ip = 0;
328	else
329	ip = calc_item_power (op, 0);	366	int ip = calc_item_power (this, 0);
		367
330	/* Legacy objects from before item power was in the game */	368	/* Legacy objects from before item power was in the game */
331	if (!op->item_power && ip)	369	if (!item_power && ip)
332	{	370	{
333	if (ip > 3)	371	if (ip > 3)
334	{
335	LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);	372	LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip);
336	}	373
337	op->item_power = ip;	374	item_power = ip;
338	}	375	}
		376
339	/* Check for possibly bogus values. Has to meet both these criteria -	377	/* 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	378	* 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.	379	* 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,	380	* similarly, it item_power is 0, the first check will always pass,
343	* but not the second one.	381	* but not the second one.
344	*/	382	*/
345	if (ip > 2 * op->item_power && ip > (op->item_power + 3))	383	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);	384	LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
348	}
349
350	}	385	}
		386
351	/* Old spellcasting object - need to load in the appropiate object */	387	/* 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 ||	388	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 */	389	/* 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)	390	((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
355	{	391	{
356	object *tmp;
357
358	/* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'	392	/* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
359	* in that spell was stored in sp.	393	* in that spell was stored in sp.
360	*/	394	*/
361	tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);	395	object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
362	insert_ob_in_ob (tmp, op);	396	insert_ob_in_ob (tmp, this);
363	op->randomitems = NULL; /* So another spell isn't created for this object */	397	randomitems = NULL; /* So another spell isn't created for this object */
364	}	398	}
		399
365	/* spellbooks & runes use slaying. But not to arch name, but to spell name */	400	/* spellbooks & runes use slaying. But not to arch name, but to spell name */
366
367	if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)	401	if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
368	{	402	{
369	object *tmp;
370
371	tmp = get_archetype_by_object_name (op->slaying);	403	object *tmp = get_archetype_by_object_name (slaying);
372	insert_ob_in_ob (tmp, op);	404	insert_ob_in_ob (tmp, this);
373	op->randomitems = NULL; /* So another spell isn't created for this object */	405	randomitems = NULL; /* So another spell isn't created for this object */
374	/* without this, value is all screwed up */	406	/* without this, value is all screwed up */
375	op->value = op->arch->clone.value * op->inv->value;	407	value = arch->clone.value * inv->value;
376	}	408	}
377		409
378	if (QUERY_FLAG (op, FLAG_MONSTER))	410	if (QUERY_FLAG (this, FLAG_MONSTER))
379	{	411	{
380	if (op->stats.hp > op->stats.maxhp)	412	if (stats.hp > stats.maxhp)
		413	{
381	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);	414	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
		415	stats.maxhp = stats.hp;
		416	}
382		417
383	/* The archs just need to be updated for this */	418	/* The archs just need to be updated for this */
384	if (op->move_type == 0)	419	if (move_type == 0)
385	op->move_type = MOVE_WALK;	420	move_type = MOVE_WALK;
386	}	421	}
387		422
388	if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)	423	if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
389	{	424	{
390	/* Object will duplicate it's content as part of the	425	/* Object will duplicate it's content as part of the
391	* generation process. To do this, we must flag inventory	426	* generation process. To do this, we must flag inventory
392	* so it remains unevaluated concerning the randomitems and	427	* so it remains unevaluated concerning the randomitems and
393	* the living (a demonlord shouldn't cast from inside generator!)	428	* the living (a demonlord shouldn't cast from inside generator!)
394	*/	429	*/
395	flag_inv (op, FLAG_IS_A_TEMPLATE);	430	flag_inv (this, FLAG_IS_A_TEMPLATE);
396	}	431	}
397		432
398	/* Handle player movers. We use move_type for player movers	433	/* Handle player movers. We use move_type for player movers
399	* because they operate on their own time (move_on	434	* because they operate on their own time (move_on
400	* would potentially cause them to be triggered when someone steps	435	* would potentially cause them to be triggered when someone steps
401	* on them). If move_type is set, presume person knows what they	436	* on them). If move_type is set, presume person knows what they
402	* are doing, otherwise, set move_type based on maxhp value.	437	* are doing, otherwise, set move_type based on maxhp value.
403	*/	438	*/
404	if (op->type == PLAYERMOVER)	439	if (type == PLAYERMOVER)
405	{	440	{
406	if (!op->move_type)	441	if (!move_type)
407	{	442	{
408	if (op->stats.maxhp)	443	if (stats.maxhp)
409	{	444	{
410	op->move_type = MOVE_ALL;	445	move_type = MOVE_ALL;
411	op->stats.maxhp = 0;	446	stats.maxhp = 0;
412	}	447	}
413	else	448	else
		449	move_type = MOVE_WALK;
		450	}
		451	}
		452	}
		453
		454	static void
		455	set_move (MoveType &mt, const char *str)
		456	{
		457	static const struct flagstr {
		458	const char *name;
		459	MoveType flags;
		460	} move_flags[] = {
		461	{ "walk" , MOVE_WALK },
		462	{ "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
		463	{ "fly_low" , MOVE_FLY_LOW },
		464	{ "fly_high", MOVE_FLY_HIGH },
		465	{ "swim" , MOVE_SWIM },
		466	{ "boat" , MOVE_BOAT },
		467	{ "ship" , MOVE_SHIP },
		468	{ "all" , MOVE_ALL },
		469	};
		470
		471	if (!str)
		472	{
		473	mt = 0;
		474	return;
		475	}
		476
		477	if (isdigit (*str))
		478	{
		479	mt = atoi (str);
		480	return;
		481	}
		482
		483	mt = 0;
		484
		485	for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
		486	{
		487	bool negate = 0;
		488
		489	if (*str == '-')
		490	{
		491	negate = 1;
		492	str++;
		493	}
		494
		495	for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
		496	{
		497	if (!strcmp (f->name, str))
414	{	498	{
415	op->move_type = MOVE_WALK;	499	if (negate)
		500	mt &= ~f->flags;
		501	else
		502	mt |= f->flags;
		503
		504	goto next;
416	}	505	}
417	}	506	}
418	}
419		507
		508	LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
		509
		510	next: ;
		511	}
420	}	512	}
421		513
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) \	514	#define GET_FLAG(op,flag) \
487	if (thawer.get_sint32 ()) \	515	if (f.get_sint32 ()) \
488	SET_FLAG (op, flag); \	516	SET_FLAG (op, flag); \
489	else \	517	else \
490	CLEAR_FLAG (op, flag) \	518	CLEAR_FLAG (op, flag) \
491		519
492	int	520	bool
493	parse_object (object *op, object_thawer & thawer, int map_flags)	521	object::parse_kv (object_thawer &f)
494	{	522	{
495	bool ismore = 0;
496	object *op_inv = op->inv;	523	object *op_inv = inv;
497		524
498	for (;;)	525	for (;;)
499	{	526	{
500	keyword kw = thawer.get_kv ();
501
502	switch (kw)	527	switch (f.kw)
503	{	528	{
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:	529	case KW_uuid:
514	if (const char *s = thawer.get_str ())	530	if (const char *s = f.get_str ())
515	{	531	{
516	unsigned int version;	532	unsigned int version;
517	unsigned long long seq;	533	unsigned long long seq;
518		534
519	if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)	535	if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
520	{	536	{
521	op->uuid.seq = seq;	537	uuid.seq = seq;
522	break;	538	break;
523	}	539	}
524	}	540	}
525		541
526	op->uuid = gen_uuid ();	542	uuid = gen_uuid ();
527	break;	543	break;
528		544
529	case KW_oid:	545	case KW_oid:
530	thawer.get (op, thawer.get_sint32 ());	546	f.get (this, f.get_sint32 ());
531	break;	547	break;
532		548
533	case KW_name:	549	case KW_name: f.get (name); break;
534	thawer.get (op->name);	550	case KW_name_pl: f.get (name_pl); break;
535	break;	551	case KW_title: f.get (title); break;
536	case KW_name_pl:	552	case KW_custom_name: f.get (custom_name); break;
537	thawer.get (op->name_pl);	553
538	break;	554	case KW_attach: f.get_ornull (attach); break;
539	case KW_title:	555	case KW_skill: f.get_ornull (skill); break;
540	thawer.get (op->title);	556	case KW_race: f.get_ornull (race); break;
541	break;	557	case KW_slaying: f.get_ornull (slaying); break;
542	case KW_custom_name:
543	thawer.get (op->custom_name);
544	break;
545	case KW_attach:
546	thawer.get_ornull (op->attach);
547	break;
548	case KW_skill:
549	thawer.get_ornull (op->skill);
550	break;
551	case KW_race:
552	thawer.get_ornull (op->race);
553	break;
554	case KW_slaying:
555	thawer.get_ornull (op->slaying);
556	break;
557		558
558	case KW_arch:	559	case KW_arch:
559	{	560	{
560	const char *str = thawer.get_str ();	561	object *tmp = object::read (f);
		562	tmp->deactivate ();
561		563
562	if (op->arch)
563	{	564	{
564	/* If op->arch has been set, then this new object
565	* must be part of the inventory. So process
566	* appropriately.
567	*/
568	archetype *arch = archetype::find (str);
569
570	object *tmp;
571
572	if (arch != NULL)
573	tmp = arch_to_object (arch);
574	else
575	{
576	tmp = get_object ();
577	/* record the name of the broken object */
578	tmp->name = str;
579	}
580
581	parse_object (tmp, thawer, map_flags);
582
583	if (tmp->arch)
584	{
585	// was: insert_ob_in_ob (tmp, op);	565	// was: insert_ob_in_ob (tmp, op);
586	// but manually adding it can improve map loading times a lot	566	// but manually adding it can improve map loading times a lot
587	// also, appending instead of prepending keeps the	567	// also, appending instead of prepending keeps the
588	// save ordering the same between repeated load/saves.	568	// save ordering the same between repeated load/saves.
589	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);	569	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
590	CLEAR_FLAG (tmp, FLAG_REMOVED);	570	CLEAR_FLAG (tmp, FLAG_REMOVED);
591		571
592	if (!op_inv)	572	if (!op_inv)
593	{	573	{
594	op->inv = tmp;
595	tmp->above = 0;
596	}
597	else
598	{
599	while (op_inv->below)
600	op_inv = op_inv->below;
601
602	op_inv->below = tmp;
603	tmp->above = op_inv;
604	}
605
606	tmp->below = 0;
607	tmp->env = op;
608	op_inv = tmp;	574	inv = tmp;
		575	tmp->above = 0;
609	}	576	}
610	else	577	else
611	{	578	{
612	LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");	579	while (op_inv->below)
613	free_object (tmp);	580	op_inv = op_inv->below;
		581
		582	op_inv->below = tmp;
		583	tmp->above = op_inv;
614	}	584	}
		585
		586	tmp->below = 0;
		587	tmp->env = this;
		588	op_inv = tmp;
615	}	589	}
616	else
617	{
618	/* This is the actual archetype definition then */
619	op->arch = archetype::find (str);
620
621	if (op->arch != NULL)
622	copy_object (&op->arch->clone, op);
623	else if (!arch_init)
624	/* record the name of the broken object */
625	op->name = str;
626	}
627	}	590	}
628	break;	591	continue;
629		592
630	case KW_other_arch:	593	case KW_other_arch:
		594	other_arch =
		595	loading_arch
		596	? archetype::get (f.get_str ())
631	op->other_arch = archetype::find (thawer.get_str ());	597	: archetype::find (f.get_str ());
		598
		599	if (!other_arch)
		600	LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
632	break;	601	break;
633		602
634	case KW_animation:	603	case KW_animation:
635	{	604	{
		605	CLEAR_FLAG (this, FLAG_ANIMATE);
		606	animation_id = 0;
		607
636	const char *str = thawer.get_str ();	608	const char *str = f.get_str ();
637
638	if (!str)
639	{
640	op->animation_id = 0;
641	CLEAR_FLAG (op, FLAG_ANIMATE);
642	}
643	else
644	{
645	op->animation_id = find_animation (str);	609	if (str && (animation_id = find_animation (str)))
646	SET_FLAG (op, FLAG_ANIMATE);	610	SET_FLAG (this, FLAG_ANIMATE);
647	}
648	}	611	}
649
650	break;	612	break;
651		613
652	case KW_last_heal:	614	case KW_last_heal: f.get (last_heal); break;
653	thawer.get (op->last_heal);	615	case KW_last_sp: f.get (last_sp); break;
654	break;	616	case KW_last_grace: f.get (last_grace); break;
655	case KW_last_sp:	617	case KW_last_eat: f.get (last_eat); break;
656	thawer.get (op->last_sp);	618	case KW_speed_left: f.get (speed_left); break;
657	break;
658	case KW_last_grace:
659	thawer.get (op->last_grace);
660	break;
661	case KW_last_eat:
662	thawer.get (op->last_eat);
663	break;
664	case KW_speed_left:
665	thawer.get (op->speed_left);
666	break;
667		619
668	case KW_speed:	620	case KW_speed:
669	thawer.get (op->speed);	621	f.get (speed);
670		622
671	//TODO: maybe do in check_object	623	//TODO: maybe do in check_object
672	if (!(map_flags & MAP_STYLE))	624	// removed check for style maps
673	{
674	if (op->speed < 0)	625	if (speed < 0)
675	op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;	626	speed_left = speed_left - rndm ();
676
677	update_ob_speed (op);
678	}
679		627
680	break;	628	break;
681		629
682	case KW_slow_move:	630	case KW_slow_move:
683	op->move_slow |= MOVE_WALK;	631	move_slow |= MOVE_WALK;
684	thawer.get (op->move_slow_penalty);	632	f.get (move_slow_penalty);
685	break;	633	break;
686		634
687	case KW_face:	635	case KW_face:
688	op->face = &new_faces[FindFace (thawer.get_str (), 0)];	636	face = face_find (f.get_str ());
689	break;	637	break;
690		638
691	case KW_x:	639	case KW_x: f.get (x); break;
692	thawer.get (op->x);	640	case KW_y: f.get (y); break;
693	break;	641
694	case KW_y:
695	thawer.get (op->y);
696	break;
697	case KW_Str: // uppercase alias	642	case KW_Str: // uppercase alias
698	case KW_str:	643	case KW_str: f.get (stats.Str); break;
699	thawer.get (op->stats.Str);
700	break;
701	case KW_Dex: // uppercase alias	644	case KW_Dex: // uppercase alias
702	case KW_dex:	645	case KW_dex: f.get (stats.Dex); break;
703	thawer.get (op->stats.Dex);
704	break;
705	case KW_Con: // uppercase alias	646	case KW_Con: // uppercase alias
706	case KW_con:	647	case KW_con: f.get (stats.Con); break;
707	thawer.get (op->stats.Con);
708	break;
709	case KW_Wis: // uppercase alias	648	case KW_Wis: // uppercase alias
710	case KW_wis:	649	case KW_wis: f.get (stats.Wis); break;
711	thawer.get (op->stats.Wis);
712	break;
713	case KW_Cha: // uppercase alias	650	case KW_Cha: // uppercase alias
714	case KW_cha:	651	case KW_cha: f.get (stats.Cha); break;
715	thawer.get (op->stats.Cha);
716	break;
717	case KW_Int: // uppercase alias	652	case KW_Int: // uppercase alias
718	case KW_int:	653	case KW_int: f.get (stats.Int); break;
719	thawer.get (op->stats.Int);
720	break;
721	case KW_Pow: // uppercase alias	654	case KW_Pow: // uppercase alias
722	case KW_pow:	655	case KW_pow: f.get (stats.Pow); break;
723	thawer.get (op->stats.Pow);
724	break;
725	case KW_hp:
726	thawer.get (op->stats.hp);
727	break;
728	case KW_maxhp:
729	thawer.get (op->stats.maxhp);
730	break;
731	case KW_sp:
732	thawer.get (op->stats.sp);
733	break;
734	case KW_maxsp:
735	thawer.get (op->stats.maxsp);
736	break;
737	case KW_grace:
738	thawer.get (op->stats.grace);
739	break;
740	case KW_maxgrace:
741	thawer.get (op->stats.maxgrace);
742	break;
743		656
744	case KW_exp:	657	case KW_hp: f.get (stats.hp); break;
745	thawer.get (op->stats.exp);	658	case KW_maxhp: f.get (stats.maxhp); break;
746	break;	659	case KW_sp: f.get (stats.sp); break;
747	case KW_perm_exp:	660	case KW_maxsp: f.get (stats.maxsp); break;
748	thawer.get (op->perm_exp);	661	case KW_grace: f.get (stats.grace); break;
749	break;	662	case KW_maxgrace: f.get (stats.maxgrace); break;
750	case KW_food:	663
751	thawer.get (op->stats.food);	664	case KW_exp: f.get (stats.exp); break;
752	break;	665	case KW_perm_exp: f.get (perm_exp); break;
753	case KW_dam:	666	case KW_food: f.get (stats.food); break;
754	thawer.get (op->stats.dam);	667	case KW_dam: f.get (stats.dam); break;
755	break;	668	case KW_wc: f.get (stats.wc); break;
756	case KW_wc:	669	case KW_ac: f.get (stats.ac); break;
757	thawer.get (op->stats.wc);	670	case KW_nrof: f.get (nrof); break;
758	break;	671	case KW_level: f.get (level); break;
759	case KW_ac:	672	case KW_direction: f.get (direction); break;
760	thawer.get (op->stats.ac);	673	case KW_type: f.get (type); break;
761	break;	674	case KW_subtype: f.get (subtype); break;
762	case KW_nrof:	675	case KW_value: f.get (value); break;
763	thawer.get (op->nrof);	676	case KW_weight: f.get (weight); break;
764	break;	677	case KW_carrying: f.get (carrying); break;
765	case KW_level:	678	case KW_attacktype: f.get (attacktype); break;
766	thawer.get (op->level);	679	case KW_path_attuned: f.get (path_attuned); break;
767	break;	680	case KW_path_repelled: f.get (path_repelled); break;
768	case KW_direction:	681	case KW_path_denied: f.get (path_denied); break;
769	thawer.get (op->direction);	682	case KW_invisible: f.get (invisible); break;
770	break;	683	case KW_magic: f.get (magic); break;
771	case KW_type:	684	case KW_state: f.get (state); break;
772	thawer.get (op->type);	685	case KW_move_slow_penalty: f.get (move_slow_penalty); break;
773	break;	686	case KW_material: f.get (materials); break; //TODO: nuke
774	case KW_subtype:	687	case KW_materialname: f.get (materialname); break;
775	thawer.get (op->subtype);
776	break;
777	case KW_value:
778	thawer.get (op->value);
779	break;
780	case KW_weight:
781	thawer.get (op->weight);
782	break;
783	case KW_carrying:
784	thawer.get (op->carrying);
785	break;
786	case KW_attacktype:
787	thawer.get (op->attacktype);
788	break;
789	case KW_path_attuned:
790	thawer.get (op->path_attuned);
791	break;
792	case KW_path_repelled:
793	thawer.get (op->path_repelled);
794	break;
795	case KW_path_denied:
796	thawer.get (op->path_denied);
797	break;
798	case KW_invisible:
799	thawer.get (op->invisible);
800	break;
801	case KW_magic:
802	thawer.get (op->magic);
803	break;
804	case KW_state:
805	thawer.get (op->state);
806	break;
807	case KW_move_slow_penalty:
808	thawer.get (op->move_slow_penalty);
809	break;
810	case KW_material:
811	thawer.get (op->material);
812	break;
813	case KW_materialname:
814	thawer.get (op->materialname);
815	break;
816		688
817	/* These are the new values */	689	/* These are the new values */
818	case KW_move_block:	690	case KW_move_block: set_move (move_block, f.get_str ()); break;
819	set_move (op->move_block, thawer.get_str ());	691	case KW_move_allow: set_move (move_allow, f.get_str ()); break;
820	break;	692	case KW_move_type: set_move (move_type, f.get_str ()); break;
821	case KW_move_allow:	693	case KW_move_on: set_move (move_on, f.get_str ()); break;
822	set_move (op->move_allow, thawer.get_str ());	694	case KW_move_off: set_move (move_off, f.get_str ()); break;
823	break;	695	case KW_move_slow: set_move (move_slow, f.get_str ()); break;
824	case KW_move_type:
825	set_move (op->move_type, thawer.get_str ());
826	break;
827	case KW_move_on:
828	set_move (op->move_on, thawer.get_str ());
829	break;
830	case KW_move_off:
831	set_move (op->move_off, thawer.get_str ());
832	break;
833	case KW_move_slow:
834	set_move (op->move_slow, thawer.get_str ());
835	break;
836		696
837	/* These are all legacy - any new objects should use the move_ .. values */	697	/* These are all legacy - any new objects should use the move_ .. values */
838	case KW_no_pass:	698	case KW_no_pass:
839	{	699	{
840	if (thawer.get_sint32 ())	700	if (f.get_sint32 ())
841	op->move_block = MOVE_ALL;	701	move_block = MOVE_ALL;
842	else	702	else
843	op->move_block = 0;	703	move_block = 0;
844	}	704	}
845		705
846	break;	706	break;
847		707
848	/* These are all legacy - any new objects should use the move_ .. values */	708	/* These are all legacy - any new objects should use the move_ .. values */
849	case KW_walk_on:	709	case KW_walk_on:
850	{	710	{
851	if (thawer.get_sint32 ())	711	if (f.get_sint32 ())
852	op->move_on |= MOVE_WALK;	712	move_on |= MOVE_WALK;
853	else	713	else
854	op->move_on &= ~MOVE_WALK;	714	move_on &= ~MOVE_WALK;
855	}	715	}
856		716
857	break;	717	break;
858		718
859	/* These are all legacy - any new objects should use the move_ .. values */	719	/* These are all legacy - any new objects should use the move_ .. values */
860	case KW_walk_off:	720	case KW_walk_off:
861	{	721	{
862	if (thawer.get_sint32 ())	722	if (f.get_sint32 ())
863	op->move_off |= MOVE_WALK;	723	move_off |= MOVE_WALK;
864	else	724	else
865	op->move_off &= ~MOVE_WALK;	725	move_off &= ~MOVE_WALK;
866	}	726	}
867	break;	727	break;
868		728
869	/* 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 */
870	case KW_fly_on:	730	case KW_fly_on:
871	{	731	{
872	if (thawer.get_sint32 ())	732	if (f.get_sint32 ())
873	op->move_on |= MOVE_FLY_LOW;	733	move_on |= MOVE_FLY_LOW;
874	else	734	else
875	op->move_on &= ~MOVE_FLY_LOW;	735	move_on &= ~MOVE_FLY_LOW;
876	}	736	}
877	break;	737	break;
878		738
879	/* These are all legacy - any new objects should use the move_ .. values */	739	/* These are all legacy - any new objects should use the move_ .. values */
880	case KW_fly_off:	740	case KW_fly_off:
881	{	741	{
882	if (thawer.get_sint32 ())	742	if (f.get_sint32 ())
883	op->move_off |= MOVE_FLY_LOW;	743	move_off |= MOVE_FLY_LOW;
884	else	744	else
885	op->move_off &= ~MOVE_FLY_LOW;	745	move_off &= ~MOVE_FLY_LOW;
886	}	746	}
887	break;	747	break;
888		748
889	//TODO: remove these after converting archetypes	749	//TODO: remove these after converting archetypes
890	case KW_can_use_wand:	750	case KW_can_use_wand:
891	GET_FLAG (op, FLAG_USE_RANGE);	751	GET_FLAG (this, FLAG_USE_RANGE);
892	break;	752	break;
893		753
894	/* These are all legacy - any new objects should use the move_ .. values */	754	/* These are all legacy - any new objects should use the move_ .. values */
895	case KW_flying:	755	case KW_flying:
896	{	756	{
897	if (thawer.get_sint32 ())	757	if (f.get_sint32 ())
898	op->move_type |= MOVE_FLY_LOW;	758	move_type |= MOVE_FLY_LOW;
899	else	759	else
900	op->move_type &= ~MOVE_FLY_LOW;	760	move_type &= ~MOVE_FLY_LOW;
901	}	761	}
902	break;	762	break;
903		763
904		764
905	case KW_identified:	765	case KW_identified:
906	GET_FLAG (op, FLAG_IDENTIFIED);	766	GET_FLAG (this, FLAG_IDENTIFIED);
907	//TODO: move to check_object or so	767	//TODO: move to check_object or so
908	if (QUERY_FLAG (op, FLAG_IDENTIFIED))	768	if (QUERY_FLAG (this, FLAG_IDENTIFIED))
909	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);	769	CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
910		770
911	break;	771	break;
912		772
913	case KW_wiz:	773	case KW_friendly:
914	GET_FLAG (op, FLAG_WIZ);	774	if (f.get_sint32 ())
915	//TODO: move to check_object	775	if (type != PLAYER)
916	if (QUERY_FLAG (op, FLAG_WIZ))	776	add_friendly_object (this);
		777
		778	break;
		779
		780	case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
		781	case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
		782	case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
		783	case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
		784	case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
		785	case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
		786	case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
		787	case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
		788	case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
		789	case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
		790	case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
		791	case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
		792	case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
		793	case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
		794	case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
		795	case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
		796	case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
		797	case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
		798	case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
		799	case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
		800	case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
		801	case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
		802	case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
		803	case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
		804	case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
		805	case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
		806	case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
		807	case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
		808	case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
		809	case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
		810	case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
		811	case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
		812	case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
		813	case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
		814	case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
		815	case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
		816	case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
		817	case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
		818	case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
		819	case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
		820	case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
		821	case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
		822	case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
		823	case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
		824	case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
		825	case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
		826	case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
		827	case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
		828	case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
		829	case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
		830	case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
		831	case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
		832	case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
		833	case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
		834	case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
		835	case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
		836	case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
		837	case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
		838	case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
		839	case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
		840	case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
		841	case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
		842	case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
		843	case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
		844	case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
		845	case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
		846	case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
		847	case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
		848	case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
		849	case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
		850	case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
		851	case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
		852	case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
		853	case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
		854	case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
		855	case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
		856	case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
		857	case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
		858	case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
		859	case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
		860	case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
		861	case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
		862	case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
		863	case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
		864	case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
		865	case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
		866	case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
		867
		868	case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
		869	case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
		870	case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
		871	case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
		872	case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
		873	case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
		874	case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
		875	case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
		876	case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
		877	case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
		878	case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
		879	case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
		880	case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
		881	case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
		882	case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
		883	case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
		884	case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
		885	case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
		886	case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
		887	case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
		888	case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
		889	case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
		890	case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
		891	case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
		892	case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
		893	case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
		894	case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
		895
		896	case KW_luck: f.get (stats.luck); break;
		897	case KW_run_away: f.get (run_away); break;
		898	case KW_pick_up: f.get (pick_up); break;
		899	case KW_item_power: f.get (item_power); break;
		900	case KW_gen_sp_armour: f.get (gen_sp_armour); break;
		901	case KW_anim_speed: f.get (anim_speed); break;
		902	case KW_container: f.get (weight_limit); break;
		903	case KW_will_apply: f.get (will_apply); break;
		904	case KW_attack_movement: f.get (attack_movement); break;
		905	case KW_move_state: f.get (move_status); break;
		906	case KW_expmul: f.get (expmul); break;
		907	case KW_glow_radius: f.get (glow_radius); break;
		908	case KW_weapontype: f.get (weapontype); break;
		909	case KW_tooltype: f.get (tooltype); break;
		910	case KW_casting_time: f.get (casting_time); break;
		911	case KW_elevation: f.get (elevation); break;
		912	case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
		913	case KW_client_type: f.get (client_type); break;
		914	case KW_duration: f.get (duration); break;
		915	case KW_range: f.get (range); break;
		916	case KW_range_modifier: f.get (range_modifier); break;
		917	case KW_dam_modifier: f.get (dam_modifier); break;
		918	case KW_duration_modifier: f.get (duration_modifier); break;
		919
		920	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
		921	//TODO: parse from other include files
		922	case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
		923	case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
		924	case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
		925	case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
		926	case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
		927	case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
		928	case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
		929	case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
		930	case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
		931	case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
		932	case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
		933	case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
		934	case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
		935	case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
		936	case KW_can_apply:
		937	break;
		938
		939	case KW_connected:
		940	add_button_link (this, map, f.get_sint32 ());
		941	break;
		942
		943	case KW_randomitems:
		944	if (f.get_str ())
917	{	945	{
918	SET_FLAG (op, FLAG_WAS_WIZ);	946	randomitems =
919	SET_FLAG (op, FLAG_WIZPASS);	947	loading_arch
920	SET_FLAG (op, FLAG_WIZCAST);	948	? treasurelist::get (f.get_str ())
		949	: treasurelist::find (f.get_str ());
		950
		951	if (!randomitems)
		952	LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
921	}	953	}
922	else	954	else
		955	randomitems = 0;
		956	break;
		957
		958	case KW_msg:
		959	f.get_ml (KW_endmsg, msg);
		960	//TODO: allow longer messages
		961	if (strlen (msg) >= HUGE_BUF)
923	{	962	{
924	CLEAR_FLAG (op, FLAG_WIZPASS);	963	LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
925	CLEAR_FLAG (op, FLAG_WIZCAST);	964	msg = "ERROR, please report: string too long, winged.\n";
926	}	965	}
927	break;	966	break;
928		967
929	case KW_friendly:
930	GET_FLAG (op, FLAG_FRIENDLY);
931	//TODO: move to check_object or so
932	if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
933	add_friendly_object (op);
934	break;
935
936	case KW_monster:
937	GET_FLAG (op, FLAG_MONSTER);
938	break;
939	case KW_neutral:
940	GET_FLAG (op, FLAG_NEUTRAL);
941	break;
942	case KW_no_attack:
943	GET_FLAG (op, FLAG_NO_ATTACK);
944	break;
945	case KW_no_damage:
946	GET_FLAG (op, FLAG_NO_DAMAGE);
947	break;
948	case KW_generator:
949	GET_FLAG (op, FLAG_GENERATOR);
950	break;
951	case KW_use_content_on_gen:
952	GET_FLAG (op, FLAG_CONTENT_ON_GEN);
953	break;
954	case KW_is_thrown:
955	GET_FLAG (op, FLAG_IS_THROWN);
956	break;
957	case KW_auto_apply:
958	GET_FLAG (op, FLAG_AUTO_APPLY);
959	break;
960	case KW_treasure:
961	GET_FLAG (op, FLAG_TREASURE);
962	break;
963	case KW_see_invisible:
964	GET_FLAG (op, FLAG_SEE_INVISIBLE);
965	break;
966	case KW_can_roll:
967	GET_FLAG (op, FLAG_CAN_ROLL);
968	break;
969	case KW_overlay_floor:
970	GET_FLAG (op, FLAG_OVERLAY_FLOOR);
971	break;
972	case KW_is_turnable:
973	GET_FLAG (op, FLAG_IS_TURNABLE);
974	break;
975	case KW_is_used_up:
976	GET_FLAG (op, FLAG_IS_USED_UP);
977	break;
978	case KW_alive:
979	GET_FLAG (op, FLAG_ALIVE);
980	break;
981	case KW_applied:
982	GET_FLAG (op, FLAG_APPLIED);
983	break;
984	case KW_unpaid:
985	GET_FLAG (op, FLAG_UNPAID);
986	break;
987	case KW_is_animated:
988	GET_FLAG (op, FLAG_ANIMATE);
989	break;
990	case KW_no_pick:
991	GET_FLAG (op, FLAG_NO_PICK);
992	break;
993	case KW_reflecting:
994	GET_FLAG (op, FLAG_REFLECTING);
995	break;
996	case KW_changing:
997	GET_FLAG (op, FLAG_CHANGING);
998	break;
999	case KW_splitting:
1000	GET_FLAG (op, FLAG_SPLITTING);
1001	break;
1002	case KW_hitback:
1003	GET_FLAG (op, FLAG_HITBACK);
1004	break;
1005	case KW_startequip:
1006	GET_FLAG (op, FLAG_STARTEQUIP);
1007	break;
1008	case KW_blocksview:
1009	GET_FLAG (op, FLAG_BLOCKSVIEW);
1010	break;
1011	case KW_undead:
1012	GET_FLAG (op, FLAG_UNDEAD);
1013	break;
1014	case KW_scared:
1015	GET_FLAG (op, FLAG_SCARED);
1016	break;
1017	case KW_unaggressive:
1018	GET_FLAG (op, FLAG_UNAGGRESSIVE);
1019	break;
1020	case KW_reflect_missile:
1021	GET_FLAG (op, FLAG_REFL_MISSILE);
1022	break;
1023	case KW_reflect_spell:
1024	GET_FLAG (op, FLAG_REFL_SPELL);
1025	break;
1026	case KW_no_magic:
1027	GET_FLAG (op, FLAG_NO_MAGIC);
1028	break;
1029	case KW_no_drop:
1030	GET_FLAG (op, FLAG_NO_DROP);
1031	break;
1032	case KW_random_movement:
1033	GET_FLAG (op, FLAG_RANDOM_MOVE);
1034	break;
1035	case KW_was_wiz:
1036	GET_FLAG (op, FLAG_WAS_WIZ);
1037	break;
1038	case KW_no_fix_player:
1039	GET_FLAG (op, FLAG_NO_FIX_PLAYER);
1040	break;
1041	case KW_is_lightable:
1042	GET_FLAG (op, FLAG_IS_LIGHTABLE);
1043	break;
1044	case KW_tear_down:
1045	GET_FLAG (op, FLAG_TEAR_DOWN);
1046	break;
1047	case KW_can_use_shield:
1048	GET_FLAG (op, FLAG_USE_SHIELD);
1049	break;
1050	case KW_can_cast_spell:
1051	GET_FLAG (op, FLAG_CAST_SPELL);
1052	break;
1053	case KW_can_use_scroll:
1054	GET_FLAG (op, FLAG_USE_SCROLL);
1055	break;
1056	case KW_can_use_range:
1057	GET_FLAG (op, FLAG_USE_RANGE);
1058	break;
1059	case KW_can_use_bow:
1060	GET_FLAG (op, FLAG_USE_BOW);
1061	break;
1062	case KW_can_use_armour:
1063	GET_FLAG (op, FLAG_USE_ARMOUR);
1064	break;
1065	case KW_can_use_weapon:
1066	GET_FLAG (op, FLAG_USE_WEAPON);
1067	break;
1068	case KW_can_use_ring:
1069	GET_FLAG (op, FLAG_USE_RING);
1070	break;
1071	case KW_has_ready_bow:
1072	GET_FLAG (op, FLAG_READY_BOW);
1073	break;
1074	case KW_xrays:
1075	GET_FLAG (op, FLAG_XRAYS);
1076	break;
1077	case KW_is_floor:
1078	GET_FLAG (op, FLAG_IS_FLOOR);
1079	break;
1080	case KW_lifesave:
1081	GET_FLAG (op, FLAG_LIFESAVE);
1082	break;
1083	case KW_no_strength:
1084	GET_FLAG (op, FLAG_NO_STRENGTH);
1085	break;
1086	case KW_sleep:
1087	GET_FLAG (op, FLAG_SLEEP);
1088	break;
1089	case KW_stand_still:
1090	GET_FLAG (op, FLAG_STAND_STILL);
1091	break;
1092	case KW_random_move:
1093	GET_FLAG (op, FLAG_RANDOM_MOVE);
1094	break;
1095	case KW_only_attack:
1096	GET_FLAG (op, FLAG_ONLY_ATTACK);
1097	break;
1098	case KW_activate_on_push:
1099	GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH);
1100	break;
1101	case KW_activate_on_release:
1102	GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE);
1103	break;
1104	case KW_confused:
1105	GET_FLAG (op, FLAG_CONFUSED);
1106	break;
1107	case KW_stealth:
1108	GET_FLAG (op, FLAG_STEALTH);
1109	break;
1110	case KW_cursed:
1111	GET_FLAG (op, FLAG_CURSED);
1112	break;
1113	case KW_damned:
1114	GET_FLAG (op, FLAG_DAMNED);
1115	break;
1116	case KW_see_anywhere:
1117	GET_FLAG (op, FLAG_SEE_ANYWHERE);
1118	break;
1119	case KW_known_magical:
1120	GET_FLAG (op, FLAG_KNOWN_MAGICAL);
1121	break;
1122	case KW_known_cursed:
1123	GET_FLAG (op, FLAG_KNOWN_CURSED);
1124	break;
1125	case KW_can_use_skill:
1126	GET_FLAG (op, FLAG_CAN_USE_SKILL);
1127	break;
1128	case KW_been_applied:
1129	GET_FLAG (op, FLAG_BEEN_APPLIED);
1130	break;
1131	case KW_has_ready_scroll:
1132	GET_FLAG (op, FLAG_READY_SCROLL);
1133	break;
1134	case KW_can_use_rod:
1135	GET_FLAG (op, FLAG_USE_ROD);
1136	break;
1137	case KW_can_use_horn:
1138	GET_FLAG (op, FLAG_USE_HORN);
1139	break;
1140	case KW_unique:
1141	GET_FLAG (op, FLAG_UNIQUE);
1142	break;
1143	case KW_make_invisible:
1144	GET_FLAG (op, FLAG_MAKE_INVIS);
1145	break;
1146	case KW_inv_locked:
1147	GET_FLAG (op, FLAG_INV_LOCKED);
1148	break;
1149	case KW_is_wooded:
1150	GET_FLAG (op, FLAG_IS_WOODED);
1151	break;
1152	case KW_is_hilly:
1153	GET_FLAG (op, FLAG_IS_HILLY);
1154	break;
1155	case KW_is_water:
1156	GET_FLAG (op, FLAG_IS_WATER);
1157	break;
1158	case KW_has_ready_skill:
1159	GET_FLAG (op, FLAG_READY_SKILL);
1160	break;
1161	case KW_has_ready_weapon:
1162	GET_FLAG (op, FLAG_READY_WEAPON);
1163	break;
1164	case KW_no_skill_ident:
1165	GET_FLAG (op, FLAG_NO_SKILL_IDENT);
1166	break;
1167	case KW_is_blind:
1168	GET_FLAG (op, FLAG_BLIND);
1169	break;
1170	case KW_can_see_in_dark:
1171	GET_FLAG (op, FLAG_SEE_IN_DARK);
1172	break;
1173	case KW_is_cauldron:
1174	GET_FLAG (op, FLAG_IS_CAULDRON);
1175	break;
1176	case KW_no_steal:
1177	GET_FLAG (op, FLAG_NO_STEAL);
1178	break;
1179	case KW_one_hit:
1180	GET_FLAG (op, FLAG_ONE_HIT);
1181	break;
1182	case KW_berserk:
1183	GET_FLAG (op, FLAG_BERSERK);
1184	break;
1185	case KW_is_buildable:
1186	GET_FLAG (op, FLAG_IS_BUILDABLE);
1187	break;
1188
1189	case KW_armour:
1190	thawer.get (op->resist[ATNR_PHYSICAL]);
1191	break;
1192	case KW_resist_physical:
1193	thawer.get (op->resist[ATNR_PHYSICAL]);
1194	break;
1195	case KW_resist_magic:
1196	thawer.get (op->resist[ATNR_MAGIC]);
1197	break;
1198	case KW_resist_fire:
1199	thawer.get (op->resist[ATNR_FIRE]);
1200	break;
1201	case KW_resist_electricity:
1202	thawer.get (op->resist[ATNR_ELECTRICITY]);
1203	break;
1204	case KW_resist_cold:
1205	thawer.get (op->resist[ATNR_COLD]);
1206	break;
1207	case KW_resist_confusion:
1208	thawer.get (op->resist[ATNR_CONFUSION]);
1209	break;
1210	case KW_resist_acid:
1211	thawer.get (op->resist[ATNR_ACID]);
1212	break;
1213	case KW_resist_drain:
1214	thawer.get (op->resist[ATNR_DRAIN]);
1215	break;
1216	case KW_resist_weaponmagic:
1217	thawer.get (op->resist[ATNR_WEAPONMAGIC]);
1218	break;
1219	case KW_resist_ghosthit:
1220	thawer.get (op->resist[ATNR_GHOSTHIT]);
1221	break;
1222	case KW_resist_poison:
1223	thawer.get (op->resist[ATNR_POISON]);
1224	break;
1225	case KW_resist_slow:
1226	thawer.get (op->resist[ATNR_SLOW]);
1227	break;
1228	case KW_resist_paralyze:
1229	thawer.get (op->resist[ATNR_PARALYZE]);
1230	break;
1231	case KW_resist_turn_undead:
1232	thawer.get (op->resist[ATNR_TURN_UNDEAD]);
1233	break;
1234	case KW_resist_fear:
1235	thawer.get (op->resist[ATNR_FEAR]);
1236	break;
1237	case KW_resist_cancellation:
1238	thawer.get (op->resist[ATNR_CANCELLATION]);
1239	break;
1240	case KW_resist_deplete:
1241	thawer.get (op->resist[ATNR_DEPLETE]);
1242	break;
1243	case KW_resist_death:
1244	thawer.get (op->resist[ATNR_DEATH]);
1245	break;
1246	case KW_resist_chaos:
1247	thawer.get (op->resist[ATNR_CHAOS]);
1248	break;
1249	case KW_resist_counterspell:
1250	thawer.get (op->resist[ATNR_COUNTERSPELL]);
1251	break;
1252	case KW_resist_godpower:
1253	thawer.get (op->resist[ATNR_GODPOWER]);
1254	break;
1255	case KW_resist_holyword:
1256	thawer.get (op->resist[ATNR_HOLYWORD]);
1257	break;
1258	case KW_resist_blind:
1259	thawer.get (op->resist[ATNR_BLIND]);
1260	break;
1261	case KW_resist_internal:
1262	thawer.get (op->resist[ATNR_INTERNAL]);
1263	break;
1264	case KW_resist_life_stealing:
1265	thawer.get (op->resist[ATNR_LIFE_STEALING]);
1266	break;
1267	case KW_resist_disease:
1268	thawer.get (op->resist[ATNR_DISEASE]);
1269	break;
1270
1271	case KW_luck:
1272	thawer.get (op->stats.luck);
1273	break;
1274	case KW_run_away:
1275	thawer.get (op->run_away);
1276	break;
1277	case KW_pick_up:
1278	thawer.get (op->pick_up);
1279	break;
1280	case KW_item_power:
1281	thawer.get (op->item_power);
1282	break;
1283	case KW_gen_sp_armour:
1284	thawer.get (op->gen_sp_armour);
1285	break;
1286	case KW_anim_speed:
1287	thawer.get (op->anim_speed);
1288	break;
1289	case KW_container:
1290	thawer.get (op->weight_limit);
1291	break;
1292	case KW_will_apply:
1293	thawer.get (op->will_apply);
1294	break;
1295	case KW_attack_movement:
1296	thawer.get (op->attack_movement);
1297	break;
1298	case KW_move_state:
1299	thawer.get (op->move_status);
1300	break;
1301	case KW_expmul:
1302	thawer.get (op->expmul);
1303	break;
1304	case KW_glow_radius:
1305	thawer.get (op->glow_radius);
1306	break;
1307	case KW_weapontype:
1308	thawer.get (op->weapontype);
1309	break;
1310	case KW_tooltype:
1311	thawer.get (op->tooltype);
1312	break;
1313	case KW_casting_time:
1314	thawer.get (op->casting_time);
1315	break;
1316	case KW_elevation:
1317	thawer.get (op->elevation);
1318	break;
1319	case KW_smoothlevel:
1320	thawer.get (op->smoothlevel);
1321	break;
1322	case KW_client_type:
1323	thawer.get (op->client_type);
1324	break;
1325	case KW_duration:
1326	thawer.get (op->duration);
1327	break;
1328	case KW_range:
1329	thawer.get (op->range);
1330	break;
1331	case KW_range_modifier:
1332	thawer.get (op->range_modifier);
1333	break;
1334	case KW_dam_modifier:
1335	thawer.get (op->dam_modifier);
1336	break;
1337	case KW_duration_modifier:
1338	thawer.get (op->duration_modifier);
1339	break;
1340
1341	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1342	//TODO: parse from other include files
1343	case KW_body_range:
1344	thawer.get (op->body_info[0]);
1345	break;
1346	case KW_body_arm:
1347	thawer.get (op->body_info[1]);
1348	break;
1349	case KW_body_torso:
1350	thawer.get (op->body_info[2]);
1351	break;
1352	case KW_body_head:
1353	thawer.get (op->body_info[3]);
1354	break;
1355	case KW_body_neck:
1356	thawer.get (op->body_info[4]);
1357	break;
1358	case KW_body_skill:
1359	thawer.get (op->body_info[5]);
1360	break;
1361	case KW_body_finger:
1362	thawer.get (op->body_info[6]);
1363	break;
1364	case KW_body_shoulder:
1365	thawer.get (op->body_info[7]);
1366	break;
1367	case KW_body_foot:
1368	thawer.get (op->body_info[8]);
1369	break;
1370	case KW_body_hand:
1371	thawer.get (op->body_info[9]);
1372	break;
1373	case KW_body_wrist:
1374	thawer.get (op->body_info[10]);
1375	break;
1376	case KW_body_waist:
1377	thawer.get (op->body_info[11]);
1378	break;
1379	case KW_can_apply:
1380	break;
1381
1382	case KW_connected:
1383	add_button_link (op, op->map, thawer.get_sint32 ());
1384	break;
1385
1386	case KW_randomitems:
1387	op->randomitems = find_treasurelist (thawer.get_str ());
1388	break;
1389
1390	case KW_msg:
1391	{
1392	thawer.get_ml (KW_endmsg, op->msg);
1393	//TODO: allow longer messages
1394	if (strlen (op->msg) >= HUGE_BUF)
1395	{
1396	LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
1397	op->msg = "ERROR, please report: string too long, winged.\n";
1398	}
1399	}
1400	break;
1401
1402	case KW_lore:	968	case KW_lore:
1403	{
1404	shstr msgbuf;
1405
1406	thawer.get_ml (KW_endlore, op->lore);	969	f.get_ml (KW_endlore, lore);
1407	//TODO: allow longer messages	970	//TODO: allow longer messages
1408	/* Just print a warning so we can be reasonably safe	971	/* Just print a warning so we can be reasonably safe
1409	* about not overflowing the buffer.	972	* about not overflowing the buffer.
1410	*/	973	*/
1411	if (strlen (op->lore) > (HUGE_BUF / 2))	974	if (strlen (lore) > (HUGE_BUF / 2))
1412	LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",	975	LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1413	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);	976	HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
1414	}
1415	break;	977	break;
1416		978
1417	case KW_editable:	979	case KW_editable:
1418	case KW_editor_folder:	980	case KW_editor_folder:
1419	break;	981	break;
1420		982
1421	case KW_More: // uppercase alias
1422	case KW_more:
1423	/* We need to record that this is a multipart object,
1424	* so the calling function can glue things back together
1425	*/
1426	ismore = 1;
1427	break;
1428
1429	case KW_end:	983	case KW_end:
1430	check_loaded_object (op);
1431
1432	if (!arch_init)	984	if (!loading_arch)
1433	op->instantiate ();	985	instantiate ();
1434		986
1435	return ismore ? LL_MORE : LL_NORMAL;	987	f.next ();
1436
1437	case KW_EOF:
1438	return LL_EOF;	988	return true;
1439		989
1440	case KW_ERROR:	990	case KW_ERROR:
1441	set_ob_key_value (op, thawer.line, thawer.last_value, true);	991	set_ob_key_value (this, f.kw_str, f.value, true);
1442	//printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D	992	//fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1443
1444	//TODO: skip line, ugly, factor parsing better
1445	if (thawer.last_value)
1446	thawer.line = thawer.last_value;
1447
1448	thawer.line += strlen (thawer.line) + 1;
1449
1450	break;	993	break;
1451		994
1452	default:	995	default:
1453	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);	996	if (!f.parse_error ("object", name))
		997	return false;
1454	break;	998	break;
1455	}	999	}
		1000
		1001	f.next ();
1456	}	1002	}
1457	}	1003	}
1458		1004
1459	/*	1005	object *
1460	* Loads an object from the given file-pointer.	1006	object::read (object_thawer &f, maptile *map)
1461	* Variables will be read and parsed and patched into the object
1462	* until the string "end" is reached, or the end of the file.
1463	*
1464	* bufstat is used to determine various file attributes:
1465	* LO_REPATE (0): We are reading from the same buffer as the last call.
1466	* LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1467	* will also be reading from this (treasure file, artifacts.)
1468	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1469	* be reset.
1470	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1471	*
1472	*/
1473
1474	int
1475	load_object (object_thawer & fp, object *op, int map_flags)
1476	{	1007	{
1477	return parse_object (op, fp, map_flags);	1008	assert (f.kw == KW_arch);
		1009
		1010	archetype *arch = archetype::find (f.get_str ());
		1011
		1012	if (!arch)
		1013	{
		1014	LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
		1015	arch = archetype::find ("earthwall");
		1016	}
		1017
		1018	assert (arch); //D maybe use exception handling of sorts?
		1019
		1020	f.next ();
		1021
		1022	object *op = object::create ();
		1023
		1024	op->map = map;
		1025	arch->clone.copy_to (op);
		1026	// copy_to activates, this should be fixed properly
		1027	op->deactivate ();
		1028
		1029	if (!op->parse_kv (f))
		1030	{
		1031	op->destroy (true);
		1032	return 0;
		1033	}
		1034
		1035	op->post_load_check ();
		1036	return op;
1478	}	1037	}
1479
1480		1038
1481	/* This takes a buffer, scans it for variables, and sets those variables	1039	/* This takes a buffer, scans it for variables, and sets those variables
1482	* as appropriate in op.	1040	* as appropriate in op.
1483	*	1041	*
1484	* This function appears to be used in only 2 places - in crossedit to	1042	* This function appears to be used in only 2 places - in crossedit to
1485	* override values and in c_wiz to mutate values.	1043	* override values and in c_wiz to mutate values.
1486	*/	1044	*/
1487	int	1045	int
1488	set_variable (object *op, char *buf)	1046	set_variable (object *op, char *buf)
1489	{	1047	{
1490	return 0;	1048	object_thawer f (buf, (AV *)0);
1491	#if 0
1492	int retval;
1493	object_thawer thawer (0);
1494		1049
1495	strcpy (msgbuf, "");	1050	f.next ();
1496	strcpy (lorebuf, "");	1051	return op->parse_kv (f);
1497	retval = parse_object (op, thawer, 0);
1498	yy_switch_to_buffer (yycurbuf);
1499	yy_delete_buffer (yybufstate);
1500	yy_pop_state ();
1501	return retval;
1502	#endif
1503	}
1504
1505	/* This array equates the FLAG_ values with the V_ values. Use -1 to
1506	* put gaps in the array that should not be processed.
1507	* The order matches the order of the define values in 'define.h'.
1508	*/
1509
1510	/* This is a list of pointers that correspond to the FLAG_.. values.
1511	* This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1512	* the 15'th element of this array should match that name.
1513	* If an entry is NULL, that is a flag not to loaded/saved.
1514	*/
1515	static const char *const flag_names[NUM_FLAGS + 1] = {
1516	"alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",
1517	"can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */
1518	"is_animated", NULL /* slow_move */ ,
1519	NULL /* flying */ , "monster", "friendly", "generator",
1520	"is_thrown", "auto_apply", "treasure", "player sold", /* 20 */
1521	"see_invisible", "can_roll", "overlay_floor",
1522	"is_turnable", NULL /* walk_off */ , NULL /* fly_on */ ,
1523	NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */
1524	"changing", "splitting", "hitback", "startequip",
1525	"blocksview", "undead", "scared", "unaggressive",
1526	"reflect_missile", "reflect_spell", /* 40 */
1527	"no_magic", "no_fix_player", "is_lightable", "tear_down",
1528	"run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ ,
1529	"pick_up", "unique", "no_drop", /* 50 */
1530	NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range",
1531	"can_use_bow", "can_use_armour", "can_use_weapon",
1532	"can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */
1533	"xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep",
1534	"stand_still", "random_move", "only_attack", "confused", /* 70 */
1535	"stealth", NULL, NULL, "cursed", "damned",
1536	"see_anywhere", "known_magical", "known_cursed",
1537	"can_use_skill", "been_applied", /* 80 */
1538	"has_ready_scroll", "can_use_rod", NULL,
1539	"can_use_horn", "make_invisible", "inv_locked", "is_wooded",
1540	"is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */
1541	"no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",
1542	"is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */
1543	"no_attack", "no_damage", NULL, NULL, "activate_on_push",
1544	"activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */
1545	NULL
1546	};
1547
1548
1549	/*
1550	* Initialises the array of variable-names. Needed before any
1551	* objects can be loaded. Called by init_library().
1552	*/
1553
1554	void
1555	init_vars ()
1556	{
1557	}	1052	}
1558		1053
1559	/* This returns a string of the integer movement type */	1054	/* This returns a string of the integer movement type */
1560	#if 0	1055	#if 0
1561	// unused function	1056	// unused function
…		…
1606	return retbuf + 1;	1101	return retbuf + 1;
1607	}	1102	}
1608	#endif	1103	#endif
1609		1104
1610	// compare *op against *tmp and output differences	1105	// compare *op against *tmp and output differences
1611	void	1106	static void
1612	put (object_freezer &f, object *op, object *tmp)	1107	write_diff (object_freezer &f, object *op, object *tmp)
1613	{	1108	{
		1109	static const keyword resist_save[NROFATTACKS] = {
		1110	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
		1111	# include "attackinc.h"
		1112	# undef def
		1113	};
		1114
		1115	/* This is a list of keywords that correspond to the FLAG_.. values.
		1116	* This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
		1117	* the 15'th element of this array should match that name.
		1118	* If an entry is NULL, that is a flag not to loaded/saved.
		1119	*/
		1120	static const keyword flag_names [NUM_FLAGS] = {
		1121	KW_alive,
		1122	KW_NULL,
		1123	KW_NULL,
		1124	KW_NULL,
		1125	KW_NULL,
		1126	KW_applied,
		1127	KW_unpaid,
		1128	KW_can_use_shield,
		1129	KW_no_pick,
		1130	KW_NULL, // walk_on
		1131	KW_NULL, // no_pass
		1132	/* 10 */
		1133	KW_is_animated,
		1134	KW_NULL, // slow_move
		1135	KW_NULL, // flying
		1136	KW_monster,
		1137	KW_friendly,
		1138	KW_generator,
		1139	KW_is_thrown,
		1140	KW_auto_apply,
		1141	KW_treasure_env,
		1142	KW_player_sold,
		1143	/* 20 */
		1144	KW_see_invisible,
		1145	KW_can_roll,
		1146	KW_overlay_floor,
		1147	KW_is_turnable,
		1148	KW_NULL, // walk_off
		1149	KW_NULL, // fly_on
		1150	KW_NULL, // fly_off
		1151	KW_is_used_up,
		1152	KW_identified,
		1153	KW_reflecting,
		1154	/* 30 */
		1155	KW_changing,
		1156	KW_splitting,
		1157	KW_hitback,
		1158	KW_startequip,
		1159	KW_blocksview,
		1160	KW_undead,
		1161	KW_scared,
		1162	KW_unaggressive,
		1163	KW_reflect_missile,
		1164	KW_reflect_spell,
		1165	/* 40 */
		1166	KW_no_magic,
		1167	KW_no_fix_player,
		1168	KW_is_lightable,
		1169	KW_tear_down,
		1170	KW_run_away,
		1171	KW_NULL, // pass_thru
		1172	KW_NULL, // an_pass_thru
		1173	KW_pick_up,
		1174	KW_unique,
		1175	KW_no_drop,
		1176	/* 50 */
		1177	KW_NULL, // wizcast
		1178	KW_can_cast_spell,
		1179	KW_can_use_scroll,
		1180	KW_can_use_range,
		1181	KW_can_use_bow,
		1182	KW_can_use_armour,
		1183	KW_can_use_weapon,
		1184	KW_can_use_ring,
		1185	KW_has_ready_range,
		1186	KW_has_ready_bow,
		1187	/* 60 */
		1188	KW_xrays,
		1189	KW_NULL,
		1190	KW_is_floor,
		1191	KW_lifesave,
		1192	KW_no_strength,
		1193	KW_sleep,
		1194	KW_stand_still,
		1195	KW_random_move,
		1196	KW_only_attack,
		1197	KW_confused,
		1198	/* 70 */
		1199	KW_stealth,
		1200	KW_NULL,
		1201	KW_NULL,
		1202	KW_cursed,
		1203	KW_damned,
		1204	KW_see_anywhere,
		1205	KW_known_magical,
		1206	KW_known_cursed,
		1207	KW_can_use_skill,
		1208	KW_been_applied,
		1209	/* 80 */
		1210	KW_has_ready_scroll,
		1211	KW_can_use_rod,
		1212	KW_precious,
		1213	KW_can_use_horn,
		1214	KW_make_invisible,
		1215	KW_inv_locked,
		1216	KW_is_wooded,
		1217	KW_is_hilly,
		1218	KW_has_ready_skill,
		1219	KW_has_ready_weapon,
		1220	/* 90 */
		1221	KW_no_skill_ident,
		1222	KW_is_blind,
		1223	KW_can_see_in_dark,
		1224	KW_is_cauldron,
		1225	KW_NULL,
		1226	KW_no_steal,
		1227	KW_one_hit,
		1228	KW_NULL,
		1229	KW_berserk,
		1230	KW_neutral,
		1231	/* 100 */
		1232	KW_no_attack,
		1233	KW_no_damage,
		1234	KW_obj_original,
		1235	KW_NULL,
		1236	KW_activate_on_push,
		1237	KW_activate_on_release,
		1238	KW_is_water,
		1239	KW_use_content_on_gen,
		1240	KW_NULL,
		1241	KW_is_buildable,
		1242	/* 110 */
		1243	KW_destroy_on_death,
		1244	KW_NULL,
		1245	};
		1246
1614	int i;	1247	int i;
1615		1248
1616	/* This saves the key/value lists. We do it first so that any	1249	/* This saves the key/value lists. We do it first so that any
1617	* keys that match field names will be overwritten by the loader.	1250	* keys that match field names will be overwritten by the loader.
1618	*/	1251	*/
1619	for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next)	1252	for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1620	{	1253	{
1621	/* Find the field in the opposing member. */	1254	/* Find the field in the opposing member. */
1622	key_value *arch_field = get_ob_key_link (tmp, my_field->key);	1255	key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1623		1256
1624	/* If there's no partnering field, or it's got a different value, save our field. */	1257	/* If there's no partnering field, or it's got a different value, save our field. */
1625	if (arch_field == NULL || my_field->value != arch_field->value)	1258	if (!arch_field || my_field->value != arch_field->value)
1626	f.put (my_field->key, my_field->value);	1259	f.put (my_field->key, my_field->value);
1627	}	1260	}
1628		1261
1629	/* We don't need to worry about the arch's extra fields - they	1262	/* We don't need to worry about the arch's extra fields - they
1630	* will get taken care of the copy_object function.	1263	* will get taken care of the copy_to method.
1631	*/	1264	*/
1632		1265
1633	{	1266	{
1634	char uids[64];	1267	char uids[64];
1635	snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);	1268	snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
…		…
1650	f.put (KW_msg, KW_endmsg, op->msg);	1283	f.put (KW_msg, KW_endmsg, op->msg);
1651	if (op->lore != tmp->lore)	1284	if (op->lore != tmp->lore)
1652	f.put (KW_lore, KW_endlore, op->lore);	1285	f.put (KW_lore, KW_endlore, op->lore);
1653		1286
1654	CMP_OUT (other_arch);	1287	CMP_OUT (other_arch);
1655	CMP_OUT (face);
1656		1288
1657	if (!op->face || !op->face->name)	1289	if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1658	printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>"); //D
1659		1290
1660	if (op->animation_id != tmp->animation_id)	1291	if (op->animation_id != tmp->animation_id)
1661	if (op->animation_id)	1292	if (op->animation_id)
1662	{	1293	{
1663	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);	1294	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
…		…
1711	f.put (resist_save[i], op->resist[i]);	1342	f.put (resist_save[i], op->resist[i]);
1712		1343
1713	CMP_OUT (path_attuned);	1344	CMP_OUT (path_attuned);
1714	CMP_OUT (path_repelled);	1345	CMP_OUT (path_repelled);
1715	CMP_OUT (path_denied);	1346	CMP_OUT (path_denied);
1716	CMP_OUT (material);	1347	CMP_OUT2 (material, materials);//TODO: nuke
1717	CMP_OUT (materialname);	1348	CMP_OUT (materialname);
1718	CMP_OUT (value);	1349	CMP_OUT (value);
1719	CMP_OUT (carrying);	1350	CMP_OUT (carrying);
1720	CMP_OUT (weight);	1351	CMP_OUT (weight);
1721	CMP_OUT (invisible);	1352	CMP_OUT (invisible);
…		…
1755	CMP_OUT (move_on);	1386	CMP_OUT (move_on);
1756	CMP_OUT (move_off);	1387	CMP_OUT (move_off);
1757	CMP_OUT (move_slow);	1388	CMP_OUT (move_slow);
1758	CMP_OUT (move_slow_penalty);	1389	CMP_OUT (move_slow_penalty);
1759		1390
1760	if (!COMPARE_FLAGS (op, tmp))	1391	if (op->flag != tmp->flag)
1761	for (i = 0; i <= NUM_FLAGS; i++)	1392	for (i = 0; i <= NUM_FLAGS; i++)
1762	if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))	1393	if (flag_names [i] && op->flag [i] != tmp->flag [i])
1763	f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0");	1394	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1764		1395
1765	/* Save body locations */	1396	// save body locations
1766	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1397	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1767	if (op->body_info[i] != tmp->body_info[i])	1398	if (op->slot[i].info != tmp->slot[i].info)
1768	f.put (body_locations[i].save_name, op->body_info[i]);	1399	f.put (body_locations[i].save_name, op->slot[i].info);
1769	}	1400	}
1770		1401
1771	/*	1402	/*
1772	* Dumps all variables in an object to a file.	1403	* Dumps all variables in an object to a file.
1773	* If bit 0 of flag is set, unpaid objects will be saved. As of now,	1404	* If bit 0 of flag is set, unpaid objects will be saved. As of now,
1774	* the only place this is not set is when saving the player.	1405	* the only place this is not set is when saving the player.
1775	* If bit 1 of flag is set, don't remove the object after save. As of now,
1776	* all of the callers are setting this.
1777	*/	1406	*/
1778		1407	bool
1779	void	1408	object::write (object_freezer &f)
1780	save_object (object_freezer & fp, object *op, int flag)
1781	{	1409	{
1782	archetype *at;
1783	object *tmp, *old;
1784
1785	/* Even if the object does have an owner, it would seem that we should	1410	/* Even if the object does have an owner, it would seem that we should
1786	* still save it.	1411	* still save it.
1787	*/	1412	*/
1788	if (op->owner)	1413	if (owner)
1789	return;	1414	return true;
1790		1415
1791	/* If it is unpaid and we don't want to save those, just return. */	1416	archetype *at = arch ? (archetype *)arch : empty_archetype;
1792	if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))
1793	return;
1794		1417
1795	if ((at = op->arch) == NULL)
1796	at = empty_archetype;
1797
1798	fp.put (KW_arch, at->name);	1418	f.put (KW_arch, at->name);
		1419	write_diff (f, this, &at->clone);
1799		1420
1800	put (fp, op, &at->clone);
1801
1802	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1803
1804	old = NULL;
1805
1806	if (flag & 2)
1807	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1421	for (object *tmp = inv; tmp; tmp = tmp->below)
1808	save_object (fp, tmp, flag);	1422	tmp->write (f);
1809	else
1810	/* Slightly different logic because tmp/op will be removed by
1811	* the save_object we call. So we just keep looking at op->inv
1812	* until there is nothing left. In theory, the variable old
1813	* should not be needed, as recursive loops shouldn't happen.
1814	*/
1815	while ((tmp = op->inv) != NULL)
1816	{
1817	if (old == tmp)
1818	{
1819	LOG (llevError, " Recursive loop in inventory\n");
1820	break;
1821	}
1822		1423
1823	save_object (fp, tmp, flag);
1824	old = tmp;
1825	}
1826
1827	if (!(flag & 2))
1828	{
1829	remove_ob (op);
1830	free_object (op);
1831	}
1832
1833	fp.put (op);	1424	f.put (this);
1834	fprintf (fp, "end\n");	1425	f.put (KW_end);
		1426
		1427	return true;
1835	}	1428	}
1836		1429
		1430	/////////////////////////////////////////////////////////////////////////////
		1431
		1432	// generic resource file load,
		1433	// currently supports: region, treasures, archetypes
		1434	bool load_resource_file (const char *filename)
		1435	{
		1436	object_thawer f (filename);
		1437
		1438	bool success = false;
		1439	bool seen_arch = false;
		1440
		1441	f.next ();
		1442
		1443	for (;;)
		1444	{
		1445	switch (f.kw)
		1446	{
		1447	case KW_region:
		1448	if (!region::read (f))
		1449	goto finish;
		1450	break;
		1451
		1452	case KW_treasure:
		1453	case KW_treasureone:
		1454	if (!treasurelist::read (f))
		1455	goto finish;
		1456	break;
		1457
		1458	case KW_object:
		1459	seen_arch = true;
		1460	if (!archetype::read (f))
		1461	goto finish;
		1462	break;
		1463
		1464	case KW_EOF:
		1465	success = true;
		1466	goto finish;
		1467
		1468	default:
		1469	if (!f.parse_error ("resource file"))
		1470	goto finish;
		1471
		1472	f.next ();
		1473	break;
		1474	}
		1475	}
		1476
		1477	finish:
		1478	if (seen_arch)
		1479	init_archetype_pointers ();
		1480
		1481	return success;
		1482	}
		1483

Diff Legend

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