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.48 by root, Fri Jan 19 17:50:10 2007 UTC vs.
Revision 1.85 by root, Sat May 26 15:44:02 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7	*	7	*
…		…
24		24
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
27	variable. */	27	variable. */
28		28
29
30	#include <global.h>	29	#include <global.h>
31	#include <loader.h>	30	#include <loader.h>
32	#include <sproto.h>	31	#include <sproto.h>
33		32
34	// future resource loader base class	33	/////////////////////////////////////////////////////////////////////////////
35	struct loader_base
36	{
37	virtual archetype *get_arch (const char *name);
38	virtual void put_arch (archetype *arch);
39
40	virtual object *get_object (const char *name);
41	virtual void put_object (object *op);
42
43	virtual player *get_player ();
44	virtual void put_player (player *pl);
45
46	virtual region *get_region ();
47	virtual void put_region (region *region);
48
49	virtual facetile *get_face (const char *name);
50	virtual void put_face (facetile *face);
51
52	virtual treasurelist *get_treasure (const char *name, bool one = false);
53	virtual void put_treasure (treasurelist *treasure);
54
55	virtual animation *get_animation (const char *name);
56	virtual void put_animation (animation *anim);
57	};
58
59	// future generic resource loader
60	// handles generic stuff valid in most files, such as
61	// animations, treasures, faces and so on
62	struct loader_generic : loader_base
63	{
64	virtual region *get_region ();
65	virtual void put_region (region *region);
66
67	virtual facetile *get_face (const char *name);
68	virtual void put_face (facetile *face);
69
70	virtual treasurelist *get_treasure (const char *name, bool one = false);
71	virtual void put_treasure (treasurelist *treasure);
72
73	virtual animation *get_animation (const char *name);
74	virtual void put_animation (animation *anim);
75	};
76
77	/* Maps the MOVE_* values to names */
78	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
79		34
80	/* 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
81	* spell object conversion to the new object. It was not practical	36	* spell object conversion to the new object. It was not practical
82	* 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
83	* 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
…		…
295	"spell_cause_rabies", /* 204 */	250	"spell_cause_rabies", /* 204 */
296	"spell_glyph", /* 205 */	251	"spell_glyph", /* 205 */
297	NULL	252	NULL
298	};	253	};
299		254
300	extern int arch_init;	255	extern bool loading_arch;
301		256
302	/* 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
303	* 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
304	* 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
305	* 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.
306	*/	261	*/
307	static void	262	void
308	check_loaded_object (object *op)	263	object::post_load_check ()
309	{	264	{
310	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	}
		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	}
311		320
312	/* We do some specialised handling to handle legacy cases of name_pl.	321	/* We do some specialised handling to handle legacy cases of name_pl.
313	* 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 -
314	* this isn't perfect (things won't be properly pluralised), but works to	323	* this isn't perfect (things won't be properly pluralised), but works to
315	* 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
316	* 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
317	* 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.
318	* Otherwise, what happens is that the the plural name will lose	327	* Otherwise, what happens is that the the plural name will lose
319	* information (appear as just 'hearts' and not 'goblins heart')	328	* information (appear as just 'hearts' and not 'goblins heart')
320	*/	329	*/
321	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)
322	op->name_pl = NULL;	331	name_pl = 0;
323		332
324	if (!op->name_pl)	333	if (!name_pl)
325	op->name_pl = op->name;	334	name_pl = name;
326		335
327	/* objects now have a materialname. try to patch it in */	336	/* objects now have a materialname. try to patch it in */
328	if (!(op->is_weapon () && op->level > 0))	337	if (!(is_weapon () && level > 0))
329	{	338	set_materialname (this, map ? map->difficulty : 5, 0);
330	if (op->map != NULL)	339
331	set_materialname (op, op->map->difficulty, NULL);
332	else
333	set_materialname (op, 5, NULL);
334	}
335	/* only do these when program is first run - a bit	340	/* only do these when program is first run - a bit
336	* excessive to do this at every run - most of this is	341	* excessive to do this at every run - most of this is
337	* really just to catch any errors - program will still run, but	342	* really just to catch any errors - program will still run, but
338	* not in the ideal fashion.	343	* not in the ideal fashion.
339	*/	344	*/
340	if ((op->type == WEAPON || op->type == BOW) && arch_init)	345	if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341	{	346	{
342	if (!op->skill)	347	if (!skill)
343	{
344	LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());	348	LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ());
345	}
346	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) ||
347	(!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))	350	(!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2))
348	{
349	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);
350	}
351	}	352	}
352		353
353	/* 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
354	* really does for many objects. Need to catch any in maps	355	* really does for many objects. Need to catch any in maps
355	* that may have an old value.	356	* that may have an old value.
356	*/	357	*/
357	if ((op->type == WEAPON) ||	358	if (type == WEAPON
358	(op->type == ARMOUR) || (op->type == HELMET) ||	359	|| type == ARMOUR || type == HELMET
359	(op->type == SHIELD) || (op->type == RING) ||	360	|| type == SHIELD || type == RING
360	(op->type == BOOTS) || (op->type == GLOVES) ||	361	|| type == BOOTS || type == GLOVES
361	(op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))	362	|| type == AMULET || type == GIRDLE
		363	|| type == BRACERS || type == CLOAK)
362	{	364	{
363	if (op->last_heal)	365	if (last_heal)
364	{	366	{
365	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 ());
366	op->gen_sp_armour = op->last_heal;	368	gen_sp_armour = last_heal;
367	op->last_heal = 0;	369	last_heal = 0;
368	}	370	}
369		371
370	ip = calc_item_power (op, 0);	372	int ip = calc_item_power (this, 0);
		373
371	/* Legacy objects from before item power was in the game */	374	/* Legacy objects from before item power was in the game */
372	if (!op->item_power && ip)	375	if (!item_power && ip)
373	{	376	{
374	if (ip > 3)	377	if (ip > 3)
375	{
376	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);
377	}	379
378	op->item_power = ip;	380	item_power = ip;
379	}	381	}
		382
380	/* Check for possibly bogus values. Has to meet both these criteria -	383	/* Check for possibly bogus values. Has to meet both these criteria -
381	* 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
382	* 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.
383	* 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,
384	* but not the second one.	387	* but not the second one.
385	*/	388	*/
		389	#if 0 //TODO
386	if (ip > 2 * op->item_power && ip > (op->item_power + 3))	390	if (ip > 2 * item_power && ip > (item_power + 3))
387	{
388	LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);	391	LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
389	}	392	#endif
390
391	}	393	}
		394
392	/* Old spellcasting object - need to load in the appropiate object */	395	/* Old spellcasting object - need to load in the appropiate object */
393	if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||	396	if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
394	/* POTIONS and ALTARS don't always cast spells, but if they do, update them */	397	/* POTIONS and ALTARS don't always cast spells, but if they do, update them */
395	((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)	398	((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
396	{	399	{
397	object *tmp;
398
399	/* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'	400	/* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
400	* in that spell was stored in sp.	401	* in that spell was stored in sp.
401	*/	402	*/
402	tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);	403	object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403	insert_ob_in_ob (tmp, op);	404	insert_ob_in_ob (tmp, this);
404	op->randomitems = NULL; /* So another spell isn't created for this object */	405	randomitems = NULL; /* So another spell isn't created for this object */
405	}	406	}
		407
406	/* spellbooks & runes use slaying. But not to arch name, but to spell name */	408	/* spellbooks & runes use slaying. But not to arch name, but to spell name */
407
408	if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)	409	if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409	{	410	{
410	object *tmp;
411
412	tmp = get_archetype_by_object_name (op->slaying);	411	object *tmp = get_archetype_by_object_name (slaying);
413	insert_ob_in_ob (tmp, op);	412	insert_ob_in_ob (tmp, this);
414	op->randomitems = NULL; /* So another spell isn't created for this object */	413	randomitems = NULL; /* So another spell isn't created for this object */
415	/* without this, value is all screwed up */	414	/* without this, value is all screwed up */
416	op->value = op->arch->clone.value * op->inv->value;	415	value = arch->clone.value * inv->value;
417	}	416	}
418		417
419	if (QUERY_FLAG (op, FLAG_MONSTER))	418	if (QUERY_FLAG (this, FLAG_MONSTER))
420	{	419	{
421	if (op->stats.hp > op->stats.maxhp)	420	if (stats.hp > stats.maxhp)
		421	{
422	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);	422	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
		423	stats.maxhp = stats.hp;
		424	}
423		425
424	/* The archs just need to be updated for this */	426	/* The archs just need to be updated for this */
425	if (op->move_type == 0)	427	if (move_type == 0)
426	op->move_type = MOVE_WALK;	428	move_type = MOVE_WALK;
427	}	429	}
428		430
429	if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)	431	if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
430	{	432	{
431	/* Object will duplicate it's content as part of the	433	/* Object will duplicate it's content as part of the
432	* generation process. To do this, we must flag inventory	434	* generation process. To do this, we must flag inventory
433	* so it remains unevaluated concerning the randomitems and	435	* so it remains unevaluated concerning the randomitems and
434	* the living (a demonlord shouldn't cast from inside generator!)	436	* the living (a demonlord shouldn't cast from inside generator!)
435	*/	437	*/
436	flag_inv (op, FLAG_IS_A_TEMPLATE);	438	flag_inv (this, FLAG_IS_A_TEMPLATE);
437	}	439	}
438		440
439	/* Handle player movers. We use move_type for player movers	441	/* Handle player movers. We use move_type for player movers
440	* because they operate on their own time (move_on	442	* because they operate on their own time (move_on
441	* would potentially cause them to be triggered when someone steps	443	* would potentially cause them to be triggered when someone steps
442	* on them). If move_type is set, presume person knows what they	444	* on them). If move_type is set, presume person knows what they
443	* are doing, otherwise, set move_type based on maxhp value.	445	* are doing, otherwise, set move_type based on maxhp value.
444	*/	446	*/
445	if (op->type == PLAYERMOVER)	447	if (type == PLAYERMOVER)
446	{	448	{
447	if (!op->move_type)	449	if (!move_type)
448	{	450	{
449	if (op->stats.maxhp)	451	if (stats.maxhp)
450	{	452	{
451	op->move_type = MOVE_ALL;	453	move_type = MOVE_ALL;
452	op->stats.maxhp = 0;	454	stats.maxhp = 0;
453	}	455	}
454	else	456	else
		457	move_type = MOVE_WALK;
		458	}
		459	}
		460	}
		461
		462	static void
		463	set_move (MoveType &mt, const char *str)
		464	{
		465	static const struct flagstr {
		466	const char *name;
		467	MoveType flags;
		468	} move_flags[] = {
		469	{ "walk" , MOVE_WALK },
		470	{ "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
		471	{ "fly_low" , MOVE_FLY_LOW },
		472	{ "fly_high", MOVE_FLY_HIGH },
		473	{ "swim" , MOVE_SWIM },
		474	{ "boat" , MOVE_BOAT },
		475	{ "ship" , MOVE_SHIP },
		476	{ "all" , MOVE_ALL },
		477	};
		478
		479	if (!str)
		480	{
		481	mt = 0;
		482	return;
		483	}
		484
		485	if (isdigit (*str))
		486	{
		487	mt = atoi (str);
		488	return;
		489	}
		490
		491	mt = 0;
		492
		493	for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
		494	{
		495	bool negate = 0;
		496
		497	if (*str == '-')
		498	{
		499	negate = 1;
		500	str++;
		501	}
		502
		503	for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
		504	{
		505	if (!strcmp (f->name, str))
455	{	506	{
456	op->move_type = MOVE_WALK;	507	if (negate)
		508	mt &= ~f->flags;
		509	else
		510	mt |= f->flags;
		511
		512	goto next;
457	}	513	}
458	}	514	}
459	}
460		515
		516	LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
		517
		518	next: ;
		519	}
461	}	520	}
462		521
463	static void	522	#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
464	set_move (MoveType & mt, const char *str)	523
		524	bool
		525	object::parse_kv (object_thawer &f)
465	{	526	{
466	if (!str)	527	object *op_inv = inv;
467	{	528
468	mt = 0;	529	for (;;)
469	return;
470	}	530	{
471		531	switch (f.kw)
472	if (isdigit (*str))
473	{
474	mt = atoi (str);
475	return;
476	}
477
478	mt = 0;
479
480	for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
481	{
482	if (!strcasecmp (str, "all"))
483	mt |= MOVE_ALL;
484	else
485	{	532	{
486	int i, negate = 0;
487
488	if (*str == '-')
489	{
490	negate = 1;
491	str++;
492	}
493
494	for (i = 0; move_name[i]; i++)
495	{
496	if (!strcasecmp (move_name[i], str))
497	{
498	if (negate)
499	mt &= ~(1 << i);
500	else
501	mt |= (1 << i);
502
503	break;
504	}
505	}
506
507	if (!move_name[i])
508	{
509	/* fly is a special case - covers both fly_low and
510	* fly_high - since it doesn't match to a specific
511	* single bit, have to special case it.
512	*/
513	if (!strcasecmp (str, "flying"))
514	{
515	if (negate)
516	mt &= ~MOVE_FLYING;
517	else
518	mt |= MOVE_FLYING;
519	}
520	else
521	LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str);
522	}
523	}
524	}
525	}
526
527	#define GET_FLAG(op,flag) \
528	if (thawer.get_sint32 ()) \
529	SET_FLAG (op, flag); \
530	else \
531	CLEAR_FLAG (op, flag) \
532
533	int
534	parse_object (object *op, object_thawer &thawer, int map_flags)
535	{
536	bool ismore = 0;
537	object *op_inv = op->inv;
538
539	for (;;)
540	{
541	keyword kw = thawer.get_kv ();
542
543	switch (kw)
544	{
545	case KW_Object: // uppercase alias
546	case KW_object:
547	thawer.get (op->name);
548
549	if (op->arch)
550	op->arch->name = op->name;
551
552	break;
553
554	case KW_uuid:	533	case KW_uuid:
555	if (const char *s = thawer.get_str ())	534	if (const char *s = f.get_str ())
556	{	535	{
557	unsigned int version;	536	unsigned int version;
558	unsigned long long seq;	537	unsigned long long seq;
559		538
560	if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)	539	if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
561	{	540	{
562	op->uuid.seq = seq;	541	uuid.seq = seq;
563	break;	542	break;
564	}	543	}
565	}	544	}
566		545
567	op->uuid = gen_uuid ();	546	uuid = gen_uuid ();
568	break;	547	break;
569		548
570	case KW_oid:	549	case KW_oid:
571	thawer.get (op, thawer.get_sint32 ());	550	f.get (this, f.get_sint32 ());
572	break;	551	break;
573		552
574	case KW_name: thawer.get (op->name); break;	553	case KW_name: f.get (name); break;
575	case KW_name_pl: thawer.get (op->name_pl); break;	554	case KW_name_pl: f.get (name_pl); break;
576	case KW_title: thawer.get (op->title); break;	555	case KW_title: f.get (title); break;
577	case KW_custom_name: thawer.get (op->custom_name); break;	556	case KW_custom_name: f.get (custom_name); break;
578		557
579	case KW_attach: thawer.get_ornull (op->attach); break;	558	case KW_attach: f.get_ornull (attach); break;
580	case KW_skill: thawer.get_ornull (op->skill); break;	559	case KW_skill: f.get_ornull (skill); break;
581	case KW_race: thawer.get_ornull (op->race); break;	560	case KW_race: f.get_ornull (race); break;
582	case KW_slaying: thawer.get_ornull (op->slaying); break;	561	case KW_slaying: f.get_ornull (slaying); break;
583		562
584	case KW_arch:	563	case KW_arch:
585	{	564	{
586	const char *str = thawer.get_str ();
587
588	if (op->arch)
589	{
590	/* If op->arch has been set, then this new object
591	* must be part of the inventory. So process
592	* appropriately.
593	*/
594	archetype *arch = archetype::find (str);
595
596	object *tmp;
597
598	if (arch)
599	tmp = arch_to_object (arch);
600	else
601	{
602	tmp = object::create ();	565	object *tmp = object::read (f);
603	/* record the name of the broken object */
604	tmp->name = str;
605	}
606
607	// decativate the object we, as we are still going
608	// to read the speed value. Objects should be activated
609	// when the map, object or player is completly loaded.
610	tmp->deactivate ();	566	tmp->deactivate ();
611		567
612	parse_object (tmp, thawer, map_flags);
613
614	if (tmp->arch)
615	{	568	{
616	// was: insert_ob_in_ob (tmp, op);	569	// was: insert_ob_in_ob (tmp, op);
617	// but manually adding it can improve map loading times a lot	570	// but manually adding it can improve map loading times a lot
618	// also, appending instead of prepending keeps the	571	// also, appending instead of prepending keeps the
619	// save ordering the same between repeated load/saves.	572	// save ordering the same between repeated load/saves.
620	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);	573	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
621	CLEAR_FLAG (tmp, FLAG_REMOVED);	574	CLEAR_FLAG (tmp, FLAG_REMOVED);
622		575
623	if (!op_inv)	576	if (!op_inv)
624	{	577	{
625	op->inv = tmp;
626	tmp->above = 0;
627	}
628	else
629	{
630	while (op_inv->below)
631	op_inv = op_inv->below;
632
633	op_inv->below = tmp;
634	tmp->above = op_inv;
635	}
636
637	tmp->below = 0;
638	tmp->env = op;
639	op_inv = tmp;	578	inv = tmp;
		579	tmp->above = 0;
640	}	580	}
641	else	581	else
642	{	582	{
643	LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");	583	while (op_inv->below)
644	tmp->destroy ();	584	op_inv = op_inv->below;
		585
		586	op_inv->below = tmp;
		587	tmp->above = op_inv;
645	}	588	}
		589
		590	tmp->below = 0;
		591	tmp->env = this;
		592	op_inv = tmp;
646	}	593	}
647	else
648	{
649	/* This is the actual archetype definition then */
650	op->arch = archetype::find (str);
651
652	if (op->arch)
653	{
654	op->arch->clone.copy_to (op);
655	// copy_to activates, this should be fixed properly
656	op->deactivate ();
657	}
658	else if (!arch_init)
659	/* record the name of the broken object */
660	op->name = str;
661	}
662	}	594	}
663	break;	595	continue;
664		596
665	case KW_other_arch:	597	case KW_other_arch:
		598	other_arch =
		599	loading_arch
		600	? archetype::get (f.get_str ())
666	op->other_arch = archetype::find (thawer.get_str ());	601	: archetype::find (f.get_str ());
		602
		603	if (!other_arch)
		604	LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
667	break;	605	break;
668		606
669	case KW_animation:	607	case KW_animation:
670	{	608	{
		609	CLEAR_FLAG (this, FLAG_ANIMATE);
		610	animation_id = 0;
		611
671	const char *str = thawer.get_str ();	612	const char *str = f.get_str ();
672
673	if (!str)
674	{
675	op->animation_id = 0;
676	CLEAR_FLAG (op, FLAG_ANIMATE);
677	}
678	else if ((op->animation_id = find_animation (str)))	613	if (str && (animation_id = find_animation (str)))
679	SET_FLAG (op, FLAG_ANIMATE);	614	SET_FLAG (this, FLAG_ANIMATE);
680	}	615	}
681
682	break;	616	break;
683		617
684	case KW_last_heal: thawer.get (op->last_heal); break;	618	case KW_last_heal: f.get (last_heal); break;
685	case KW_last_sp: thawer.get (op->last_sp); break;	619	case KW_last_sp: f.get (last_sp); break;
686	case KW_last_grace: thawer.get (op->last_grace); break;	620	case KW_last_grace: f.get (last_grace); break;
687	case KW_last_eat: thawer.get (op->last_eat); break;	621	case KW_last_eat: f.get (last_eat); break;
688	case KW_speed_left: thawer.get (op->speed_left); break;	622	case KW_speed_left: f.get (speed_left); break;
689		623
690	case KW_speed:	624	case KW_speed:
691	thawer.get (op->speed);	625	f.get (speed);
692		626
693	//TODO: maybe do in check_object	627	//TODO: maybe do in check_object
694	// removed check for style maps	628	// removed check for style maps
695	if (op->speed < 0)	629	if (speed < 0)
696	op->speed_left = op->speed_left - rndm ();	630	speed_left = speed_left - rndm ();
697		631
698	break;	632	break;
699		633
700	case KW_slow_move:	634	case KW_slow_move:
701	op->move_slow |= MOVE_WALK;	635	move_slow |= MOVE_WALK;
702	thawer.get (op->move_slow_penalty);	636	f.get (move_slow_penalty);
703	break;	637	break;
704		638
705	case KW_face:	639	case KW_face:
706	op->face = &new_faces[FindFace (thawer.get_str (), 0)];	640	face = face_find (f.get_str ());
707	break;	641	break;
708		642
709	case KW_x: thawer.get (op->x); break;	643	case KW_x: f.get (x); break;
710	case KW_y: thawer.get (op->y); break;	644	case KW_y: f.get (y); break;
711		645
712	case KW_Str: // uppercase alias	646	case KW_Str: // uppercase alias
713	case KW_str: thawer.get (op->stats.Str); break;	647	case KW_str: f.get (stats.Str); break;
714	case KW_Dex: // uppercase alias	648	case KW_Dex: // uppercase alias
715	case KW_dex: thawer.get (op->stats.Dex); break;	649	case KW_dex: f.get (stats.Dex); break;
716	case KW_Con: // uppercase alias	650	case KW_Con: // uppercase alias
717	case KW_con: thawer.get (op->stats.Con); break;	651	case KW_con: f.get (stats.Con); break;
718	case KW_Wis: // uppercase alias	652	case KW_Wis: // uppercase alias
719	case KW_wis: thawer.get (op->stats.Wis); break;	653	case KW_wis: f.get (stats.Wis); break;
720	case KW_Cha: // uppercase alias	654	case KW_Cha: // uppercase alias
721	case KW_cha: thawer.get (op->stats.Cha); break;	655	case KW_cha: f.get (stats.Cha); break;
722	case KW_Int: // uppercase alias	656	case KW_Int: // uppercase alias
723	case KW_int: thawer.get (op->stats.Int); break;	657	case KW_int: f.get (stats.Int); break;
724	case KW_Pow: // uppercase alias	658	case KW_Pow: // uppercase alias
725	case KW_pow: thawer.get (op->stats.Pow); break;	659	case KW_pow: f.get (stats.Pow); break;
726		660
727	case KW_hp: thawer.get (op->stats.hp); break;	661	case KW_hp: f.get (stats.hp); break;
728	case KW_maxhp: thawer.get (op->stats.maxhp); break;	662	case KW_maxhp: f.get (stats.maxhp); break;
729	case KW_sp: thawer.get (op->stats.sp); break;	663	case KW_sp: f.get (stats.sp); break;
730	case KW_maxsp: thawer.get (op->stats.maxsp); break;	664	case KW_maxsp: f.get (stats.maxsp); break;
731	case KW_grace: thawer.get (op->stats.grace); break;	665	case KW_grace: f.get (stats.grace); break;
732	case KW_maxgrace: thawer.get (op->stats.maxgrace); break;	666	case KW_maxgrace: f.get (stats.maxgrace); break;
733		667
734	case KW_exp: thawer.get (op->stats.exp); break;	668	case KW_exp: f.get (stats.exp); break;
735	case KW_perm_exp: thawer.get (op->perm_exp); break;	669	case KW_perm_exp: f.get (perm_exp); break;
736	case KW_food: thawer.get (op->stats.food); break;	670	case KW_food: f.get (stats.food); break;
737	case KW_dam: thawer.get (op->stats.dam); break;	671	case KW_dam: f.get (stats.dam); break;
738	case KW_wc: thawer.get (op->stats.wc); break;	672	case KW_wc: f.get (stats.wc); break;
739	case KW_ac: thawer.get (op->stats.ac); break;	673	case KW_ac: f.get (stats.ac); break;
740	case KW_nrof: thawer.get (op->nrof); break;	674	case KW_nrof: f.get (nrof); break;
741	case KW_level: thawer.get (op->level); break;	675	case KW_level: f.get (level); break;
742	case KW_direction: thawer.get (op->direction); break;	676	case KW_direction: f.get (direction); break;
743	case KW_type: thawer.get (op->type); break;	677	case KW_type: f.get (type); break;
744	case KW_subtype: thawer.get (op->subtype); break;	678	case KW_subtype: f.get (subtype); break;
745	case KW_value: thawer.get (op->value); break;	679	case KW_value: f.get (value); break;
746	case KW_weight: thawer.get (op->weight); break;	680	case KW_weight: f.get (weight); break;
747	case KW_carrying: thawer.get (op->carrying); break;	681	case KW_carrying: f.get (carrying); break;
748	case KW_attacktype: thawer.get (op->attacktype); break;	682	case KW_attacktype: f.get (attacktype); break;
749	case KW_path_attuned: thawer.get (op->path_attuned); break;	683	case KW_path_attuned: f.get (path_attuned); break;
750	case KW_path_repelled: thawer.get (op->path_repelled); break;	684	case KW_path_repelled: f.get (path_repelled); break;
751	case KW_path_denied: thawer.get (op->path_denied); break;	685	case KW_path_denied: f.get (path_denied); break;
752	case KW_invisible: thawer.get (op->invisible); break;	686	case KW_invisible: f.get (invisible); break;
753	case KW_magic: thawer.get (op->magic); break;	687	case KW_magic: f.get (magic); break;
754	case KW_state: thawer.get (op->state); break;	688	case KW_state: f.get (state); break;
755	case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;	689	case KW_move_slow_penalty: f.get (move_slow_penalty); break;
756	case KW_material: thawer.get (op->material); break;	690	case KW_material: f.get (materials); break; //TODO: nuke
757	case KW_materialname: thawer.get (op->materialname); break;	691	case KW_materialname: f.get (materialname); break;
758		692
759	/* These are the new values */	693	/* These are the new values */
760	case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;	694	case KW_move_block: set_move (move_block, f.get_str ()); break;
761	case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;	695	case KW_move_allow: set_move (move_allow, f.get_str ()); break;
762	case KW_move_type: set_move (op->move_type, thawer.get_str ()); break;	696	case KW_move_type: set_move (move_type, f.get_str ()); break;
763	case KW_move_on: set_move (op->move_on, thawer.get_str ()); break;	697	case KW_move_on: set_move (move_on, f.get_str ()); break;
764	case KW_move_off: set_move (op->move_off, thawer.get_str ()); break;	698	case KW_move_off: set_move (move_off, f.get_str ()); break;
765	case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break;	699	case KW_move_slow: set_move (move_slow, f.get_str ()); break;
766		700
767	/* These are all legacy - any new objects should use the move_ .. values */	701	/* These are all legacy - any new objects should use the move_ .. values */
768	case KW_no_pass:	702	case KW_no_pass:
769	{	703	{
770	if (thawer.get_sint32 ())	704	if (f.get_sint32 ())
771	op->move_block = MOVE_ALL;	705	move_block = MOVE_ALL;
772	else	706	else
773	op->move_block = 0;	707	move_block = 0;
774	}	708	}
775		709
776	break;	710	break;
777		711
778	/* These are all legacy - any new objects should use the move_ .. values */	712	/* These are all legacy - any new objects should use the move_ .. values */
779	case KW_walk_on:	713	case KW_walk_on:
780	{	714	{
781	if (thawer.get_sint32 ())	715	if (f.get_sint32 ())
782	op->move_on |= MOVE_WALK;	716	move_on |= MOVE_WALK;
783	else	717	else
784	op->move_on &= ~MOVE_WALK;	718	move_on &= ~MOVE_WALK;
785	}	719	}
786		720
787	break;	721	break;
788		722
789	/* These are all legacy - any new objects should use the move_ .. values */	723	/* These are all legacy - any new objects should use the move_ .. values */
790	case KW_walk_off:	724	case KW_walk_off:
791	{	725	{
792	if (thawer.get_sint32 ())	726	if (f.get_sint32 ())
793	op->move_off |= MOVE_WALK;	727	move_off |= MOVE_WALK;
794	else	728	else
795	op->move_off &= ~MOVE_WALK;	729	move_off &= ~MOVE_WALK;
796	}	730	}
797	break;	731	break;
798		732
799	/* These are all legacy - any new objects should use the move_ .. values */	733	/* These are all legacy - any new objects should use the move_ .. values */
800	case KW_fly_on:	734	case KW_fly_on:
801	{	735	{
802	if (thawer.get_sint32 ())	736	if (f.get_sint32 ())
803	op->move_on |= MOVE_FLY_LOW;	737	move_on |= MOVE_FLY_LOW;
804	else	738	else
805	op->move_on &= ~MOVE_FLY_LOW;	739	move_on &= ~MOVE_FLY_LOW;
806	}	740	}
807	break;	741	break;
808		742
809	/* These are all legacy - any new objects should use the move_ .. values */	743	/* These are all legacy - any new objects should use the move_ .. values */
810	case KW_fly_off:	744	case KW_fly_off:
811	{	745	{
812	if (thawer.get_sint32 ())	746	if (f.get_sint32 ())
813	op->move_off |= MOVE_FLY_LOW;	747	move_off |= MOVE_FLY_LOW;
814	else	748	else
815	op->move_off &= ~MOVE_FLY_LOW;	749	move_off &= ~MOVE_FLY_LOW;
816	}	750	}
817	break;	751	break;
818		752
819	//TODO: remove these after converting archetypes	753	//TODO: remove these after converting archetypes
820	case KW_can_use_wand:	754	case KW_can_use_wand:
821	GET_FLAG (op, FLAG_USE_RANGE);	755	GET_FLAG (this, FLAG_USE_RANGE);
822	break;	756	break;
823		757
824	/* 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 */
825	case KW_flying:	759	case KW_flying:
826	{	760	{
827	if (thawer.get_sint32 ())	761	if (f.get_sint32 ())
828	op->move_type |= MOVE_FLY_LOW;	762	move_type |= MOVE_FLY_LOW;
829	else	763	else
830	op->move_type &= ~MOVE_FLY_LOW;	764	move_type &= ~MOVE_FLY_LOW;
831	}	765	}
832	break;	766	break;
833		767
834		768
835	case KW_identified:	769	case KW_identified:
836	GET_FLAG (op, FLAG_IDENTIFIED);	770	GET_FLAG (this, FLAG_IDENTIFIED);
837	//TODO: move to check_object or so	771	//TODO: move to check_object or so
838	if (QUERY_FLAG (op, FLAG_IDENTIFIED))	772	if (QUERY_FLAG (this, FLAG_IDENTIFIED))
839	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);	773	CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
840		774
841	break;	775	break;
842		776
843	case KW_wiz:	777	case KW_friendly:
844	GET_FLAG (op, FLAG_WIZ);	778	if (f.get_bool ())
845	//TODO: move to check_object	779	if (type != PLAYER)
846	if (QUERY_FLAG (op, FLAG_WIZ))	780	add_friendly_object (this);
		781
		782	break;
		783
		784	case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
		785	case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
		786	case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
		787	case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
		788	case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
		789	case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
		790	case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
		791	case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
		792	case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
		793	case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
		794	case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
		795	case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
		796	case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
		797	case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
		798	case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
		799	case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
		800	case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
		801	case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
		802	case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
		803	case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
		804	case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
		805	case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
		806	case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
		807	case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
		808	case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
		809	case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
		810	case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
		811	case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
		812	case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
		813	case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
		814	case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
		815	case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
		816	case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
		817	case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
		818	case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
		819	case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
		820	case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
		821	case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
		822	case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
		823	case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
		824	case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
		825	case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
		826	case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
		827	case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
		828	case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
		829	case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
		830	case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
		831	case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
		832	case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
		833	case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
		834	case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
		835	case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
		836	case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
		837	case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
		838	case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
		839	case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
		840	case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
		841	case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
		842	case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
		843	case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
		844	case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
		845	case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
		846	case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
		847	case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
		848	case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
		849	case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
		850	case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
		851	case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
		852	case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
		853	case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
		854	case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
		855	case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
		856	case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
		857	case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
		858	case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
		859	case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
		860	case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
		861	case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
		862	case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
		863	case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
		864	case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
		865	case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
		866	case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
		867	case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
		868	case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
		869	case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
		870	case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
		871
		872	case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
		873	case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
		874	case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
		875	case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
		876	case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
		877	case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
		878	case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
		879	case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
		880	case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
		881	case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
		882	case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
		883	case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
		884	case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
		885	case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
		886	case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
		887	case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
		888	case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
		889	case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
		890	case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
		891	case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
		892	case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
		893	case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
		894	case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
		895	case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
		896	case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
		897	case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
		898	case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
		899
		900	case KW_luck: f.get (stats.luck); break;
		901	case KW_run_away: f.get (run_away); break;
		902	case KW_pick_up: f.get (pick_up); break;
		903	case KW_item_power: f.get (item_power); break;
		904	case KW_gen_sp_armour: f.get (gen_sp_armour); break;
		905	case KW_anim_speed: f.get (anim_speed); break;
		906	case KW_container: f.get (weight_limit); break;
		907	case KW_will_apply: f.get (will_apply); break;
		908	case KW_attack_movement: f.get (attack_movement); break;
		909	case KW_move_state: f.get (move_status); break;
		910	case KW_expmul: f.get (expmul); break;
		911	case KW_glow_radius: f.get (glow_radius); break;
		912	case KW_weapontype: f.get (weapontype); break;
		913	case KW_tooltype: f.get (tooltype); break;
		914	case KW_casting_time: f.get (casting_time); break;
		915	case KW_elevation: f.get (elevation); break;
		916	case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
		917	case KW_client_type: f.get (client_type); break;
		918	case KW_duration: f.get (duration); break;
		919	case KW_range: f.get (range); break;
		920	case KW_range_modifier: f.get (range_modifier); break;
		921	case KW_dam_modifier: f.get (dam_modifier); break;
		922	case KW_duration_modifier: f.get (duration_modifier); break;
		923
		924	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
		925	//TODO: parse from other include files
		926	case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
		927	case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
		928	case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
		929	case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
		930	case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
		931	case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
		932	case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
		933	case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
		934	case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
		935	case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
		936	case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
		937	case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
		938	case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
		939	case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
		940	case KW_can_apply:
		941	break;
		942
		943	case KW_connected:
		944	add_button_link (this, map, f.get_sint32 ());
		945	break;
		946
		947	case KW_randomitems:
		948	if (f.get_str ())
847	{	949	{
848	SET_FLAG (op, FLAG_WAS_WIZ);	950	randomitems =
849	SET_FLAG (op, FLAG_WIZPASS);	951	loading_arch
850	SET_FLAG (op, FLAG_WIZCAST);	952	? treasurelist::get (f.get_str ())
		953	: treasurelist::find (f.get_str ());
		954
		955	if (!randomitems)
		956	LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
851	}	957	}
852	else	958	else
		959	randomitems = 0;
		960	break;
		961
		962	case KW_msg:
		963	f.get_ml (KW_endmsg, msg);
		964	//TODO: allow longer messages
		965	if (strlen (msg) >= HUGE_BUF)
853	{	966	{
854	CLEAR_FLAG (op, FLAG_WIZPASS);	967	LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
855	CLEAR_FLAG (op, FLAG_WIZCAST);	968	msg = "ERROR, please report: string too long, winged.\n";
856	}	969	}
857	break;	970	break;
858		971
859	case KW_friendly:
860	if (thawer.get_sint32 ())
861	if (op->type != PLAYER)
862	add_friendly_object (op);
863
864	break;
865
866	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
867	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
868	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
869	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
870	case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
871	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
872	case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
873	case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
874	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
875	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
876	case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
877	case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
878	case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
879	case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
880	case KW_alive: GET_FLAG (op, FLAG_ALIVE); break;
881	case KW_applied: GET_FLAG (op, FLAG_APPLIED); break;
882	case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break;
883	case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break;
884	case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break;
885	case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break;
886	case KW_changing: GET_FLAG (op, FLAG_CHANGING); break;
887	case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break;
888	case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break;
889	case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break;
890	case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break;
891	case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break;
892	case KW_scared: GET_FLAG (op, FLAG_SCARED); break;
893	case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break;
894	case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break;
895	case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break;
896	case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break;
897	case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break;
898	case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
899	case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break;
900	case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break;
901	case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break;
902	case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break;
903	case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break;
904	case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break;
905	case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break;
906	case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break;
907	case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
908	case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
909	case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
910	case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
911	case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
912	case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
913	case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
914	case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
915	case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
916	case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
917	case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
918	case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break;
919	case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
920	case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break;
921	case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break;
922	case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break;
923	case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break;
924	case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break;
925	case KW_cursed: GET_FLAG (op, FLAG_CURSED); break;
926	case KW_damned: GET_FLAG (op, FLAG_DAMNED); break;
927	case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break;
928	case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break;
929	case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break;
930	case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break;
931	case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break;
932	case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break;
933	case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break;
934	case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break;
935	case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break;
936	case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break;
937	case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break;
938	case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break;
939	case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break;
940	case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break;
941	case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break;
942	case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break;
943	case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break;
944	case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break;
945	case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break;
946	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
947	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
948	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
949	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
950	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
951	case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
952
953	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
954	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
955	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
956	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
957	case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break;
958	case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break;
959	case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break;
960	case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break;
961	case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break;
962	case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break;
963	case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break;
964	case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break;
965	case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break;
966	case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break;
967	case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break;
968	case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break;
969	case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break;
970	case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break;
971	case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break;
972	case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break;
973	case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break;
974	case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break;
975	case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break;
976	case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break;
977	case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break;
978	case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break;
979	case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break;
980
981	case KW_luck: thawer.get (op->stats.luck); break;
982	case KW_run_away: thawer.get (op->run_away); break;
983	case KW_pick_up: thawer.get (op->pick_up); break;
984	case KW_item_power: thawer.get (op->item_power); break;
985	case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break;
986	case KW_anim_speed: thawer.get (op->anim_speed); break;
987	case KW_container: thawer.get (op->weight_limit); break;
988	case KW_will_apply: thawer.get (op->will_apply); break;
989	case KW_attack_movement: thawer.get (op->attack_movement); break;
990	case KW_move_state: thawer.get (op->move_status); break;
991	case KW_expmul: thawer.get (op->expmul); break;
992	case KW_glow_radius: thawer.get (op->glow_radius); break;
993	case KW_weapontype: thawer.get (op->weapontype); break;
994	case KW_tooltype: thawer.get (op->tooltype); break;
995	case KW_casting_time: thawer.get (op->casting_time); break;
996	case KW_elevation: thawer.get (op->elevation); break;
997	case KW_smoothlevel: thawer.get (op->smoothlevel); break;
998	case KW_client_type: thawer.get (op->client_type); break;
999	case KW_duration: thawer.get (op->duration); break;
1000	case KW_range: thawer.get (op->range); break;
1001	case KW_range_modifier: thawer.get (op->range_modifier); break;
1002	case KW_dam_modifier: thawer.get (op->dam_modifier); break;
1003	case KW_duration_modifier: thawer.get (op->duration_modifier); break;
1004
1005	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1006	//TODO: parse from other include files
1007	case KW_body_range: thawer.get (op->body_info[0]); break;
1008	case KW_body_arm: thawer.get (op->body_info[1]); break;
1009	case KW_body_torso: thawer.get (op->body_info[2]); break;
1010	case KW_body_head: thawer.get (op->body_info[3]); break;
1011	case KW_body_neck: thawer.get (op->body_info[4]); break;
1012	case KW_body_skill: thawer.get (op->body_info[5]); break;
1013	case KW_body_finger: thawer.get (op->body_info[6]); break;
1014	case KW_body_shoulder: thawer.get (op->body_info[7]); break;
1015	case KW_body_foot: thawer.get (op->body_info[8]); break;
1016	case KW_body_hand: thawer.get (op->body_info[9]); break;
1017	case KW_body_wrist: thawer.get (op->body_info[10]); break;
1018	case KW_body_waist: thawer.get (op->body_info[11]); break;
1019	case KW_can_apply:
1020	break;
1021
1022	case KW_connected:
1023	add_button_link (op, op->map, thawer.get_sint32 ());
1024	break;
1025
1026	case KW_randomitems:
1027	op->randomitems = find_treasurelist (thawer.get_str ());
1028	break;
1029
1030	case KW_msg:
1031	thawer.get_ml (KW_endmsg, op->msg);
1032	//TODO: allow longer messages
1033	if (strlen (op->msg) >= HUGE_BUF)
1034	{
1035	LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
1036	op->msg = "ERROR, please report: string too long, winged.\n";
1037	}
1038	break;
1039
1040	case KW_lore:	972	case KW_lore:
1041	thawer.get_ml (KW_endlore, op->lore);	973	f.get_ml (KW_endlore, lore);
1042	//TODO: allow longer messages	974	//TODO: allow longer messages
1043	/* Just print a warning so we can be reasonably safe	975	/* Just print a warning so we can be reasonably safe
1044	* about not overflowing the buffer.	976	* about not overflowing the buffer.
1045	*/	977	*/
1046	if (strlen (op->lore) > (HUGE_BUF / 2))	978	if (strlen (lore) > (HUGE_BUF / 2))
1047	LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",	979	LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1048	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);	980	HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
1049	break;	981	break;
1050		982
1051	case KW_editable:	983	case KW_editable:
1052	case KW_editor_folder:	984	case KW_editor_folder:
1053	break;	985	break;
1054		986
1055	case KW_More: // uppercase alias
1056	case KW_more:
1057	/* We need to record that this is a multipart object,
1058	* so the calling function can glue things back together
1059	*/
1060	ismore = 1;
1061	break;
1062
1063	case KW_end:	987	case KW_end:
1064	check_loaded_object (op);
1065
1066	if (!arch_init)	988	if (!loading_arch)
1067	op->instantiate ();	989	instantiate ();
1068		990
1069	return ismore ? LL_MORE : LL_NORMAL;	991	f.next ();
1070
1071	case KW_EOF:
1072	return LL_EOF;	992	return true;
1073		993
1074	case KW_ERROR:	994	case KW_ERROR:
1075	set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);	995	set_ob_key_value (this, f.kw_str, f.value, true);
1076	//fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D	996	//fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1077	break;	997	break;
1078		998
1079	default:	999	default:
1080	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);	1000	if (!f.parse_error ("object", name))
		1001	return false;
1081	break;	1002	break;
1082	}	1003	}
		1004
		1005	f.next ();
1083	}	1006	}
1084	}	1007	}
1085		1008
1086	/*	1009	object *
1087	* Loads an object from the given file-pointer.	1010	object::read (object_thawer &f, maptile *map)
1088	* Variables will be read and parsed and patched into the object
1089	* until the string "end" is reached, or the end of the file.
1090	*
1091	* bufstat is used to determine various file attributes:
1092	* LO_REPATE (0): We are reading from the same buffer as the last call.
1093	* LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1094	* will also be reading from this (treasure file, artifacts.)
1095	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1096	* be reset.
1097	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1098	*
1099	*/
1100	int
1101	load_object (object_thawer &fp, object *op, int map_flags)
1102	{	1011	{
1103	coroapi::cede_every (1000); // cede once in a while	1012	assert (f.kw == KW_arch);
1104		1013
1105	return parse_object (op, fp, map_flags);	1014	archetype *arch = archetype::find (f.get_str ());
		1015
		1016	if (!arch)
		1017	{
		1018	LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
		1019	arch = archetype::find ("earthwall");
		1020	}
		1021
		1022	assert (arch); //D maybe use exception handling of sorts?
		1023
		1024	f.next ();
		1025
		1026	object *op = object::create ();
		1027
		1028	op->map = map;
		1029	arch->clone.copy_to (op);
		1030	// copy_to activates, this should be fixed properly
		1031	op->deactivate ();
		1032
		1033	if (!op->parse_kv (f))
		1034	{
		1035	op->destroy (true);
		1036	return 0;
		1037	}
		1038
		1039	op->post_load_check ();
		1040	return op;
1106	}	1041	}
1107		1042
1108	/* This takes a buffer, scans it for variables, and sets those variables	1043	/* This takes a buffer, scans it for variables, and sets those variables
1109	* as appropriate in op.	1044	* as appropriate in op.
1110	*	1045	*
…		…
1112	* override values and in c_wiz to mutate values.	1047	* override values and in c_wiz to mutate values.
1113	*/	1048	*/
1114	int	1049	int
1115	set_variable (object *op, char *buf)	1050	set_variable (object *op, char *buf)
1116	{	1051	{
1117	object_thawer thawer (buf, (AV *)0);	1052	object_thawer f (buf, (AV *)0);
1118		1053
1119	return parse_object (op, thawer, 0);	1054	f.next ();
1120	}	1055	return op->parse_kv (f);
1121
1122	/*
1123	* Initialises the array of variable-names. Needed before any
1124	* objects can be loaded. Called by init_library().
1125	*/
1126
1127	void
1128	init_vars ()
1129	{
1130	}	1056	}
1131		1057
1132	/* This returns a string of the integer movement type */	1058	/* This returns a string of the integer movement type */
1133	#if 0	1059	#if 0
1134	// unused function	1060	// unused function
…		…
1179	return retbuf + 1;	1105	return retbuf + 1;
1180	}	1106	}
1181	#endif	1107	#endif
1182		1108
1183	// compare *op against *tmp and output differences	1109	// compare *op against *tmp and output differences
1184	void	1110	static void
1185	put (object_freezer &f, object *op, object *tmp)	1111	write_diff (object_freezer &f, object *op, object *tmp)
1186	{	1112	{
1187	static const keyword resist_save[NROFATTACKS] = {	1113	static const keyword resist_save[NROFATTACKS] = {
1188	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,	1114	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1189	# include "attackinc.h"	1115	# include "attackinc.h"
1190	# undef def	1116	# undef def
…		…
1195	* the 15'th element of this array should match that name.	1121	* the 15'th element of this array should match that name.
1196	* If an entry is NULL, that is a flag not to loaded/saved.	1122	* If an entry is NULL, that is a flag not to loaded/saved.
1197	*/	1123	*/
1198	static const keyword flag_names [NUM_FLAGS] = {	1124	static const keyword flag_names [NUM_FLAGS] = {
1199	KW_alive,	1125	KW_alive,
1200	KW_wiz,
1201	KW_NULL,	1126	KW_NULL,
1202	KW_NULL,	1127	KW_NULL,
1203	KW_was_wiz,	1128	KW_NULL,
		1129	KW_NULL,
1204	KW_applied,	1130	KW_applied,
1205	KW_unpaid,	1131	KW_unpaid,
1206	KW_can_use_shield,	1132	KW_can_use_shield,
1207	KW_no_pick,	1133	KW_no_pick,
1208	KW_NULL, // walk_on	1134	KW_NULL, // walk_on
…		…
1214	KW_monster,	1140	KW_monster,
1215	KW_friendly,	1141	KW_friendly,
1216	KW_generator,	1142	KW_generator,
1217	KW_is_thrown,	1143	KW_is_thrown,
1218	KW_auto_apply,	1144	KW_auto_apply,
1219	KW_NULL, // was KW_treasure	1145	KW_treasure_env,
1220	KW_player_sold,	1146	KW_player_sold,
1221	/* 20 */	1147	/* 20 */
1222	KW_see_invisible,	1148	KW_see_invisible,
1223	KW_can_roll,	1149	KW_can_roll,
1224	KW_overlay_floor,	1150	KW_overlay_floor,
…		…
1285	KW_can_use_skill,	1211	KW_can_use_skill,
1286	KW_been_applied,	1212	KW_been_applied,
1287	/* 80 */	1213	/* 80 */
1288	KW_has_ready_scroll,	1214	KW_has_ready_scroll,
1289	KW_can_use_rod,	1215	KW_can_use_rod,
1290	KW_NULL,	1216	KW_precious,
1291	KW_can_use_horn,	1217	KW_can_use_horn,
1292	KW_make_invisible,	1218	KW_make_invisible,
1293	KW_inv_locked,	1219	KW_inv_locked,
1294	KW_is_wooded,	1220	KW_is_wooded,
1295	KW_is_hilly,	1221	KW_is_hilly,
…		…
1361	f.put (KW_msg, KW_endmsg, op->msg);	1287	f.put (KW_msg, KW_endmsg, op->msg);
1362	if (op->lore != tmp->lore)	1288	if (op->lore != tmp->lore)
1363	f.put (KW_lore, KW_endlore, op->lore);	1289	f.put (KW_lore, KW_endlore, op->lore);
1364		1290
1365	CMP_OUT (other_arch);	1291	CMP_OUT (other_arch);
1366	CMP_OUT (face);	1292
		1293	if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1367		1294
1368	if (op->animation_id != tmp->animation_id)	1295	if (op->animation_id != tmp->animation_id)
1369	if (op->animation_id)	1296	if (op->animation_id)
1370	{	1297	{
1371	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);	1298	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
…		…
1419	f.put (resist_save[i], op->resist[i]);	1346	f.put (resist_save[i], op->resist[i]);
1420		1347
1421	CMP_OUT (path_attuned);	1348	CMP_OUT (path_attuned);
1422	CMP_OUT (path_repelled);	1349	CMP_OUT (path_repelled);
1423	CMP_OUT (path_denied);	1350	CMP_OUT (path_denied);
1424	CMP_OUT (material);	1351	CMP_OUT2 (material, materials);//TODO: nuke
1425	CMP_OUT (materialname);	1352	CMP_OUT (materialname);
1426	CMP_OUT (value);	1353	CMP_OUT (value);
1427	CMP_OUT (carrying);	1354	CMP_OUT (carrying);
1428	CMP_OUT (weight);	1355	CMP_OUT (weight);
1429	CMP_OUT (invisible);	1356	CMP_OUT (invisible);
…		…
1468	if (op->flag != tmp->flag)	1395	if (op->flag != tmp->flag)
1469	for (i = 0; i <= NUM_FLAGS; i++)	1396	for (i = 0; i <= NUM_FLAGS; i++)
1470	if (flag_names [i] && op->flag [i] != tmp->flag [i])	1397	if (flag_names [i] && op->flag [i] != tmp->flag [i])
1471	f.put (flag_names [i], op->flag [i] ? "1" : "0");	1398	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1472		1399
1473	/* Save body locations */	1400	// save body locations
1474	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1401	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1475	if (op->body_info[i] != tmp->body_info[i])	1402	if (op->slot[i].info != tmp->slot[i].info)
1476	f.put (body_locations[i].save_name, op->body_info[i]);	1403	f.put (body_locations[i].save_name, op->slot[i].info);
1477	}	1404	}
1478		1405
1479	/*	1406	/*
1480	* Dumps all variables in an object to a file.	1407	* Dumps all variables in an object to a file.
1481	* If bit 0 of flag is set, unpaid objects will be saved. As of now,	1408	* If bit 0 of flag is set, unpaid objects will be saved. As of now,
1482	* the only place this is not set is when saving the player.	1409	* the only place this is not set is when saving the player.
1483	*/	1410	*/
1484	void	1411	bool
1485	save_object (object_freezer &fp, object *op, int flag)	1412	object::write (object_freezer &f)
1486	{	1413	{
1487	/* Even if the object does have an owner, it would seem that we should	1414	/* Even if the object does have an owner, it would seem that we should
1488	* still save it.	1415	* still save it.
1489	*/	1416	*/
1490	if (op->owner)	1417	if (owner)
1491	return;	1418	return true;
1492		1419
1493	/* If it is unpaid and we don't want to save those, just return. */
1494	if (!(flag & 1) && op->flag [FLAG_UNPAID])
1495	return;
1496
1497	archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;	1420	archetype *at = arch ? (archetype *)arch : empty_archetype;
1498		1421
1499	fp.put (KW_arch, at->name);	1422	f.put (KW_arch, at->name);
1500	put (fp, op, &at->clone);	1423	write_diff (f, this, &at->clone);
1501		1424
1502	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1503
1504	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1425	for (object *tmp = inv; tmp; tmp = tmp->below)
1505	save_object (fp, tmp, flag);	1426	tmp->write (f);
1506		1427
1507	fp.put (op);	1428	f.put (this);
1508	fp.put (KW_end);	1429	f.put (KW_end);
		1430
		1431	return true;
1509	}	1432	}
1510		1433
		1434	/////////////////////////////////////////////////////////////////////////////
		1435
		1436	// generic resource file load,
		1437	// currently supports: region, treasures, archetypes
		1438	bool load_resource_file (const char *filename)
		1439	{
		1440	object_thawer f (filename);
		1441
		1442	bool success = false;
		1443	bool seen_arch = false;
		1444
		1445	f.next ();
		1446
		1447	for (;;)
		1448	{
		1449	switch (f.kw)
		1450	{
		1451	case KW_region:
		1452	if (!region::read (f))
		1453	goto finish;
		1454	break;
		1455
		1456	case KW_treasure:
		1457	case KW_treasureone:
		1458	if (!treasurelist::read (f))
		1459	goto finish;
		1460	break;
		1461
		1462	case KW_object:
		1463	seen_arch = true;
		1464	if (!archetype::read (f))
		1465	goto finish;
		1466	break;
		1467
		1468	case KW_EOF:
		1469	success = true;
		1470	goto finish;
		1471
		1472	default:
		1473	if (!f.parse_error ("resource file"))
		1474	goto finish;
		1475
		1476	f.next ();
		1477	break;
		1478	}
		1479	}
		1480
		1481	finish:
		1482	if (seen_arch)
		1483	init_archetype_pointers ();
		1484
		1485	return success;
		1486	}
		1487

Diff Legend

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