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.69 by root, Tue Apr 17 18:24:29 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>
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
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		256
289	/* 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
290	* 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
291	* 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
292	* 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.
293	*/	261	*/
294	static void	262	static void
295	check_loaded_object (object *op)	263	check_loaded_object (object *op)
296	{	264	{
297	int ip;
298
299	/* We do some specialized handling to handle legacy cases of name_pl.	265	/* 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 -	266	* 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	267	* 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	268	* 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	269	* 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.	270	* 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	271	* Otherwise, what happens is that the the plural name will lose
306	* information (appear as just 'hearts' and not 'goblins heart')	272	* information (appear as just 'hearts' and not 'goblins heart')
307	*/	273	*/
308	if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)	274	if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)
309	op->name_pl = NULL;	275	op->name_pl = 0;
310		276
311	if (!op->name_pl)	277	if (!op->name_pl)
312	op->name_pl = op->name;	278	op->name_pl = op->name;
313		279
314	/* objects now have a materialname. try to patch it in */	280	/* objects now have a materialname. try to patch it in */
315	if (!(IS_WEAPON (op) && op->level > 0))	281	if (!(op->is_weapon () && op->level > 0))
316	{	282	{
317	if (op->map != NULL)	283	if (op->map != NULL)
318	set_materialname (op, op->map->difficulty, NULL);	284	set_materialname (op, op->map->difficulty, NULL);
319	else	285	else
320	set_materialname (op, 5, NULL);	286	set_materialname (op, 5, NULL);
321	}	287	}
		288
322	/* only do these when program is first run - a bit	289	/* only do these when program is first run - a bit
323	* excessive to do this at every run - most of this is	290	* excessive to do this at every run - most of this is
324	* really just to catch any errors - program will still run, but	291	* really just to catch any errors - program will still run, but
325	* not in the ideal fashion.	292	* not in the ideal fashion.
326	*/	293	*/
327	if ((op->type == WEAPON || op->type == BOW) && arch_init)	294	if ((op->type == WEAPON || op->type == BOW) && loading_arch)
328	{	295	{
329	if (!op->skill)	296	if (!op->skill)
330	{
331	LOG (llevError, "Weapon %s lacks a skill.\n", op_debug_info (op));	297	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) ||	298	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))	299	(!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);	300	LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
337	}
338	}	301	}
339		302
340	/* We changed last_heal to gen_sp_armour, which is what it	303	/* We changed last_heal to gen_sp_armour, which is what it
341	* really does for many objects. Need to catch any in maps	304	* really does for many objects. Need to catch any in maps
342	* that may have an old value.	305	* that may have an old value.
343	*/	306	*/
344	if ((op->type == WEAPON) ||	307	if (op->type == WEAPON
345	(op->type == ARMOUR) || (op->type == HELMET) ||	308	|| op->type == ARMOUR || op->type == HELMET
346	(op->type == SHIELD) || (op->type == RING) ||	309	|| op->type == SHIELD || op->type == RING
347	(op->type == BOOTS) || (op->type == GLOVES) ||	310	|| op->type == BOOTS || op->type == GLOVES
348	(op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))	311	|| op->type == AMULET || op->type == GIRDLE
		312	|| op->type == BRACERS || op->type == CLOAK)
349	{	313	{
350	if (op->last_heal)	314	if (op->last_heal)
351	{	315	{
352	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op_debug_info (op));	316	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;	317	op->gen_sp_armour = op->last_heal;
354	op->last_heal = 0;	318	op->last_heal = 0;
355	}	319	}
356	if (editor)	320
357	ip = 0;
358	else
359	ip = calc_item_power (op, 0);	321	int ip = calc_item_power (op, 0);
		322
360	/* Legacy objects from before item power was in the game */	323	/* Legacy objects from before item power was in the game */
361	if (!op->item_power && ip)	324	if (!op->item_power && ip)
362	{	325	{
363	if (ip > 3)	326	if (ip > 3)
364	{
365	LOG (llevDebug, "Object %s had no item power, using %d\n", op_debug_info (op), ip);	327	LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
366	}	328
367	op->item_power = ip;	329	op->item_power = ip;
368	}	330	}
		331
369	/* Check for possibly bogus values. Has to meet both these criteria -	332	/* 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	333	* 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.	334	* 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,	335	* similarly, it item_power is 0, the first check will always pass,
373	* but not the second one.	336	* but not the second one.
374	*/	337	*/
375	if (ip > 2 * op->item_power && ip > (op->item_power + 3))	338	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);	339	LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
378	}
379
380	}	340	}
		341
381	/* Old spellcasting object - need to load in the appropiate object */	342	/* 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 ||	343	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 */	344	/* 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)	345	((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !loading_arch)
385	{	346	{
386	object *tmp;
387
388	/* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'	347	/* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
389	* in that spell was stored in sp.	348	* in that spell was stored in sp.
390	*/	349	*/
391	tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);	350	object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
392	insert_ob_in_ob (tmp, op);	351	insert_ob_in_ob (tmp, op);
393	op->randomitems = NULL; /* So another spell isn't created for this object */	352	op->randomitems = NULL; /* So another spell isn't created for this object */
394	}	353	}
		354
395	/* spellbooks & runes use slaying. But not to arch name, but to spell name */	355	/* 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)	356	if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !loading_arch)
398	{	357	{
399	object *tmp;
400
401	tmp = get_archetype_by_object_name (op->slaying);	358	object *tmp = get_archetype_by_object_name (op->slaying);
402	insert_ob_in_ob (tmp, op);	359	insert_ob_in_ob (tmp, op);
403	op->randomitems = NULL; /* So another spell isn't created for this object */	360	op->randomitems = NULL; /* So another spell isn't created for this object */
404	/* without this, value is all screwed up */	361	/* without this, value is all screwed up */
405	op->value = op->arch->clone.value * op->inv->value;	362	op->value = op->arch->clone.value * op->inv->value;
406	}	363	}
407		364
408	if (QUERY_FLAG (op, FLAG_MONSTER))	365	if (QUERY_FLAG (op, FLAG_MONSTER))
409	{	366	{
410	if (op->stats.hp > op->stats.maxhp)	367	if (op->stats.hp > op->stats.maxhp)
		368	{
411	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op_debug_info (op), op->stats.hp, op->stats.maxhp);	369	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
		370	op->stats.maxhp = op->stats.hp;
		371	}
412		372
413	/* The archs just need to be updated for this */	373	/* The archs just need to be updated for this */
414	if (op->move_type == 0)	374	if (op->move_type == 0)
415	op->move_type = MOVE_WALK;	375	op->move_type = MOVE_WALK;
416	}	376	}
		377
417	if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)	378	if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)
418	{	379	{
419	/* Object will duplicate it's content as part of the	380	/* Object will duplicate it's content as part of the
420	* generation process. To do this, we must flag inventory	381	* generation process. To do this, we must flag inventory
421	* so it remains unevaluated concerning the randomitems and	382	* so it remains unevaluated concerning the randomitems and
…		…
438	{	399	{
439	op->move_type = MOVE_ALL;	400	op->move_type = MOVE_ALL;
440	op->stats.maxhp = 0;	401	op->stats.maxhp = 0;
441	}	402	}
442	else	403	else
		404	op->move_type = MOVE_WALK;
		405	}
		406	}
		407
		408	}
		409
		410	static void
		411	set_move (MoveType &mt, const char *str)
		412	{
		413	static const struct flagstr {
		414	const char *name;
		415	MoveType flags;
		416	} move_flags[] = {
		417	{ "walk" , MOVE_WALK },
		418	{ "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
		419	{ "fly_low" , MOVE_FLY_LOW },
		420	{ "fly_high", MOVE_FLY_HIGH },
		421	{ "swim" , MOVE_SWIM },
		422	{ "boat" , MOVE_BOAT },
		423	{ "all" , MOVE_ALL },
		424	};
		425
		426	if (!str)
		427	{
		428	mt = 0;
		429	return;
		430	}
		431
		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	bool negate = 0;
		443
		444	if (*str == '-')
		445	{
		446	negate = 1;
		447	str++;
		448	}
		449
		450	for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
		451	{
		452	if (!strcmp (f->name, str))
443	{	453	{
444	op->move_type = MOVE_WALK;	454	if (negate)
		455	mt &= ~f->flags;
		456	else
		457	mt |= f->flags;
		458
		459	goto next;
445	}	460	}
446	}	461	}
447	}
448		462
		463	LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
		464
		465	next: ;
		466	}
449	}	467	}
450		468
451	static void
452	set_move (MoveType & mt, const char *str)
453	{
454	if (!str)
455	{
456	mt = 0;
457	return;
458	}
459
460	if (isdigit (*str))
461	{
462	mt = atoi (str);
463	return;
464	}
465
466	mt = 0;
467
468	for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
469	{
470	if (!strcasecmp (str, "all"))
471	mt |= MOVE_ALL;
472	else
473	{
474	int i, negate = 0;
475
476	if (*str == '-')
477	{
478	negate = 1;
479	str++;
480	}
481
482	for (i = 0; move_name[i]; i++)
483	{
484	if (!strcasecmp (move_name[i], str))
485	{
486	if (negate)
487	mt &= ~(1 << i);
488	else
489	mt |= (1 << i);
490
491	break;
492	}
493	}
494
495	if (!move_name[i])
496	{
497	/* fly is a special case - covers both fly_low and
498	* fly_high - since it doesn't match to a specific
499	* single bit, have to special case it.
500	*/
501	if (!strcasecmp (str, "flying"))
502	{
503	if (negate)
504	mt &= ~MOVE_FLYING;
505	else
506	mt |= MOVE_FLYING;
507	}
508	else
509	LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str);
510	}
511	}
512	}
513	}
514
515	#define GET_FLAG(op,flag) \	469	#define GET_FLAG(op,flag) \
516	if (thawer.get_sint32 ()) \	470	if (f.get_sint32 ()) \
517	SET_FLAG (op, flag); \	471	SET_FLAG (op, flag); \
518	else \	472	else \
519	CLEAR_FLAG (op, flag) \	473	CLEAR_FLAG (op, flag) \
520		474
521	int	475	bool
522	parse_object (object *op, object_thawer & thawer, int map_flags)	476	object::parse_kv (object_thawer &f)
523	{	477	{
524	bool ismore = 0;	478	assert (f.kw == KW_object || f.kw == KW_arch);
		479
		480	if (f.kw == KW_object)
		481	f.get (name); // preset name from object name
		482
		483	f.next ();
		484
525	object *op_inv = op->inv;	485	object *op_inv = inv;
526		486
527	for (;;)	487	for (;;)
528	{	488	{
529	keyword kw = thawer.get_kv ();
530
531	switch (kw)	489	switch (f.kw)
532	{	490	{
533	case KW_Object: // uppercase alias
534	case KW_object:
535	thawer.get (op->name);
536
537	if (op->arch != NULL)
538	op->arch->name = op->name;
539
540	break;
541
542	case KW_oid:	491	case KW_uuid:
543	thawer.get (op, thawer.get_sint32 ());	492	if (const char *s = f.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	{	493	{
573	const char *str = thawer.get_str ();	494	unsigned int version;
		495	unsigned long long seq;
574		496
575	if (op->arch)	497	if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
576	{	498	{
577	/* If op->arch has been set, then this new object	499	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	500	break;
588	{
589	tmp = get_object ();
590	/* record the name of the broken object */
591	tmp->name = str;
592	}	501	}
		502	}
593		503
594	parse_object (tmp, thawer, map_flags);	504	uuid = gen_uuid ();
		505	break;
595		506
596	if (tmp->arch)	507	case KW_oid:
		508	f.get (this, f.get_sint32 ());
		509	break;
		510
		511	case KW_name: f.get (name); break;
		512	case KW_name_pl: f.get (name_pl); break;
		513	case KW_title: f.get (title); break;
		514	case KW_custom_name: f.get (custom_name); break;
		515
		516	case KW_attach: f.get_ornull (attach); break;
		517	case KW_skill: f.get_ornull (skill); break;
		518	case KW_race: f.get_ornull (race); break;
		519	case KW_slaying: f.get_ornull (slaying); break;
		520
		521	case KW_arch:
		522	{
		523	object *tmp = object::read (f);
		524	tmp->deactivate ();
		525
597	{	526	{
598	// was: insert_ob_in_ob (tmp, op);	527	// was: insert_ob_in_ob (tmp, op);
599	// but manually adding it can improve map loading times a lot	528	// but manually adding it can improve map loading times a lot
600	// also, appending instead of prepending keeps the	529	// also, appending instead of prepending keeps the
601	// save ordering the same between repeated load/saves.	530	// save ordering the same between repeated load/saves.
602	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);	531	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
603	CLEAR_FLAG (tmp, FLAG_REMOVED);	532	CLEAR_FLAG (tmp, FLAG_REMOVED);
604		533
605	if (!op_inv)	534	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	{	535	{
625	LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
626	free_object (tmp);
627	}	536	inv = tmp;
		537	tmp->above = 0;
628	}	538	}
629	else	539	else
630	{	540	{
631	/* This is the actual archetype definition then */	541	while (op_inv->below)
632	op->arch = find_archetype (str);	542	op_inv = op_inv->below;
633		543
634	if (op->arch != NULL)	544	op_inv->below = tmp;
635	copy_object (&op->arch->clone, op);	545	tmp->above = op_inv;
636	else if (!arch_init)
637	/* record the name of the broken object */
638	op->name = str;
639	}	546	}
		547
		548	tmp->below = 0;
		549	tmp->env = this;
		550	op_inv = tmp;
640	}	551	}
641	break;	552	}
		553	continue;
642		554
643	case KW_other_arch:	555	case KW_other_arch:
644	op->other_arch = find_archetype (thawer.get_str ());	556	other_arch =
		557	loading_arch
		558	? archetype::get (f.get_str ())
		559	: archetype::find (f.get_str ());
		560
		561	if (!other_arch)
		562	LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
645	break;	563	break;
646		564
647	case KW_animation:	565	case KW_animation:
		566	{
		567	CLEAR_FLAG (this, FLAG_ANIMATE);
		568	animation_id = 0;
		569
		570	const char *str = f.get_str ();
		571	if (str && (animation_id = find_animation (str)))
		572	SET_FLAG (this, FLAG_ANIMATE);
		573	}
		574	break;
		575
		576	case KW_last_heal: f.get (last_heal); break;
		577	case KW_last_sp: f.get (last_sp); break;
		578	case KW_last_grace: f.get (last_grace); break;
		579	case KW_last_eat: f.get (last_eat); break;
		580	case KW_speed_left: f.get (speed_left); break;
		581
		582	case KW_speed:
		583	f.get (speed);
		584
		585	//TODO: maybe do in check_object
		586	// removed check for style maps
		587	if (speed < 0)
		588	speed_left = speed_left - rndm ();
		589
		590	break;
		591
		592	case KW_slow_move:
		593	move_slow |= MOVE_WALK;
		594	f.get (move_slow_penalty);
		595	break;
		596
		597	case KW_face:
		598	face = face_find (f.get_str ());
		599	break;
		600
		601	case KW_x: f.get (x); break;
		602	case KW_y: f.get (y); break;
		603
		604	case KW_Str: // uppercase alias
		605	case KW_str: f.get (stats.Str); break;
		606	case KW_Dex: // uppercase alias
		607	case KW_dex: f.get (stats.Dex); break;
		608	case KW_Con: // uppercase alias
		609	case KW_con: f.get (stats.Con); break;
		610	case KW_Wis: // uppercase alias
		611	case KW_wis: f.get (stats.Wis); break;
		612	case KW_Cha: // uppercase alias
		613	case KW_cha: f.get (stats.Cha); break;
		614	case KW_Int: // uppercase alias
		615	case KW_int: f.get (stats.Int); break;
		616	case KW_Pow: // uppercase alias
		617	case KW_pow: f.get (stats.Pow); break;
		618
		619	case KW_hp: f.get (stats.hp); break;
		620	case KW_maxhp: f.get (stats.maxhp); break;
		621	case KW_sp: f.get (stats.sp); break;
		622	case KW_maxsp: f.get (stats.maxsp); break;
		623	case KW_grace: f.get (stats.grace); break;
		624	case KW_maxgrace: f.get (stats.maxgrace); break;
		625
		626	case KW_exp: f.get (stats.exp); break;
		627	case KW_perm_exp: f.get (perm_exp); break;
		628	case KW_food: f.get (stats.food); break;
		629	case KW_dam: f.get (stats.dam); break;
		630	case KW_wc: f.get (stats.wc); break;
		631	case KW_ac: f.get (stats.ac); break;
		632	case KW_nrof: f.get (nrof); break;
		633	case KW_level: f.get (level); break;
		634	case KW_direction: f.get (direction); break;
		635	case KW_type: f.get (type); break;
		636	case KW_subtype: f.get (subtype); break;
		637	case KW_value: f.get (value); break;
		638	case KW_weight: f.get (weight); break;
		639	case KW_carrying: f.get (carrying); break;
		640	case KW_attacktype: f.get (attacktype); break;
		641	case KW_path_attuned: f.get (path_attuned); break;
		642	case KW_path_repelled: f.get (path_repelled); break;
		643	case KW_path_denied: f.get (path_denied); break;
		644	case KW_invisible: f.get (invisible); break;
		645	case KW_magic: f.get (magic); break;
		646	case KW_state: f.get (state); break;
		647	case KW_move_slow_penalty: f.get (move_slow_penalty); break;
		648	case KW_material: f.get (materials); break; //TODO: nuke
		649	case KW_materialname: f.get (materialname); break;
		650
		651	/* These are the new values */
		652	case KW_move_block: set_move (move_block, f.get_str ()); break;
		653	case KW_move_allow: set_move (move_allow, f.get_str ()); break;
		654	case KW_move_type: set_move (move_type, f.get_str ()); break;
		655	case KW_move_on: set_move (move_on, f.get_str ()); break;
		656	case KW_move_off: set_move (move_off, f.get_str ()); break;
		657	case KW_move_slow: set_move (move_slow, f.get_str ()); break;
		658
		659	/* These are all legacy - any new objects should use the move_ .. values */
		660	case KW_no_pass:
		661	{
		662	if (f.get_sint32 ())
		663	move_block = MOVE_ALL;
		664	else
		665	move_block = 0;
		666	}
		667
		668	break;
		669
		670	/* These are all legacy - any new objects should use the move_ .. values */
		671	case KW_walk_on:
		672	{
		673	if (f.get_sint32 ())
		674	move_on |= MOVE_WALK;
		675	else
		676	move_on &= ~MOVE_WALK;
		677	}
		678
		679	break;
		680
		681	/* These are all legacy - any new objects should use the move_ .. values */
		682	case KW_walk_off:
		683	{
		684	if (f.get_sint32 ())
		685	move_off |= MOVE_WALK;
		686	else
		687	move_off &= ~MOVE_WALK;
		688	}
		689	break;
		690
		691	/* These are all legacy - any new objects should use the move_ .. values */
		692	case KW_fly_on:
		693	{
		694	if (f.get_sint32 ())
		695	move_on |= MOVE_FLY_LOW;
		696	else
		697	move_on &= ~MOVE_FLY_LOW;
		698	}
		699	break;
		700
		701	/* These are all legacy - any new objects should use the move_ .. values */
		702	case KW_fly_off:
		703	{
		704	if (f.get_sint32 ())
		705	move_off |= MOVE_FLY_LOW;
		706	else
		707	move_off &= ~MOVE_FLY_LOW;
		708	}
		709	break;
		710
		711	//TODO: remove these after converting archetypes
		712	case KW_can_use_wand:
		713	GET_FLAG (this, FLAG_USE_RANGE);
		714	break;
		715
		716	/* These are all legacy - any new objects should use the move_ .. values */
		717	case KW_flying:
		718	{
		719	if (f.get_sint32 ())
		720	move_type |= MOVE_FLY_LOW;
		721	else
		722	move_type &= ~MOVE_FLY_LOW;
		723	}
		724	break;
		725
		726
		727	case KW_identified:
		728	GET_FLAG (this, FLAG_IDENTIFIED);
		729	//TODO: move to check_object or so
		730	if (QUERY_FLAG (this, FLAG_IDENTIFIED))
		731	CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
		732
		733	break;
		734
		735	case KW_wiz:
		736	GET_FLAG (this, FLAG_WIZ);
		737	//TODO: move to check_object
		738	if (QUERY_FLAG (this, FLAG_WIZ))
648	{	739	{
649	const char *str = thawer.get_str ();
650
651	if (!str)
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);	740	SET_FLAG (this, FLAG_WAS_WIZ);
660	}	741	SET_FLAG (this, FLAG_WIZPASS);
		742	SET_FLAG (this, FLAG_WIZCAST);
661	}	743	}
662		744	else
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	{
687	if (op->speed < 0)
688	op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
689
690	update_ob_speed (op);
691	}
692
693	break;
694
695	case KW_slow_move:
696	op->move_slow |= MOVE_WALK;
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	{	745	{
853	if (thawer.get_sint32 ())	746	CLEAR_FLAG (this, FLAG_WIZPASS);
854	op->move_block = MOVE_ALL;	747	CLEAR_FLAG (this, FLAG_WIZCAST);
855	else
856	op->move_block = 0;
857	}	748	}
858
859	break;	749	break;
860		750
861	/* These are all legacy - any new objects should use the move_ .. values */	751	case KW_friendly:
		752	if (f.get_sint32 ())
		753	if (type != PLAYER)
		754	add_friendly_object (this);
		755
		756	break;
		757
		758	case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
		759	case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
		760	case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
		761	case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
		762	case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
		763	case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
		764	case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
		765	case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
		766	case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
		767	case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
		768	case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
		769	case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
		770	case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
		771	case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
		772	case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
		773	case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
		774	case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
		775	case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
		776	case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
		777	case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
		778	case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
		779	case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
		780	case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
		781	case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
		782	case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
		783	case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
		784	case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
		785	case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
		786	case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
		787	case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
		788	case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
		789	case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
		790	case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
		791	case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
		792	case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
		793	case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
		794	case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
		795	case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
		796	case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
		797	case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
		798	case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
		799	case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
		800	case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
		801	case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
		802	case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
		803	case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
		804	case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
		805	case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
		806	case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
		807	case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
		808	case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
		809	case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
		810	case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
		811	case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
		812	case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
		813	case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
		814	case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
		815	case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
		816	case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
		817	case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
		818	case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
		819	case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
		820	case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
		821	case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
		822	case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
		823	case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
		824	case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
		825	case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
		826	case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
		827	case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
		828	case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
		829	case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
		830	case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
		831	case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
		832	case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
		833	case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
		834	case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
		835	case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
		836	case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
		837	case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
		838	case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
		839	case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
		840	case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
		841	case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
		842	case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
		843	case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
		844
		845	case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
		846	case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
		847	case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
		848	case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
		849	case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
		850	case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
		851	case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
		852	case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
		853	case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
		854	case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
		855	case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
		856	case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
		857	case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
		858	case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
		859	case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
		860	case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
		861	case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
		862	case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
		863	case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
		864	case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
		865	case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
		866	case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
		867	case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
		868	case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
		869	case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
		870	case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
		871	case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
		872
		873	case KW_luck: f.get (stats.luck); break;
		874	case KW_run_away: f.get (run_away); break;
		875	case KW_pick_up: f.get (pick_up); break;
		876	case KW_item_power: f.get (item_power); break;
		877	case KW_gen_sp_armour: f.get (gen_sp_armour); break;
		878	case KW_anim_speed: f.get (anim_speed); break;
		879	case KW_container: f.get (weight_limit); break;
		880	case KW_will_apply: f.get (will_apply); break;
		881	case KW_attack_movement: f.get (attack_movement); break;
		882	case KW_move_state: f.get (move_status); break;
		883	case KW_expmul: f.get (expmul); break;
		884	case KW_glow_radius: f.get (glow_radius); break;
		885	case KW_weapontype: f.get (weapontype); break;
		886	case KW_tooltype: f.get (tooltype); break;
		887	case KW_casting_time: f.get (casting_time); break;
		888	case KW_elevation: f.get (elevation); break;
		889	case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
		890	case KW_client_type: f.get (client_type); break;
		891	case KW_duration: f.get (duration); break;
		892	case KW_range: f.get (range); break;
		893	case KW_range_modifier: f.get (range_modifier); break;
		894	case KW_dam_modifier: f.get (dam_modifier); break;
		895	case KW_duration_modifier: f.get (duration_modifier); break;
		896
		897	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
		898	//TODO: parse from other include files
		899	case KW_body_range: f.get (body_info[0]); break;
		900	case KW_body_arm: f.get (body_info[1]); break;
		901	case KW_body_torso: f.get (body_info[2]); break;
		902	case KW_body_head: f.get (body_info[3]); break;
		903	case KW_body_neck: f.get (body_info[4]); break;
		904	case KW_body_skill: f.get (body_info[5]); break;
		905	case KW_body_finger: f.get (body_info[6]); break;
		906	case KW_body_shoulder: f.get (body_info[7]); break;
		907	case KW_body_foot: f.get (body_info[8]); break;
		908	case KW_body_hand: f.get (body_info[9]); break;
		909	case KW_body_wrist: f.get (body_info[10]); break;
		910	case KW_body_waist: f.get (body_info[11]); break;
862	case KW_walk_on:	911	case KW_can_apply:
		912	break;
		913
		914	case KW_connected:
		915	add_button_link (this, map, f.get_sint32 ());
		916	break;
		917
		918	case KW_randomitems:
		919	if (f.get_str ())
863	{	920	{
864	if (thawer.get_sint32 ())	921	randomitems =
865	op->move_on |= MOVE_WALK;	922	loading_arch
866	else	923	? treasurelist::get (f.get_str ())
867	op->move_on &= ~MOVE_WALK;	924	: treasurelist::find (f.get_str ());
		925
		926	if (!randomitems)
		927	LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
868	}	928	}
869
870	break;	929	break;
871		930
872	/* These are all legacy - any new objects should use the move_ .. values */	931	case KW_msg:
873	case KW_walk_off:	932	f.get_ml (KW_endmsg, msg);
		933	//TODO: allow longer messages
		934	if (strlen (msg) >= HUGE_BUF)
874	{	935	{
875	if (thawer.get_sint32 ())	936	LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
876	op->move_off |= MOVE_WALK;	937	msg = "ERROR, please report: string too long, winged.\n";
877	else
878	op->move_off &= ~MOVE_WALK;
879	}	938	}
880	break;	939	break;
881		940
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	{
931	SET_FLAG (op, FLAG_WAS_WIZ);
932	SET_FLAG (op, FLAG_WIZPASS);
933	SET_FLAG (op, FLAG_WIZCAST);
934	}
935	else
936	{
937	CLEAR_FLAG (op, FLAG_WIZPASS);
938	CLEAR_FLAG (op, FLAG_WIZCAST);
939	}
940	break;
941
942	case KW_friendly:
943	GET_FLAG (op, FLAG_FRIENDLY);
944	//TODO: move to check_object or so
945	if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
946	add_friendly_object (op);
947	break;
948
949	case KW_monster:
950	GET_FLAG (op, FLAG_MONSTER);
951	break;
952	case KW_neutral:
953	GET_FLAG (op, FLAG_NEUTRAL);
954	break;
955	case KW_no_attack:
956	GET_FLAG (op, FLAG_NO_ATTACK);
957	break;
958	case KW_no_damage:
959	GET_FLAG (op, FLAG_NO_DAMAGE);
960	break;
961	case KW_generator:
962	GET_FLAG (op, FLAG_GENERATOR);
963	break;
964	case KW_use_content_on_gen:
965	GET_FLAG (op, FLAG_CONTENT_ON_GEN);
966	break;
967	case KW_is_thrown:
968	GET_FLAG (op, FLAG_IS_THROWN);
969	break;
970	case KW_auto_apply:
971	GET_FLAG (op, FLAG_AUTO_APPLY);
972	break;
973	case KW_treasure:
974	GET_FLAG (op, FLAG_TREASURE);
975	break;
976	case KW_see_invisible:
977	GET_FLAG (op, FLAG_SEE_INVISIBLE);
978	break;
979	case KW_can_roll:
980	GET_FLAG (op, FLAG_CAN_ROLL);
981	break;
982	case KW_overlay_floor:
983	GET_FLAG (op, FLAG_OVERLAY_FLOOR);
984	break;
985	case KW_is_turnable:
986	GET_FLAG (op, FLAG_IS_TURNABLE);
987	break;
988	case KW_is_used_up:
989	GET_FLAG (op, FLAG_IS_USED_UP);
990	break;
991	case KW_alive:
992	GET_FLAG (op, FLAG_ALIVE);
993	break;
994	case KW_applied:
995	GET_FLAG (op, FLAG_APPLIED);
996	break;
997	case KW_unpaid:
998	GET_FLAG (op, FLAG_UNPAID);
999	break;
1000	case KW_is_animated:
1001	GET_FLAG (op, FLAG_ANIMATE);
1002	break;
1003	case KW_no_pick:
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);
1113	break;
1114	case KW_activate_on_release:
1115	GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE);
1116	break;
1117	case KW_confused:
1118	GET_FLAG (op, FLAG_CONFUSED);
1119	break;
1120	case KW_stealth:
1121	GET_FLAG (op, FLAG_STEALTH);
1122	break;
1123	case KW_cursed:
1124	GET_FLAG (op, FLAG_CURSED);
1125	break;
1126	case KW_damned:
1127	GET_FLAG (op, FLAG_DAMNED);
1128	break;
1129	case KW_see_anywhere:
1130	GET_FLAG (op, FLAG_SEE_ANYWHERE);
1131	break;
1132	case KW_known_magical:
1133	GET_FLAG (op, FLAG_KNOWN_MAGICAL);
1134	break;
1135	case KW_known_cursed:
1136	GET_FLAG (op, FLAG_KNOWN_CURSED);
1137	break;
1138	case KW_can_use_skill:
1139	GET_FLAG (op, FLAG_CAN_USE_SKILL);
1140	break;
1141	case KW_been_applied:
1142	GET_FLAG (op, FLAG_BEEN_APPLIED);
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
1202	case KW_armour:
1203	thawer.get (op->resist[ATNR_PHYSICAL]);
1204	break;
1205	case KW_resist_physical:
1206	thawer.get (op->resist[ATNR_PHYSICAL]);
1207	break;
1208	case KW_resist_magic:
1209	thawer.get (op->resist[ATNR_MAGIC]);
1210	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]);
1216	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]);
1222	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]);
1228	break;
1229	case KW_resist_weaponmagic:
1230	thawer.get (op->resist[ATNR_WEAPONMAGIC]);
1231	break;
1232	case KW_resist_ghosthit:
1233	thawer.get (op->resist[ATNR_GHOSTHIT]);
1234	break;
1235	case KW_resist_poison:
1236	thawer.get (op->resist[ATNR_POISON]);
1237	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]);
1243	break;
1244	case KW_resist_turn_undead:
1245	thawer.get (op->resist[ATNR_TURN_UNDEAD]);
1246	break;
1247	case KW_resist_fear:
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]);
1255	break;
1256	case KW_resist_death:
1257	thawer.get (op->resist[ATNR_DEATH]);
1258	break;
1259	case KW_resist_chaos:
1260	thawer.get (op->resist[ATNR_CHAOS]);
1261	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]);
1267	break;
1268	case KW_resist_holyword:
1269	thawer.get (op->resist[ATNR_HOLYWORD]);
1270	break;
1271	case KW_resist_blind:
1272	thawer.get (op->resist[ATNR_BLIND]);
1273	break;
1274	case KW_resist_internal:
1275	thawer.get (op->resist[ATNR_INTERNAL]);
1276	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]);
1282	break;
1283
1284	case KW_luck:
1285	thawer.get (op->stats.luck);
1286	break;
1287	case KW_run_away:
1288	thawer.get (op->run_away);
1289	break;
1290	case KW_pick_up:
1291	thawer.get (op->pick_up);
1292	break;
1293	case KW_item_power:
1294	thawer.get (op->item_power);
1295	break;
1296	case KW_gen_sp_armour:
1297	thawer.get (op->gen_sp_armour);
1298	break;
1299	case KW_anim_speed:
1300	thawer.get (op->anim_speed);
1301	break;
1302	case KW_container:
1303	thawer.get (op->weight_limit);
1304	break;
1305	case KW_will_apply:
1306	thawer.get (op->will_apply);
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
1354	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1355	//TODO: parse from other include files
1356	case KW_body_range:
1357	thawer.get (op->body_info[0]);
1358	break;
1359	case KW_body_arm:
1360	thawer.get (op->body_info[1]);
1361	break;
1362	case KW_body_torso:
1363	thawer.get (op->body_info[2]);
1364	break;
1365	case KW_body_head:
1366	thawer.get (op->body_info[3]);
1367	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:
1393	break;
1394
1395	case KW_connected:
1396	add_button_link (op, op->map, thawer.get_sint32 ());
1397	break;
1398
1399	case KW_randomitems:
1400	op->randomitems = find_treasurelist (thawer.get_str ());
1401	break;
1402
1403	case KW_msg:
1404	{
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);
1410	op->msg = "ERROR, please report: string too long, winged.\n";
1411	}
1412	}
1413	break;
1414
1415	case KW_lore:	941	case KW_lore:
1416	{
1417	shstr msgbuf;
1418
1419	thawer.get_ml (KW_endlore, op->lore);	942	f.get_ml (KW_endlore, lore);
1420	//TODO: allow longer messages	943	//TODO: allow longer messages
1421	/* Just print a warning so we can be reasonably safe	944	/* Just print a warning so we can be reasonably safe
1422	* about not overflowing the buffer.	945	* about not overflowing the buffer.
1423	*/	946	*/
1424	if (strlen (op->lore) > (HUGE_BUF / 2))	947	if (strlen (lore) > (HUGE_BUF / 2))
1425	LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",	948	LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1426	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);	949	HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
1427	}
1428	break;	950	break;
1429		951
1430	case KW_editable:	952	case KW_editable:
1431	case KW_editor_folder:	953	case KW_editor_folder:
1432	break;	954	break;
1433		955
1434	case KW_More: // uppercase alias
1435	case KW_more:
1436	/* We need to record that this is a multipart object,
1437	* so the calling function can glue things back together
1438	*/
1439	ismore = 1;
1440	break;
1441
1442	case KW_end:	956	case KW_end:
1443	check_loaded_object (op);	957	check_loaded_object (this);
1444		958
1445	if (!arch_init)	959	if (!loading_arch)
1446	op->instantiate ();	960	instantiate ();
1447		961
1448	return ismore ? LL_MORE : LL_NORMAL;	962	f.next ();
1449
1450	case KW_EOF:
1451	return LL_EOF;	963	return true;
1452		964
1453	case KW_ERROR:	965	case KW_ERROR:
1454	set_ob_key_value (op, thawer.line, thawer.last_value, true);	966	set_ob_key_value (this, f.kw_str, f.value, true);
1455	//printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D	967	//fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.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;	968	break;
1464		969
1465	default:	970	default:
1466	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);	971	if (!f.parse_error ("object", name))
		972	return false;
1467	break;	973	break;
1468	}	974	}
		975
		976	f.next ();
1469	}	977	}
1470	}	978	}
1471		979
1472	/*	980	object *
1473	* Loads an object from the given file-pointer.	981	object::read (object_thawer &f, maptile *map)
1474	* Variables will be read and parsed and patched into the object
1475	* until the string "end" is reached, or the end of the file.
1476	*
1477	* bufstat is used to determine various file attributes:
1478	* LO_REPATE (0): We are reading from the same buffer as the last call.
1479	* LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1480	* will also be reading from this (treasure file, artifacts.)
1481	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1482	* be reset.
1483	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1484	*
1485	*/
1486
1487	int
1488	load_object (object_thawer & fp, object *op, int map_flags)
1489	{	982	{
1490	return parse_object (op, fp, map_flags);	983	assert (f.kw == KW_arch);
		984
		985	archetype *arch = archetype::find (f.get_str ());
		986
		987	if (!arch)
		988	{
		989	LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
		990	arch = archetype::find ("earthwall");
		991	}
		992
		993	assert (arch); //D maybe use exception handling of sorts?
		994
		995	object *op = object::create ();
		996
		997	op->map = map;
		998	arch->clone.copy_to (op);
		999	// copy_to activates, this should be fixed properly
		1000	op->deactivate ();
		1001
		1002	if (!op->parse_kv (f))
		1003	{
		1004	op->destroy (true);
		1005	return 0;
		1006	}
		1007
		1008	return op;
1491	}	1009	}
1492
1493		1010
1494	/* This takes a buffer, scans it for variables, and sets those variables	1011	/* This takes a buffer, scans it for variables, and sets those variables
1495	* as appropriate in op.	1012	* as appropriate in op.
1496	*	1013	*
1497	* This function appears to be used in only 2 places - in crossedit to	1014	* This function appears to be used in only 2 places - in crossedit to
1498	* override values and in c_wiz to mutate values.	1015	* override values and in c_wiz to mutate values.
1499	*/	1016	*/
1500	int	1017	int
1501	set_variable (object *op, char *buf)	1018	set_variable (object *op, char *buf)
1502	{	1019	{
1503	return 0;	1020	object_thawer f (buf, (AV *)0);
1504	#if 0
1505	int retval;
1506	object_thawer thawer (0);
1507		1021
1508	strcpy (msgbuf, "");	1022	f.kw = KW_arch; // special hack so that parse_kv skips
1509	strcpy (lorebuf, "");	1023	return op->parse_kv (f);
1510	retval = 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	}
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
1562	/*
1563	* Initialises the array of variable-names. Needed before any
1564	* objects can be loaded. Called by init_library().
1565	*/
1566
1567	void
1568	init_vars ()
1569	{
1570	}	1024	}
1571		1025
1572	/* This returns a string of the integer movement type */	1026	/* This returns a string of the integer movement type */
1573	#if 0	1027	#if 0
1574	// unused function	1028	// unused function
…		…
1619	return retbuf + 1;	1073	return retbuf + 1;
1620	}	1074	}
1621	#endif	1075	#endif
1622		1076
1623	// compare *op against *tmp and output differences	1077	// compare *op against *tmp and output differences
1624	void	1078	static void
1625	put (object_freezer & f, object *op, object *tmp)	1079	write_diff (object_freezer &f, object *op, object *tmp)
1626	{	1080	{
		1081	static const keyword resist_save[NROFATTACKS] = {
		1082	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
		1083	# include "attackinc.h"
		1084	# undef def
		1085	};
		1086
		1087	/* This is a list of keywords that correspond to the FLAG_.. values.
		1088	* This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
		1089	* the 15'th element of this array should match that name.
		1090	* If an entry is NULL, that is a flag not to loaded/saved.
		1091	*/
		1092	static const keyword flag_names [NUM_FLAGS] = {
		1093	KW_alive,
		1094	KW_wiz,
		1095	KW_NULL,
		1096	KW_NULL,
		1097	KW_was_wiz,
		1098	KW_applied,
		1099	KW_unpaid,
		1100	KW_can_use_shield,
		1101	KW_no_pick,
		1102	KW_NULL, // walk_on
		1103	KW_NULL, // no_pass
		1104	/* 10 */
		1105	KW_is_animated,
		1106	KW_NULL, // slow_move
		1107	KW_NULL, // flying
		1108	KW_monster,
		1109	KW_friendly,
		1110	KW_generator,
		1111	KW_is_thrown,
		1112	KW_auto_apply,
		1113	KW_NULL, // was KW_treasure
		1114	KW_player_sold,
		1115	/* 20 */
		1116	KW_see_invisible,
		1117	KW_can_roll,
		1118	KW_overlay_floor,
		1119	KW_is_turnable,
		1120	KW_NULL, // walk_off
		1121	KW_NULL, // fly_on
		1122	KW_NULL, // fly_off
		1123	KW_is_used_up,
		1124	KW_identified,
		1125	KW_reflecting,
		1126	/* 30 */
		1127	KW_changing,
		1128	KW_splitting,
		1129	KW_hitback,
		1130	KW_startequip,
		1131	KW_blocksview,
		1132	KW_undead,
		1133	KW_scared,
		1134	KW_unaggressive,
		1135	KW_reflect_missile,
		1136	KW_reflect_spell,
		1137	/* 40 */
		1138	KW_no_magic,
		1139	KW_no_fix_player,
		1140	KW_is_lightable,
		1141	KW_tear_down,
		1142	KW_run_away,
		1143	KW_NULL, // pass_thru
		1144	KW_NULL, // an_pass_thru
		1145	KW_pick_up,
		1146	KW_unique,
		1147	KW_no_drop,
		1148	/* 50 */
		1149	KW_NULL, // wizcast
		1150	KW_can_cast_spell,
		1151	KW_can_use_scroll,
		1152	KW_can_use_range,
		1153	KW_can_use_bow,
		1154	KW_can_use_armour,
		1155	KW_can_use_weapon,
		1156	KW_can_use_ring,
		1157	KW_has_ready_range,
		1158	KW_has_ready_bow,
		1159	/* 60 */
		1160	KW_xrays,
		1161	KW_NULL,
		1162	KW_is_floor,
		1163	KW_lifesave,
		1164	KW_no_strength,
		1165	KW_sleep,
		1166	KW_stand_still,
		1167	KW_random_move,
		1168	KW_only_attack,
		1169	KW_confused,
		1170	/* 70 */
		1171	KW_stealth,
		1172	KW_NULL,
		1173	KW_NULL,
		1174	KW_cursed,
		1175	KW_damned,
		1176	KW_see_anywhere,
		1177	KW_known_magical,
		1178	KW_known_cursed,
		1179	KW_can_use_skill,
		1180	KW_been_applied,
		1181	/* 80 */
		1182	KW_has_ready_scroll,
		1183	KW_can_use_rod,
		1184	KW_NULL,
		1185	KW_can_use_horn,
		1186	KW_make_invisible,
		1187	KW_inv_locked,
		1188	KW_is_wooded,
		1189	KW_is_hilly,
		1190	KW_has_ready_skill,
		1191	KW_has_ready_weapon,
		1192	/* 90 */
		1193	KW_no_skill_ident,
		1194	KW_is_blind,
		1195	KW_can_see_in_dark,
		1196	KW_is_cauldron,
		1197	KW_NULL,
		1198	KW_no_steal,
		1199	KW_one_hit,
		1200	KW_NULL,
		1201	KW_berserk,
		1202	KW_neutral,
		1203	/* 100 */
		1204	KW_no_attack,
		1205	KW_no_damage,
		1206	KW_obj_original,
		1207	KW_NULL,
		1208	KW_activate_on_push,
		1209	KW_activate_on_release,
		1210	KW_is_water,
		1211	KW_use_content_on_gen,
		1212	KW_NULL,
		1213	KW_is_buildable,
		1214	/* 110 */
		1215	KW_destroy_on_death,
		1216	KW_NULL,
		1217	};
		1218
1627	int i;	1219	int i;
1628		1220
1629	/* This saves the key/value lists. We do it first so that any	1221	/* 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.	1222	* keys that match field names will be overwritten by the loader.
1631	*/	1223	*/
1632	for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next)	1224	for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1633	{	1225	{
1634	/* Find the field in the opposing member. */	1226	/* Find the field in the opposing member. */
1635	key_value *arch_field = get_ob_key_link (tmp, my_field->key);	1227	key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1636		1228
1637	/* If there's no partnering field, or it's got a different value, save our field. */	1229	/* 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)	1230	if (!arch_field || my_field->value != arch_field->value)
1639	f.put (my_field->key, my_field->value);	1231	f.put (my_field->key, my_field->value);
1640	}	1232	}
1641		1233
1642	/* We don't need to worry about the arch's extra fields - they	1234	/* We don't need to worry about the arch's extra fields - they
1643	* will get taken care of the copy_object function.	1235	* will get taken care of the copy_to method.
1644	*/	1236	*/
		1237
		1238	{
		1239	char uids[64];
		1240	snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
		1241	f.put (KW_uuid, (const char *)uids);
		1242	}
1645		1243
1646	#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v)	1244	#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)	1245	#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v)
1648		1246
1649	CMP_OUT (name);	1247	CMP_OUT (name);
…		…
1657	f.put (KW_msg, KW_endmsg, op->msg);	1255	f.put (KW_msg, KW_endmsg, op->msg);
1658	if (op->lore != tmp->lore)	1256	if (op->lore != tmp->lore)
1659	f.put (KW_lore, KW_endlore, op->lore);	1257	f.put (KW_lore, KW_endlore, op->lore);
1660		1258
1661	CMP_OUT (other_arch);	1259	CMP_OUT (other_arch);
1662	CMP_OUT (face);
1663		1260
1664	if (!op->face || !op->face->name)	1261	if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
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		1262
1667	if (op->animation_id != tmp->animation_id)	1263	if (op->animation_id != tmp->animation_id)
1668	if (op->animation_id)	1264	if (op->animation_id)
1669	{	1265	{
1670	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);	1266	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
…		…
1718	f.put (resist_save[i], op->resist[i]);	1314	f.put (resist_save[i], op->resist[i]);
1719		1315
1720	CMP_OUT (path_attuned);	1316	CMP_OUT (path_attuned);
1721	CMP_OUT (path_repelled);	1317	CMP_OUT (path_repelled);
1722	CMP_OUT (path_denied);	1318	CMP_OUT (path_denied);
1723	CMP_OUT (material);	1319	CMP_OUT2 (material, materials);//TODO: nuke
1724	CMP_OUT (materialname);	1320	CMP_OUT (materialname);
1725	CMP_OUT (value);	1321	CMP_OUT (value);
1726	CMP_OUT (carrying);	1322	CMP_OUT (carrying);
1727	CMP_OUT (weight);	1323	CMP_OUT (weight);
1728	CMP_OUT (invisible);	1324	CMP_OUT (invisible);
…		…
1762	CMP_OUT (move_on);	1358	CMP_OUT (move_on);
1763	CMP_OUT (move_off);	1359	CMP_OUT (move_off);
1764	CMP_OUT (move_slow);	1360	CMP_OUT (move_slow);
1765	CMP_OUT (move_slow_penalty);	1361	CMP_OUT (move_slow_penalty);
1766		1362
1767	if (!COMPARE_FLAGS (op, tmp))	1363	if (op->flag != tmp->flag)
1768	for (i = 0; i <= NUM_FLAGS; i++)	1364	for (i = 0; i <= NUM_FLAGS; i++)
1769	if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))	1365	if (flag_names [i] && op->flag [i] != tmp->flag [i])
1770	f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0");	1366	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1771		1367
1772	/* Save body locations */	1368	/* Save body locations */
1773	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1369	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1774	if (op->body_info[i] != tmp->body_info[i])	1370	if (op->body_info[i] != tmp->body_info[i])
1775	f.put (body_locations[i].save_name, op->body_info[i]);	1371	f.put (body_locations[i].save_name, op->body_info[i]);
…		…
1777		1373
1778	/*	1374	/*
1779	* Dumps all variables in an object to a file.	1375	* 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,	1376	* 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.	1377	* 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	*/	1378	*/
1785		1379	bool
1786	void	1380	object::write (object_freezer &f)
1787	save_object (object_freezer & fp, object *op, int flag)
1788	{	1381	{
1789	archetype *at;
1790	object *tmp, *old;
1791
1792	/* Even if the object does have an owner, it would seem that we should	1382	/* Even if the object does have an owner, it would seem that we should
1793	* still save it.	1383	* still save it.
1794	*/	1384	*/
1795	if (op->owner)	1385	if (owner)
1796	return;	1386	return true;
1797		1387
1798	/* If it is unpaid and we don't want to save those, just return. */	1388	archetype *at = arch ? (archetype *)arch : empty_archetype;
1799	if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))
1800	return;
1801		1389
1802	if ((at = op->arch) == NULL)
1803	at = empty_archetype;
1804
1805	fp.put (KW_arch, at->name);	1390	f.put (KW_arch, at->name);
		1391	write_diff (f, this, &at->clone);
1806		1392
1807	put (fp, op, &at->clone);
1808
1809	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1810
1811	old = NULL;
1812
1813	if (flag & 2)
1814	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1393	for (object *tmp = inv; tmp; tmp = tmp->below)
1815	save_object (fp, tmp, flag);	1394	tmp->write (f);
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		1395
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
1840	fp.put (op);	1396	f.put (this);
1841	fprintf (fp, "end\n");	1397	f.put (KW_end);
		1398
		1399	return true;
1842	}	1400	}
		1401
		1402	/////////////////////////////////////////////////////////////////////////////
		1403
		1404	// generic resource file load,
		1405	// currently supports: region, treasures
		1406	bool load_resource_file (const char *filename)
		1407	{
		1408	object_thawer f (filename);
		1409
		1410	f.next ();
		1411
		1412	for (;;)
		1413	{
		1414	switch (f.kw)
		1415	{
		1416	case KW_region:
		1417	if (!region::read (f))
		1418	return false;
		1419	break;
		1420
		1421	case KW_treasure:
		1422	case KW_treasureone:
		1423	if (!treasurelist::read (f))
		1424	return false;
		1425	break;
		1426
		1427	case KW_EOF:
		1428	return true;
		1429
		1430	default:
		1431	if (!f.parse_error ("resource file"))
		1432	return false;
		1433	}
		1434	}
		1435	}
		1436

Diff Legend

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