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.13 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.57 by root, Sat Feb 10 01:52:25 2007 UTC

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

Diff Legend

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