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.14 by root, Tue Sep 12 19:20:06 2006 UTC vs.
Revision 1.88 by root, Mon Jun 4 13:04:00 2007 UTC

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