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.31 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.100 by root, Tue Sep 4 05:43:20 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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	* Crossfire TRT 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 at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <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 };
35		33
36	/* This table is only necessary to convert objects that existed before the	34	/* This table is only necessary to convert objects that existed before the
37	* spell object conversion to the new object. It was not practical	35	* spell object conversion to the new object. It was not practical
38	* to go through every mapping looking for every potion, rod, wand, etc	36	* 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	37	* that had a sp set and update to the new value. So this maps the
…		…
251	"spell_cause_rabies", /* 204 */	249	"spell_cause_rabies", /* 204 */
252	"spell_glyph", /* 205 */	250	"spell_glyph", /* 205 */
253	NULL	251	NULL
254	};	252	};
255		253
256	extern int arch_init;	254	extern bool loading_arch;
257		255
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	/* Fireall 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 = gen_uuid ();
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;
541		561
542	case KW_arch:	562	case KW_arch:
543	{	563	{
544	const char *str = thawer.get_str ();	564	object *tmp = object::read (f);
		565	tmp->deactivate ();
545		566
546	if (op->arch)
547	{	567	{
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);	568	// was: insert_ob_in_ob (tmp, op);
570	// but manually adding it can improve map loading times a lot	569	// but manually adding it can improve map loading times a lot
571	// also, appending instead of prepending keeps the	570	// also, appending instead of prepending keeps the
572	// save ordering the same between repeated load/saves.	571	// save ordering the same between repeated load/saves.
573	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);	572	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
574	CLEAR_FLAG (tmp, FLAG_REMOVED);	573	CLEAR_FLAG (tmp, FLAG_REMOVED);
575		574
576	if (!op_inv)	575	if (!op_inv)
577	{	576	{
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;	577	inv = tmp;
		578	tmp->above = 0;
593	}	579	}
594	else	580	else
595	{	581	{
596	LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");	582	while (op_inv->below)
597	tmp->destroy ();	583	op_inv = op_inv->below;
		584
		585	op_inv->below = tmp;
		586	tmp->above = op_inv;
598	}	587	}
		588
		589	tmp->below = 0;
		590	tmp->env = this;
		591	op_inv = tmp;
599	}	592	}
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	}	593	}
612	break;	594	continue;
613		595
614	case KW_other_arch:	596	case KW_other_arch:
		597	other_arch =
		598	loading_arch
		599	? archetype::get (f.get_str ())
615	op->other_arch = archetype::find (thawer.get_str ());	600	: archetype::find (f.get_str ());
		601
		602	if (!other_arch)
		603	LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
		604	break;
		605
		606	case KW_owner:
		607	f.delayed_deref (this, owner, f.get_str ());
616	break;	608	break;
617		609
618	case KW_animation:	610	case KW_animation:
619	{	611	{
		612	CLEAR_FLAG (this, FLAG_ANIMATE);
		613	animation_id = 0;
		614
620	const char *str = thawer.get_str ();	615	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);	616	if (str && (animation_id = find_animation (str)))
630	SET_FLAG (op, FLAG_ANIMATE);	617	SET_FLAG (this, FLAG_ANIMATE);
631	}
632	}	618	}
633
634	break;	619	break;
635		620
636	case KW_last_heal: thawer.get (op->last_heal); break;	621	case KW_last_heal: f.get (last_heal); break;
637	case KW_last_sp: thawer.get (op->last_sp); break;	622	case KW_last_sp: f.get (last_sp); break;
638	case KW_last_grace: thawer.get (op->last_grace); break;	623	case KW_last_grace: f.get (last_grace); break;
639	case KW_last_eat: thawer.get (op->last_eat); break;	624	case KW_last_eat: f.get (last_eat); break;
640	case KW_speed_left: thawer.get (op->speed_left); break;	625	case KW_speed_left: f.get (speed_left); break;
641		626
642	case KW_speed:	627	case KW_speed:
643	thawer.get (op->speed);	628	f.get (speed);
644		629
645	//TODO: maybe do in check_object	630	//TODO: maybe do in check_object
646	// removed check for style maps	631	// removed check for style maps
647	if (op->speed < 0)	632	if (speed < 0)
648	op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;	633	speed_left = speed_left - rndm ();
649		634
650	break;	635	break;
651		636
652	case KW_slow_move:	637	case KW_slow_move:
653	op->move_slow |= MOVE_WALK;	638	move_slow |= MOVE_WALK;
654	thawer.get (op->move_slow_penalty);	639	f.get (move_slow_penalty);
655	break;	640	break;
656		641
657	case KW_face:	642	case KW_face:
658	op->face = &new_faces[FindFace (thawer.get_str (), 0)];	643	face = face_find (f.get_str ());
659	break;	644	break;
660		645
		646	case KW_sound:
		647	sound = sound_find (f.get_str ());
		648	if (!sound)
		649	f.parse_warn ("sound not found");
		650	break;
		651
		652	case KW_sound_destroy:
		653	sound_destroy = sound_find (f.get_str ());
		654	if (!sound_destroy)
		655	f.parse_warn ("sound not found");
		656	break;
		657
661	case KW_x: thawer.get (op->x); break;	658	case KW_x: f.get (x); break;
662	case KW_y: thawer.get (op->y); break;	659	case KW_y: f.get (y); break;
663		660
664	case KW_Str: // uppercase alias	661	case KW_Str: // uppercase alias
665	case KW_str: thawer.get (op->stats.Str); break;	662	case KW_str: f.get (stats.Str); break;
666	case KW_Dex: // uppercase alias	663	case KW_Dex: // uppercase alias
667	case KW_dex: thawer.get (op->stats.Dex); break;	664	case KW_dex: f.get (stats.Dex); break;
668	case KW_Con: // uppercase alias	665	case KW_Con: // uppercase alias
669	case KW_con: thawer.get (op->stats.Con); break;	666	case KW_con: f.get (stats.Con); break;
670	case KW_Wis: // uppercase alias	667	case KW_Wis: // uppercase alias
671	case KW_wis: thawer.get (op->stats.Wis); break;	668	case KW_wis: f.get (stats.Wis); break;
672	case KW_Cha: // uppercase alias	669	case KW_Cha: // uppercase alias
673	case KW_cha: thawer.get (op->stats.Cha); break;	670	case KW_cha: f.get (stats.Cha); break;
674	case KW_Int: // uppercase alias	671	case KW_Int: // uppercase alias
675	case KW_int: thawer.get (op->stats.Int); break;	672	case KW_int: f.get (stats.Int); break;
676	case KW_Pow: // uppercase alias	673	case KW_Pow: // uppercase alias
677	case KW_pow: thawer.get (op->stats.Pow); break;	674	case KW_pow: f.get (stats.Pow); break;
678		675
679	case KW_hp: thawer.get (op->stats.hp); break;	676	case KW_hp: f.get (stats.hp); break;
680	case KW_maxhp: thawer.get (op->stats.maxhp); break;	677	case KW_maxhp: f.get (stats.maxhp); break;
681	case KW_sp: thawer.get (op->stats.sp); break;	678	case KW_sp: f.get (stats.sp); break;
682	case KW_maxsp: thawer.get (op->stats.maxsp); break;	679	case KW_maxsp: f.get (stats.maxsp); break;
683	case KW_grace: thawer.get (op->stats.grace); break;	680	case KW_grace: f.get (stats.grace); break;
684	case KW_maxgrace: thawer.get (op->stats.maxgrace); break;	681	case KW_maxgrace: f.get (stats.maxgrace); break;
685		682
686	case KW_exp: thawer.get (op->stats.exp); break;	683	case KW_exp: f.get (stats.exp); break;
687	case KW_perm_exp: thawer.get (op->perm_exp); break;	684	case KW_perm_exp: f.get (perm_exp); break;
688	case KW_food: thawer.get (op->stats.food); break;	685	case KW_food: f.get (stats.food); break;
689	case KW_dam: thawer.get (op->stats.dam); break;	686	case KW_dam: f.get (stats.dam); break;
690	case KW_wc: thawer.get (op->stats.wc); break;	687	case KW_wc: f.get (stats.wc); break;
691	case KW_ac: thawer.get (op->stats.ac); break;	688	case KW_ac: f.get (stats.ac); break;
692	case KW_nrof: thawer.get (op->nrof); break;	689	case KW_nrof: f.get (nrof); break;
693	case KW_level: thawer.get (op->level); break;	690	case KW_level: f.get (level); break;
694	case KW_direction: thawer.get (op->direction); break;	691	case KW_direction: f.get (direction); break;
695	case KW_type: thawer.get (op->type); break;	692	case KW_type: f.get (type); break;
696	case KW_subtype: thawer.get (op->subtype); break;	693	case KW_subtype: f.get (subtype); break;
697	case KW_value: thawer.get (op->value); break;	694	case KW_value: f.get (value); break;
698	case KW_weight: thawer.get (op->weight); break;	695	case KW_weight: f.get (weight); break;
699	case KW_carrying: thawer.get (op->carrying); break;	696	case KW_carrying: f.get (carrying); break;
700	case KW_attacktype: thawer.get (op->attacktype); break;	697	case KW_attacktype: f.get (attacktype); break;
701	case KW_path_attuned: thawer.get (op->path_attuned); break;	698	case KW_path_attuned: f.get (path_attuned); break;
702	case KW_path_repelled: thawer.get (op->path_repelled); break;	699	case KW_path_repelled: f.get (path_repelled); break;
703	case KW_path_denied: thawer.get (op->path_denied); break;	700	case KW_path_denied: f.get (path_denied); break;
704	case KW_invisible: thawer.get (op->invisible); break;	701	case KW_invisible: f.get (invisible); break;
705	case KW_magic: thawer.get (op->magic); break;	702	case KW_magic: f.get (magic); break;
706	case KW_state: thawer.get (op->state); break;	703	case KW_state: f.get (state); break;
707	case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;	704	case KW_move_slow_penalty: f.get (move_slow_penalty); break;
708	case KW_material: thawer.get (op->material); break;	705	case KW_material: f.get (materials); break; //TODO: nuke
709	case KW_materialname: thawer.get (op->materialname); break;	706	case KW_materialname: f.get (materialname); break;
710		707
711	/* These are the new values */	708	/* These are the new values */
712	case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;	709	case KW_move_block: set_move (move_block, f.get_str ()); break;
713	case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;	710	case KW_move_allow: set_move (move_allow, f.get_str ()); break;
714	case KW_move_type: set_move (op->move_type, thawer.get_str ()); break;	711	case KW_move_type: set_move (move_type, f.get_str ()); break;
715	case KW_move_on: set_move (op->move_on, thawer.get_str ()); break;	712	case KW_move_on: set_move (move_on, f.get_str ()); break;
716	case KW_move_off: set_move (op->move_off, thawer.get_str ()); break;	713	case KW_move_off: set_move (move_off, f.get_str ()); break;
717	case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break;	714	case KW_move_slow: set_move (move_slow, f.get_str ()); break;
718		715
719	/* These are all legacy - any new objects should use the move_ .. values */	716	/* These are all legacy - any new objects should use the move_ .. values */
720	case KW_no_pass:	717	case KW_no_pass:
721	{	718	{
722	if (thawer.get_sint32 ())	719	if (f.get_sint32 ())
723	op->move_block = MOVE_ALL;	720	move_block = MOVE_ALL;
724	else	721	else
725	op->move_block = 0;	722	move_block = 0;
726	}	723	}
727		724
728	break;	725	break;
729		726
730	/* These are all legacy - any new objects should use the move_ .. values */	727	/* These are all legacy - any new objects should use the move_ .. values */
731	case KW_walk_on:	728	case KW_walk_on:
732	{	729	{
733	if (thawer.get_sint32 ())	730	if (f.get_sint32 ())
734	op->move_on |= MOVE_WALK;	731	move_on |= MOVE_WALK;
735	else	732	else
736	op->move_on &= ~MOVE_WALK;	733	move_on &= ~MOVE_WALK;
737	}	734	}
738		735
739	break;	736	break;
740		737
741	/* These are all legacy - any new objects should use the move_ .. values */	738	/* These are all legacy - any new objects should use the move_ .. values */
742	case KW_walk_off:	739	case KW_walk_off:
743	{	740	{
744	if (thawer.get_sint32 ())	741	if (f.get_sint32 ())
745	op->move_off |= MOVE_WALK;	742	move_off |= MOVE_WALK;
746	else	743	else
747	op->move_off &= ~MOVE_WALK;	744	move_off &= ~MOVE_WALK;
748	}	745	}
749	break;	746	break;
750		747
751	/* These are all legacy - any new objects should use the move_ .. values */	748	/* These are all legacy - any new objects should use the move_ .. values */
752	case KW_fly_on:	749	case KW_fly_on:
753	{	750	{
754	if (thawer.get_sint32 ())	751	if (f.get_sint32 ())
755	op->move_on |= MOVE_FLY_LOW;	752	move_on |= MOVE_FLY_LOW;
756	else	753	else
757	op->move_on &= ~MOVE_FLY_LOW;	754	move_on &= ~MOVE_FLY_LOW;
758	}	755	}
759	break;	756	break;
760		757
761	/* These are all legacy - any new objects should use the move_ .. values */	758	/* These are all legacy - any new objects should use the move_ .. values */
762	case KW_fly_off:	759	case KW_fly_off:
763	{	760	{
764	if (thawer.get_sint32 ())	761	if (f.get_sint32 ())
765	op->move_off |= MOVE_FLY_LOW;	762	move_off |= MOVE_FLY_LOW;
766	else	763	else
767	op->move_off &= ~MOVE_FLY_LOW;	764	move_off &= ~MOVE_FLY_LOW;
768	}	765	}
769	break;	766	break;
770		767
771	//TODO: remove these after converting archetypes	768	//TODO: remove these after converting archetypes
772	case KW_can_use_wand:	769	case KW_can_use_wand:
773	GET_FLAG (op, FLAG_USE_RANGE);	770	GET_FLAG (this, FLAG_USE_RANGE);
774	break;	771	break;
775		772
776	/* These are all legacy - any new objects should use the move_ .. values */	773	/* These are all legacy - any new objects should use the move_ .. values */
777	case KW_flying:	774	case KW_flying:
778	{	775	{
779	if (thawer.get_sint32 ())	776	if (f.get_sint32 ())
780	op->move_type |= MOVE_FLY_LOW;	777	move_type |= MOVE_FLY_LOW;
781	else	778	else
782	op->move_type &= ~MOVE_FLY_LOW;	779	move_type &= ~MOVE_FLY_LOW;
783	}	780	}
784	break;	781	break;
785		782
786		783
787	case KW_identified:	784	case KW_identified:
788	GET_FLAG (op, FLAG_IDENTIFIED);	785	GET_FLAG (this, FLAG_IDENTIFIED);
789	//TODO: move to check_object or so	786	//TODO: move to check_object or so
790	if (QUERY_FLAG (op, FLAG_IDENTIFIED))	787	if (QUERY_FLAG (this, FLAG_IDENTIFIED))
791	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);	788	CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
792		789
793	break;	790	break;
794		791
795	case KW_wiz:	792	case KW_friendly:
796	GET_FLAG (op, FLAG_WIZ);	793	if (f.get_bool ())
797	//TODO: move to check_object	794	if (type != PLAYER)
798	if (QUERY_FLAG (op, FLAG_WIZ))	795	add_friendly_object (this);
		796
		797	break;
		798
		799	case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
		800	case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
		801	case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
		802	case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
		803	case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
		804	case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
		805	case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
		806	case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
		807	case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
		808	case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
		809	case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
		810	case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
		811	case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
		812	case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
		813	case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
		814	case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
		815	case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
		816	case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
		817	case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
		818	case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
		819	case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
		820	case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
		821	case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
		822	case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
		823	case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
		824	case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
		825	case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
		826	case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
		827	case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
		828	case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
		829	case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
		830	case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
		831	case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
		832	case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
		833	case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
		834	case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
		835	case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
		836	case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
		837	case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
		838	case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
		839	case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
		840	case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
		841	case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
		842	case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
		843	case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
		844	case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
		845	case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
		846	case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
		847	case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
		848	case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
		849	case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
		850	case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
		851	case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
		852	case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
		853	case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
		854	case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
		855	case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
		856	case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
		857	case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
		858	case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
		859	case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
		860	case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
		861	case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
		862	case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
		863	case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
		864	case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
		865	case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
		866	case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
		867	case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
		868	case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
		869	case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
		870	case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
		871	case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
		872	case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
		873	case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
		874	case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
		875	case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
		876	case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
		877	case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
		878	case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
		879	case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
		880	case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
		881	case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
		882	case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
		883	case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
		884	case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
		885	case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
		886
		887	case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
		888	case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
		889	case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
		890	case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
		891	case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
		892	case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
		893	case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
		894	case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
		895	case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
		896	case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
		897	case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
		898	case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
		899	case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
		900	case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
		901	case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
		902	case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
		903	case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
		904	case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
		905	case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
		906	case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
		907	case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
		908	case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
		909	case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
		910	case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
		911	case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
		912	case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
		913	case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
		914
		915	case KW_luck: f.get (stats.luck); break;
		916	case KW_run_away: f.get (run_away); break;
		917	case KW_pick_up: f.get (pick_up); break;
		918	case KW_item_power: f.get (item_power); break;
		919	case KW_gen_sp_armour: f.get (gen_sp_armour); break;
		920	case KW_anim_speed: f.get (anim_speed); break;
		921	case KW_container: f.get (weight_limit); break;
		922	case KW_will_apply: f.get (will_apply); break;
		923	case KW_attack_movement: f.get (attack_movement); break;
		924	case KW_move_state: f.get (move_status); break;
		925	case KW_expmul: f.get (expmul); break;
		926	case KW_glow_radius: f.get (glow_radius); break;
		927	case KW_weapontype: f.get (weapontype); break;
		928	case KW_tooltype: f.get (tooltype); break;
		929	case KW_casting_time: f.get (casting_time); break;
		930	case KW_elevation: f.get (elevation); break;
		931	case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
		932	case KW_client_type: f.get (client_type); break;
		933	case KW_duration: f.get (duration); break;
		934	case KW_range: f.get (range); break;
		935	case KW_range_modifier: f.get (range_modifier); break;
		936	case KW_dam_modifier: f.get (dam_modifier); break;
		937	case KW_duration_modifier: f.get (duration_modifier); break;
		938
		939	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
		940	//TODO: parse from other include files
		941	case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
		942	case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
		943	case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
		944	case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
		945	case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
		946	case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
		947	case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
		948	case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
		949	case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
		950	case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
		951	case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
		952	case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
		953	case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
		954	case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
		955	case KW_can_apply:
		956	break;
		957
		958	case KW_connected:
		959	add_button_link (this, map, f.get_sint32 ());
		960	break;
		961
		962	case KW_randomitems:
		963	if (f.get_str ())
799	{	964	{
800	SET_FLAG (op, FLAG_WAS_WIZ);	965	randomitems =
801	SET_FLAG (op, FLAG_WIZPASS);	966	loading_arch
802	SET_FLAG (op, FLAG_WIZCAST);	967	? treasurelist::get (f.get_str ())
		968	: treasurelist::find (f.get_str ());
		969
		970	if (!randomitems)
		971	LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
803	}	972	}
804	else	973	else
805	{	974	randomitems = 0;
806	CLEAR_FLAG (op, FLAG_WIZPASS);
807	CLEAR_FLAG (op, FLAG_WIZCAST);
808	}
809	break;
810
811	case KW_friendly:
812	GET_FLAG (op, FLAG_FRIENDLY);
813	//TODO: move to check_object or so
814	if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
815	add_friendly_object (op);
816	break;
817
818	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
819	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
820	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
821	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
822	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
823	case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
824	case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
825	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
826	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
827	case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
828	case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
829	case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
830	case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
831	case KW_alive: GET_FLAG (op, FLAG_ALIVE); break;
832	case KW_applied: GET_FLAG (op, FLAG_APPLIED); break;
833	case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break;
834	case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break;
835	case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break;
836	case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break;
837	case KW_changing: GET_FLAG (op, FLAG_CHANGING); break;
838	case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break;
839	case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break;
840	case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break;
841	case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break;
842	case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break;
843	case KW_scared: GET_FLAG (op, FLAG_SCARED); break;
844	case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break;
845	case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break;
846	case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break;
847	case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break;
848	case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break;
849	case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
850	case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break;
851	case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break;
852	case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break;
853	case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break;
854	case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break;
855	case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break;
856	case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break;
857	case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break;
858	case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
859	case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
860	case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
861	case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
862	case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
863	case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
864	case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
865	case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
866	case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
867	case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
868	case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
869	case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break;
870	case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
871	case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break;
872	case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break;
873	case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break;
874	case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break;
875	case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break;
876	case KW_cursed: GET_FLAG (op, FLAG_CURSED); break;
877	case KW_damned: GET_FLAG (op, FLAG_DAMNED); break;
878	case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break;
879	case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break;
880	case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break;
881	case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break;
882	case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break;
883	case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break;
884	case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break;
885	case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break;
886	case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break;
887	case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break;
888	case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break;
889	case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break;
890	case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break;
891	case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break;
892	case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break;
893	case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break;
894	case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break;
895	case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break;
896	case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break;
897	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
898	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
899	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
900	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
901	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
902
903	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
904	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
905	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
906	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
907	case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break;
908	case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break;
909	case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break;
910	case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break;
911	case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break;
912	case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break;
913	case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break;
914	case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break;
915	case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break;
916	case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break;
917	case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break;
918	case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break;
919	case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break;
920	case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break;
921	case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break;
922	case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break;
923	case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break;
924	case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break;
925	case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break;
926	case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break;
927	case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break;
928	case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break;
929	case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break;
930
931	case KW_luck: thawer.get (op->stats.luck); break;
932	case KW_run_away: thawer.get (op->run_away); break;
933	case KW_pick_up: thawer.get (op->pick_up); break;
934	case KW_item_power: thawer.get (op->item_power); break;
935	case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break;
936	case KW_anim_speed: thawer.get (op->anim_speed); break;
937	case KW_container: thawer.get (op->weight_limit); break;
938	case KW_will_apply: thawer.get (op->will_apply); break;
939	case KW_attack_movement: thawer.get (op->attack_movement); break;
940	case KW_move_state: thawer.get (op->move_status); break;
941	case KW_expmul: thawer.get (op->expmul); break;
942	case KW_glow_radius: thawer.get (op->glow_radius); break;
943	case KW_weapontype: thawer.get (op->weapontype); break;
944	case KW_tooltype: thawer.get (op->tooltype); break;
945	case KW_casting_time: thawer.get (op->casting_time); break;
946	case KW_elevation: thawer.get (op->elevation); break;
947	case KW_smoothlevel: thawer.get (op->smoothlevel); break;
948	case KW_client_type: thawer.get (op->client_type); break;
949	case KW_duration: thawer.get (op->duration); break;
950	case KW_range: thawer.get (op->range); break;
951	case KW_range_modifier: thawer.get (op->range_modifier); break;
952	case KW_dam_modifier: thawer.get (op->dam_modifier); break;
953	case KW_duration_modifier: thawer.get (op->duration_modifier); break;
954
955	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
956	//TODO: parse from other include files
957	case KW_body_range: thawer.get (op->body_info[0]); break;
958	case KW_body_arm: thawer.get (op->body_info[1]); break;
959	case KW_body_torso: thawer.get (op->body_info[2]); break;
960	case KW_body_head: thawer.get (op->body_info[3]); break;
961	case KW_body_neck: thawer.get (op->body_info[4]); break;
962	case KW_body_skill: thawer.get (op->body_info[5]); break;
963	case KW_body_finger: thawer.get (op->body_info[6]); break;
964	case KW_body_shoulder: thawer.get (op->body_info[7]); break;
965	case KW_body_foot: thawer.get (op->body_info[8]); break;
966	case KW_body_hand: thawer.get (op->body_info[9]); break;
967	case KW_body_wrist: thawer.get (op->body_info[10]); break;
968	case KW_body_waist: thawer.get (op->body_info[11]); break;
969	case KW_can_apply:
970	break;
971
972	case KW_connected:
973	add_button_link (op, op->map, thawer.get_sint32 ());
974	break;
975
976	case KW_randomitems:
977	op->randomitems = find_treasurelist (thawer.get_str ());
978	break;	975	break;
979		976
980	case KW_msg:	977	case KW_msg:
981	thawer.get_ml (KW_endmsg, op->msg);	978	f.get_ml (KW_endmsg, msg);
982	//TODO: allow longer messages
983	if (strlen (op->msg) >= HUGE_BUF)
984	{
985	LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
986	op->msg = "ERROR, please report: string too long, winged.\n";
987	}
988	break;	979	break;
989		980
990	case KW_lore:	981	case KW_lore:
991	thawer.get_ml (KW_endlore, op->lore);	982	f.get_ml (KW_endlore, lore);
992	//TODO: allow longer messages
993	/* Just print a warning so we can be reasonably safe
994	* about not overflowing the buffer.
995	*/
996	if (strlen (op->lore) > (HUGE_BUF / 2))
997	LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
998	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
999	break;	983	break;
1000		984
1001	case KW_editable:	985	case KW_editable:
1002	case KW_editor_folder:	986	case KW_editor_folder:
1003	break;	987	break;
1004		988
1005	case KW_More: // uppercase alias
1006	case KW_more:
1007	/* We need to record that this is a multipart object,
1008	* so the calling function can glue things back together
1009	*/
1010	ismore = 1;
1011	break;
1012
1013	case KW_end:	989	case KW_end:
1014	check_loaded_object (op);
1015
1016	if (!arch_init)	990	if (!loading_arch)
1017	op->instantiate ();	991	instantiate ();
1018		992
1019	return ismore ? LL_MORE : LL_NORMAL;	993	f.next ();
1020
1021	case KW_EOF:
1022	return LL_EOF;	994	return true;
1023		995
1024	case KW_ERROR:	996	case KW_ERROR:
1025	set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);	997	set_ob_key_value (this, f.kw_str, f.value, true);
1026	//fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D	998	//fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1027	break;	999	break;
1028		1000
1029	default:	1001	default:
1030	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;
1031	break;	1004	break;
1032	}	1005	}
		1006
		1007	f.next ();
1033	}	1008	}
1034	}	1009	}
1035		1010
1036	/*	1011	object *
1037	* Loads an object from the given file-pointer.	1012	object::read (object_thawer &f, maptile *map)
1038	* Variables will be read and parsed and patched into the object
1039	* until the string "end" is reached, or the end of the file.
1040	*
1041	* bufstat is used to determine various file attributes:
1042	* LO_REPATE (0): We are reading from the same buffer as the last call.
1043	* LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1044	* will also be reading from this (treasure file, artifacts.)
1045	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1046	* be reset.
1047	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1048	*
1049	*/
1050	int
1051	load_object (object_thawer &fp, object *op, int map_flags)
1052	{	1013	{
1053	// cede every 500 objects loaded	1014	assert (f.kw == KW_arch);
1054	{
1055	static int cede_counter = 0;
1056		1015
1057	if (++cede_counter >= 500)	1016	archetype *arch = archetype::find (f.get_str ());
		1017
		1018	if (!arch)
1058	{	1019	{
1059	cede_counter = 0;	1020	LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1060	if (coroapi::nready ())	1021	arch = archetype::find ("earthwall");
1061	coroapi::cede ();
1062	}	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->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;
1063	}	1039	}
1064		1040
1065	return parse_object (op, fp, map_flags);	1041	op->post_load_check ();
		1042	return op;
1066	}	1043	}
1067		1044
1068	/* 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
1069	* as appropriate in op.	1046	* as appropriate in op.
1070	*	1047	*
…		…
1072	* override values and in c_wiz to mutate values.	1049	* override values and in c_wiz to mutate values.
1073	*/	1050	*/
1074	int	1051	int
1075	set_variable (object *op, char *buf)	1052	set_variable (object *op, char *buf)
1076	{	1053	{
1077	object_thawer thawer (buf, (AV *)0);	1054	object_thawer f (buf, (AV *)0);
1078		1055
1079	return parse_object (op, thawer, 0);	1056	return op->parse_kv (f);
1080	}
1081
1082	/*
1083	* Initialises the array of variable-names. Needed before any
1084	* objects can be loaded. Called by init_library().
1085	*/
1086
1087	void
1088	init_vars ()
1089	{
1090	}	1057	}
1091		1058
1092	/* This returns a string of the integer movement type */	1059	/* This returns a string of the integer movement type */
1093	#if 0	1060	#if 0
1094	// unused function	1061	// unused function
…		…
1139	return retbuf + 1;	1106	return retbuf + 1;
1140	}	1107	}
1141	#endif	1108	#endif
1142		1109
1143	// compare *op against *tmp and output differences	1110	// compare *op against *tmp and output differences
1144	void	1111	static void
1145	put (object_freezer &f, object *op, object *tmp)	1112	write_diff (object_freezer &f, object *op, object *tmp)
1146	{	1113	{
1147	static const keyword resist_save[NROFATTACKS] = {	1114	static const keyword resist_save[NROFATTACKS] = {
1148	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,	1115	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1149	# include "attackinc.h"	1116	# include "attackinc.h"
1150	# undef def	1117	# undef def
…		…
1155	* the 15'th element of this array should match that name.	1122	* the 15'th element of this array should match that name.
1156	* If an entry is NULL, that is a flag not to loaded/saved.	1123	* If an entry is NULL, that is a flag not to loaded/saved.
1157	*/	1124	*/
1158	static const keyword flag_names [NUM_FLAGS] = {	1125	static const keyword flag_names [NUM_FLAGS] = {
1159	KW_alive,	1126	KW_alive,
1160	KW_wiz,
1161	KW_NULL,	1127	KW_NULL,
1162	KW_NULL,	1128	KW_NULL,
1163	KW_was_wiz,	1129	KW_NULL,
		1130	KW_NULL,
1164	KW_applied,	1131	KW_applied,
1165	KW_unpaid,	1132	KW_unpaid,
1166	KW_can_use_shield,	1133	KW_can_use_shield,
1167	KW_no_pick,	1134	KW_no_pick,
1168	KW_NULL, // walk_on	1135	KW_NULL, // walk_on
…		…
1174	KW_monster,	1141	KW_monster,
1175	KW_friendly,	1142	KW_friendly,
1176	KW_generator,	1143	KW_generator,
1177	KW_is_thrown,	1144	KW_is_thrown,
1178	KW_auto_apply,	1145	KW_auto_apply,
1179	KW_NULL, // was KW_treasure	1146	KW_treasure_env,
1180	KW_player_sold,	1147	KW_player_sold,
1181	/* 20 */	1148	/* 20 */
1182	KW_see_invisible,	1149	KW_see_invisible,
1183	KW_can_roll,	1150	KW_can_roll,
1184	KW_overlay_floor,	1151	KW_overlay_floor,
…		…
1245	KW_can_use_skill,	1212	KW_can_use_skill,
1246	KW_been_applied,	1213	KW_been_applied,
1247	/* 80 */	1214	/* 80 */
1248	KW_has_ready_scroll,	1215	KW_has_ready_scroll,
1249	KW_can_use_rod,	1216	KW_can_use_rod,
1250	KW_NULL,	1217	KW_precious,
1251	KW_can_use_horn,	1218	KW_can_use_horn,
1252	KW_make_invisible,	1219	KW_make_invisible,
1253	KW_inv_locked,	1220	KW_inv_locked,
1254	KW_is_wooded,	1221	KW_is_wooded,
1255	KW_is_hilly,	1222	KW_is_hilly,
…		…
1267	KW_berserk,	1234	KW_berserk,
1268	KW_neutral,	1235	KW_neutral,
1269	/* 100 */	1236	/* 100 */
1270	KW_no_attack,	1237	KW_no_attack,
1271	KW_no_damage,	1238	KW_no_damage,
1272	KW_NULL,	1239	KW_obj_original,
1273	KW_NULL,	1240	KW_NULL,
1274	KW_activate_on_push,	1241	KW_activate_on_push,
1275	KW_activate_on_release,	1242	KW_activate_on_release,
1276	KW_is_water,	1243	KW_is_water,
1277	KW_use_content_on_gen,	1244	KW_use_content_on_gen,
1278	KW_NULL,	1245	KW_NULL,
1279	KW_is_buildable,	1246	KW_is_buildable,
1280	/* 110 */	1247	/* 110 */
		1248	KW_destroy_on_death,
		1249	KW_NULL,
1281	};	1250	};
1282		1251
1283	int i;	1252	int i;
1284		1253
1285	/* This saves the key/value lists. We do it first so that any	1254	/* This saves the key/value lists. We do it first so that any
1286	* keys that match field names will be overwritten by the loader.	1255	* keys that match field names will be overwritten by the loader.
1287	*/	1256	*/
1288	for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next)	1257	for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1289	{	1258	{
1290	/* Find the field in the opposing member. */	1259	/* Find the field in the opposing member. */
1291	key_value *arch_field = get_ob_key_link (tmp, my_field->key);	1260	key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1292		1261
1293	/* If there's no partnering field, or it's got a different value, save our field. */	1262	/* If there's no partnering field, or it's got a different value, save our field. */
…		…
1303	char uids[64];	1272	char uids[64];
1304	snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);	1273	snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1305	f.put (KW_uuid, (const char *)uids);	1274	f.put (KW_uuid, (const char *)uids);
1306	}	1275	}
1307		1276
1308	#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v)	1277	#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1309	#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v)	1278	#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
		1279
		1280	if (object *owner = op->owner)
		1281	f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1310		1282
1311	CMP_OUT (name);	1283	CMP_OUT (name);
1312	CMP_OUT (name_pl);	1284	CMP_OUT (name_pl);
1313	CMP_OUT (custom_name);	1285	CMP_OUT (custom_name);
1314	CMP_OUT (title);	1286	CMP_OUT (title);
1315	CMP_OUT (race);	1287	CMP_OUT (race);
1316	CMP_OUT (slaying);	1288	CMP_OUT (slaying);
1317
1318	if (op->msg != tmp->msg)
1319	f.put (KW_msg, KW_endmsg, op->msg);
1320	if (op->lore != tmp->lore)
1321	f.put (KW_lore, KW_endlore, op->lore);
1322
1323	CMP_OUT (other_arch);	1289	CMP_OUT (other_arch);
1324	CMP_OUT (face);	1290
		1291	if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
		1292	if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
		1293
		1294	if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
		1295	if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
		1296	if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1325		1297
1326	if (op->animation_id != tmp->animation_id)	1298	if (op->animation_id != tmp->animation_id)
1327	if (op->animation_id)	1299	if (op->animation_id)
1328	{	1300	{
1329	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);	1301	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1330		1302
1331	if (!QUERY_FLAG (op, FLAG_ANIMATE))	1303	if (!QUERY_FLAG (op, FLAG_ANIMATE))
1332	f.put (KW_is_animated, (sint32) 0);	1304	f.put (KW_is_animated, (sint32)0);
1333	}	1305	}
1334	else	1306	else
1335	f.put (KW_animation, (const char *) 0);	1307	f.put (KW_animation, (const char *)0);
1336		1308
1337	CMP_OUT2 (str, stats.Str);	1309	CMP_OUT2 (str, stats.Str);
1338	CMP_OUT2 (dex, stats.Dex);	1310	CMP_OUT2 (dex, stats.Dex);
1339	CMP_OUT2 (con, stats.Con);	1311	CMP_OUT2 (con, stats.Con);
1340	CMP_OUT2 (wis, stats.Wis);	1312	CMP_OUT2 (wis, stats.Wis);
…		…
1371	CMP_OUT (type);	1343	CMP_OUT (type);
1372	CMP_OUT (subtype);	1344	CMP_OUT (subtype);
1373	CMP_OUT (attacktype);	1345	CMP_OUT (attacktype);
1374		1346
1375	for (i = 0; i < NROFATTACKS; i++)	1347	for (i = 0; i < NROFATTACKS; i++)
1376	if (op->resist[i] != tmp->resist[i])	1348	if (expect_false (op->resist[i] != tmp->resist[i]))
1377	f.put (resist_save[i], op->resist[i]);	1349	f.put (resist_save[i], op->resist[i]);
1378		1350
1379	CMP_OUT (path_attuned);	1351	CMP_OUT (path_attuned);
1380	CMP_OUT (path_repelled);	1352	CMP_OUT (path_repelled);
1381	CMP_OUT (path_denied);	1353	CMP_OUT (path_denied);
1382	CMP_OUT (material);	1354	CMP_OUT2 (material, materials);//TODO: nuke
1383	CMP_OUT (materialname);	1355	CMP_OUT (materialname);
1384	CMP_OUT (value);	1356	CMP_OUT (value);
1385	CMP_OUT (carrying);	1357	CMP_OUT (carrying);
1386	CMP_OUT (weight);	1358	CMP_OUT (weight);
1387	CMP_OUT (invisible);	1359	CMP_OUT (invisible);
…		…
1423	CMP_OUT (move_slow);	1395	CMP_OUT (move_slow);
1424	CMP_OUT (move_slow_penalty);	1396	CMP_OUT (move_slow_penalty);
1425		1397
1426	if (op->flag != tmp->flag)	1398	if (op->flag != tmp->flag)
1427	for (i = 0; i <= NUM_FLAGS; i++)	1399	for (i = 0; i <= NUM_FLAGS; i++)
1428	if (flag_names [i] && op->flag [i] != tmp->flag [i])	1400	if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1429	f.put (flag_names [i], op->flag [i] ? "1" : "0");	1401	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1430		1402
1431	/* Save body locations */	1403	// save body locations
1432	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1404	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1433	if (op->body_info[i] != tmp->body_info[i])	1405	if (expect_false (op->slot[i].info != tmp->slot[i].info))
1434	f.put (body_locations[i].save_name, op->body_info[i]);	1406	f.put (body_locations[i].save_name, op->slot[i].info);
1435	}	1407	}
1436		1408
1437	/*	1409	/*
1438	* Dumps all variables in an object to a file.	1410	* Dumps all variables in an object to a file.
1439	* If bit 0 of flag is set, unpaid objects will be saved. As of now,	1411	* If bit 0 of flag is set, unpaid objects will be saved. As of now,
1440	* the only place this is not set is when saving the player.	1412	* the only place this is not set is when saving the player.
1441	*/	1413	*/
1442	void	1414	bool
1443	save_object (object_freezer &fp, object *op, int flag)	1415	object::write (object_freezer &f)
1444	{	1416	{
1445	/* Even if the object does have an owner, it would seem that we should
1446	* still save it.
1447	*/
1448	if (op->owner)
1449	return;
1450
1451	/* If it is unpaid and we don't want to save those, just return. */
1452	if (!(flag & 1) && op->flag [FLAG_UNPAID])
1453	return;
1454
1455	archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;	1417	archetype *at = arch ? (archetype *)arch : empty_archetype;
1456		1418
1457	fp.put (KW_arch, at->name);	1419	f.put (KW_arch, at->archname);
1458	put (fp, op, &at->clone);	1420	write_diff (f, this, at);
1459		1421
1460	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1461
1462	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1422	for (object *tmp = inv; tmp; tmp = tmp->below)
1463	save_object (fp, tmp, flag);	1423	tmp->write (f);
1464		1424
1465	fp.put (op);	1425	f.put (this);
1466	fp.put (KW_end, 0);	1426	f.put (KW_end);
		1427
		1428	return true;
1467	}	1429	}
1468		1430
		1431	/////////////////////////////////////////////////////////////////////////////
		1432
		1433	// generic resource file load,
		1434	// currently supports: region, treasures, archetypes
		1435	bool load_resource_file (const char *filename)
		1436	{
		1437	object_thawer f (filename);
		1438
		1439	bool success = false;
		1440	bool seen_arch = false;
		1441
		1442	for (;;)
		1443	{
		1444	switch (f.kw)
		1445	{
		1446	case KW_region:
		1447	if (!region::read (f))
		1448	goto finish;
		1449	break;
		1450
		1451	case KW_treasure:
		1452	case KW_treasureone:
		1453	if (!treasurelist::read (f))
		1454	goto finish;
		1455	break;
		1456
		1457	case KW_object:
		1458	seen_arch = true;
		1459	if (!archetype::read (f))
		1460	goto finish;
		1461	break;
		1462
		1463	case KW_EOF:
		1464	success = true;
		1465	goto finish;
		1466
		1467	default:
		1468	if (!f.parse_error ("resource file"))
		1469	goto finish;
		1470
		1471	f.next ();
		1472	break;
		1473	}
		1474	}
		1475
		1476	finish:
		1477	if (seen_arch)
		1478	init_archetype_pointers ();
		1479
		1480	return success;
		1481	}
		1482

Diff Legend

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