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

Diff Legend

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