ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/loader.C

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

Diff Legend

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