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.30 by root, Tue Dec 26 08:54:59 2006 UTC vs.
Revision 1.106 by root, Thu Apr 10 15:35:15 2008 UTC

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

Diff Legend

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