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.38 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.84 by root, Tue May 22 10:49:58 2007 UTC

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

Diff Legend

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