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

Diff Legend

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