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.31 by root, Sat Dec 30 10:16:10 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
28		27
29		28
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	/* Maps the MOVE_* values to names */
36	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };	34	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
37		35
…		…
255	NULL	253	NULL
256	};	254	};
257		255
258	extern int arch_init;	256	extern int arch_init;
259		257
260	// return a suitable strign describign an objetc in enough detail to find it
261	// used only in check_loaded_object: TODO remove static, move it elsewhere and
262	// use it in more log messages.
263	static char *
264	op_debug_info_ (object *op, char *info)
265	{
266	char info2[256 * 3];
267	char *p = info;
268
269	p += snprintf (p, 256, "%d=\"%s%s%s\"",
270	op->count, op->name ? (const char *) op->name : "(anon)", op->title ? " " : "", op->title ? (const char *) op->title : "");
271
272	if (op->env)
273	p += snprintf (p, 256, "(in %s)", op_debug_info_ (op->env, info2));
274
275	if (op->map)
276	p += snprintf (p, 256, "(on %s@%d+%d)", op->map->path, op->x, op->y);
277
278	return info;
279	}
280
281	static char *
282	op_debug_info (object *op)
283	{
284	static char info[256 * 3];
285
286	return op_debug_info_ (op, info);
287	}
288
289	/* This function checks the object after it has been loaded (when we	258	/* 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	259	* 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	260	* 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.	261	* to check for objects to make sure there are no common errors.
293	*/	262	*/
…		…
310		279
311	if (!op->name_pl)	280	if (!op->name_pl)
312	op->name_pl = op->name;	281	op->name_pl = op->name;
313		282
314	/* objects now have a materialname. try to patch it in */	283	/* objects now have a materialname. try to patch it in */
315	if (!(IS_WEAPON (op) && op->level > 0))	284	if (!(op->is_weapon () && op->level > 0))
316	{	285	{
317	if (op->map != NULL)	286	if (op->map != NULL)
318	set_materialname (op, op->map->difficulty, NULL);	287	set_materialname (op, op->map->difficulty, NULL);
319	else	288	else
320	set_materialname (op, 5, NULL);	289	set_materialname (op, 5, NULL);
…		…
326	*/	295	*/
327	if ((op->type == WEAPON || op->type == BOW) && arch_init)	296	if ((op->type == WEAPON || op->type == BOW) && arch_init)
328	{	297	{
329	if (!op->skill)	298	if (!op->skill)
330	{	299	{
331	LOG (llevError, "Weapon %s lacks a skill.\n", op_debug_info (op));	300	LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
332	}	301	}
333	else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||	302	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))	303	(!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
335	{	304	{
336	LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op_debug_info (op), op->body_info[1], &op->skill);	305	LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
337	}	306	}
338	}	307	}
339		308
340	/* We changed last_heal to gen_sp_armour, which is what it	309	/* We changed last_heal to gen_sp_armour, which is what it
341	* really does for many objects. Need to catch any in maps	310	* really does for many objects. Need to catch any in maps
…		…
347	(op->type == BOOTS) || (op->type == GLOVES) ||	316	(op->type == BOOTS) || (op->type == GLOVES) ||
348	(op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))	317	(op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))
349	{	318	{
350	if (op->last_heal)	319	if (op->last_heal)
351	{	320	{
352	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op_debug_info (op));	321	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;	322	op->gen_sp_armour = op->last_heal;
354	op->last_heal = 0;	323	op->last_heal = 0;
355	}	324	}
356	if (editor)	325	if (editor)
357	ip = 0;	326	ip = 0;
…		…
360	/* Legacy objects from before item power was in the game */	329	/* Legacy objects from before item power was in the game */
361	if (!op->item_power && ip)	330	if (!op->item_power && ip)
362	{	331	{
363	if (ip > 3)	332	if (ip > 3)
364	{	333	{
365	LOG (llevDebug, "Object %s had no item power, using %d\n", op_debug_info (op), ip);	334	LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
366	}	335	}
367	op->item_power = ip;	336	op->item_power = ip;
368	}	337	}
369	/* Check for possibly bogus values. Has to meet both these criteria -	338	/* 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	339	* something that has item_power 1 is probably just fine if our calculated
…		…
372	* similarly, it item_power is 0, the first check will always pass,	341	* similarly, it item_power is 0, the first check will always pass,
373	* but not the second one.	342	* but not the second one.
374	*/	343	*/
375	if (ip > 2 * op->item_power && ip > (op->item_power + 3))	344	if (ip > 2 * op->item_power && ip > (op->item_power + 3))
376	{	345	{
377	LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op_debug_info (op), ip, op->item_power);	346	LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
378	}	347	}
379		348
380	}	349	}
381	/* Old spellcasting object - need to load in the appropiate object */	350	/* 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 ||	351	if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
…		…
406	}	375	}
407		376
408	if (QUERY_FLAG (op, FLAG_MONSTER))	377	if (QUERY_FLAG (op, FLAG_MONSTER))
409	{	378	{
410	if (op->stats.hp > op->stats.maxhp)	379	if (op->stats.hp > op->stats.maxhp)
411	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op_debug_info (op), op->stats.hp, op->stats.maxhp);	380	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
412		381
413	/* The archs just need to be updated for this */	382	/* The archs just need to be updated for this */
414	if (op->move_type == 0)	383	if (op->move_type == 0)
415	op->move_type = MOVE_WALK;	384	op->move_type = MOVE_WALK;
416	}	385	}
		386
417	if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)	387	if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)
418	{	388	{
419	/* Object will duplicate it's content as part of the	389	/* Object will duplicate it's content as part of the
420	* generation process. To do this, we must flag inventory	390	* generation process. To do this, we must flag inventory
421	* so it remains unevaluated concerning the randomitems and	391	* so it remains unevaluated concerning the randomitems and
…		…
517	SET_FLAG (op, flag); \	487	SET_FLAG (op, flag); \
518	else \	488	else \
519	CLEAR_FLAG (op, flag) \	489	CLEAR_FLAG (op, flag) \
520		490
521	int	491	int
522	parse_object (object *op, object_thawer & thawer, int map_flags)	492	parse_object (object *op, object_thawer &thawer, int map_flags)
523	{	493	{
524	bool ismore = 0;	494	bool ismore = 0;
525	object *op_inv = op->inv;	495	object *op_inv = op->inv;
526		496
527	for (;;)	497	for (;;)
528	{	498	{
529	keyword kw = thawer.get_kv ();	499	keyword kw = thawer.get_kv ();
530		500
531	switch (kw)	501	switch (kw)
532	{	502	{
533	case KW_Object: // uppercase alias	503	case KW_Object: // uppercase alias
534	case KW_object:	504	case KW_object:
535	thawer.get (op->name);	505	thawer.get (op->name);
536		506
537	if (op->arch != NULL)	507	if (op->arch)
538	op->arch->name = op->name;	508	op->arch->name = op->name;
539		509
540	break;	510	break;
541		511
542	case KW_oid:	512	case KW_uuid:
543	thawer.get (op, thawer.get_sint32 ());	513	if (const char *s = thawer.get_str ())
544	break;
545
546	case KW_name:
547	thawer.get (op->name);
548	break;
549	case KW_name_pl:
550	thawer.get (op->name_pl);
551	break;
552	case KW_title:
553	thawer.get (op->title);
554	break;
555	case KW_custom_name:
556	thawer.get (op->custom_name);
557	break;
558	case KW_attach:
559	thawer.get_ornull (op->attach);
560	break;
561	case KW_skill:
562	thawer.get_ornull (op->skill);
563	break;
564	case KW_race:
565	thawer.get_ornull (op->race);
566	break;
567	case KW_slaying:
568	thawer.get_ornull (op->slaying);
569	break;
570
571	case KW_arch:
572	{	514	{
573	const char *str = thawer.get_str ();	515	unsigned int version;
		516	unsigned long long seq;
574		517
575	if (op->arch)	518	if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
576	{	519	{
577	/* If op->arch has been set, then this new object	520	op->uuid.seq = seq;
578	* must be part of the inventory. So process
579	* appropriately.
580	*/
581	archetype *arch = find_archetype (str);
582
583	object *tmp;
584
585	if (arch != NULL)
586	tmp = arch_to_object (arch);
587	else	521	break;
588	{
589	tmp = get_object ();
590	/* record the name of the broken object */
591	tmp->name = str;
592	}
593
594	parse_object (tmp, thawer, map_flags);
595
596	if (tmp->arch)
597	{
598	// was: insert_ob_in_ob (tmp, op);
599	// but manually adding it can improve map loading times a lot
600	// also, appending instead of prepending keeps the
601	// save ordering the same between repeated load/saves.
602	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
603	CLEAR_FLAG (tmp, FLAG_REMOVED);
604
605	if (!op_inv)
606	{
607	op->inv = tmp;
608	tmp->above = 0;
609	}
610	else
611	{
612	while (op_inv->below)
613	op_inv = op_inv->below;
614
615	op_inv->below = tmp;
616	tmp->above = op_inv;
617	}
618
619	tmp->below = 0;
620	tmp->env = op;
621	op_inv = tmp;
622	}
623	else
624	{
625	LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
626	free_object (tmp);
627	}
628	}
629	else
630	{
631	/* This is the actual archetype definition then */
632	op->arch = find_archetype (str);
633
634	if (op->arch != NULL)
635	copy_object (&op->arch->clone, op);
636	else if (!arch_init)
637	/* record the name of the broken object */
638	op->name = str;
639	}	522	}
640	}	523	}
		524
		525	op->uuid = gen_uuid ();
641	break;	526	break;
642		527
643	case KW_other_arch:	528	case KW_oid:
644	op->other_arch = find_archetype (thawer.get_str ());	529	thawer.get (op, thawer.get_sint32 ());
645	break;	530	break;
646		531
		532	case KW_name: thawer.get (op->name); break;
		533	case KW_name_pl: thawer.get (op->name_pl); break;
		534	case KW_title: thawer.get (op->title); break;
		535	case KW_custom_name: thawer.get (op->custom_name); break;
		536
		537	case KW_attach: thawer.get_ornull (op->attach); break;
		538	case KW_skill: thawer.get_ornull (op->skill); break;
		539	case KW_race: thawer.get_ornull (op->race); break;
		540	case KW_slaying: thawer.get_ornull (op->slaying); break;
		541
647	case KW_animation:	542	case KW_arch:
648	{	543	{
649	const char *str = thawer.get_str ();	544	const char *str = thawer.get_str ();
650		545
651	if (!str)	546	if (op->arch)
652	{
653	op->animation_id = 0;
654	CLEAR_FLAG (op, FLAG_ANIMATE);
655	}
656	else
657	{
658	op->animation_id = find_animation (str);
659	SET_FLAG (op, FLAG_ANIMATE);
660	}
661	}
662
663	break;
664
665	case KW_last_heal:
666	thawer.get (op->last_heal);
667	break;
668	case KW_last_sp:
669	thawer.get (op->last_sp);
670	break;
671	case KW_last_grace:
672	thawer.get (op->last_grace);
673	break;
674	case KW_last_eat:
675	thawer.get (op->last_eat);
676	break;
677	case KW_speed_left:
678	thawer.get (op->speed_left);
679	break;
680
681	case KW_speed:
682	thawer.get (op->speed);
683
684	//TODO: maybe do in check_object
685	if (!(map_flags & MAP_STYLE))
686	{	547	{
687	if (op->speed < 0)	548	/* If op->arch has been set, then this new object
688	op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;	549	* must be part of the inventory. So process
689		550	* appropriately.
690	update_ob_speed (op);
691	}	551	*/
		552	archetype *arch = archetype::find (str);
692		553
693	break;	554	object *tmp;
694		555
695	case KW_slow_move:	556	if (arch != NULL)
696	op->move_slow |= MOVE_WALK;	557	tmp = arch_to_object (arch);
697	thawer.get (op->move_slow_penalty);
698	break;
699
700	case KW_face:
701	op->face = &new_faces[FindFace (thawer.get_str (), 0)];
702	break;
703
704	case KW_x:
705	thawer.get (op->x);
706	break;
707	case KW_y:
708	thawer.get (op->y);
709	break;
710	case KW_Str: // uppercase alias
711	case KW_str:
712	thawer.get (op->stats.Str);
713	break;
714	case KW_Dex: // uppercase alias
715	case KW_dex:
716	thawer.get (op->stats.Dex);
717	break;
718	case KW_Con: // uppercase alias
719	case KW_con:
720	thawer.get (op->stats.Con);
721	break;
722	case KW_Wis: // uppercase alias
723	case KW_wis:
724	thawer.get (op->stats.Wis);
725	break;
726	case KW_Cha: // uppercase alias
727	case KW_cha:
728	thawer.get (op->stats.Cha);
729	break;
730	case KW_Int: // uppercase alias
731	case KW_int:
732	thawer.get (op->stats.Int);
733	break;
734	case KW_Pow: // uppercase alias
735	case KW_pow:
736	thawer.get (op->stats.Pow);
737	break;
738	case KW_hp:
739	thawer.get (op->stats.hp);
740	break;
741	case KW_maxhp:
742	thawer.get (op->stats.maxhp);
743	break;
744	case KW_sp:
745	thawer.get (op->stats.sp);
746	break;
747	case KW_maxsp:
748	thawer.get (op->stats.maxsp);
749	break;
750	case KW_grace:
751	thawer.get (op->stats.grace);
752	break;
753	case KW_maxgrace:
754	thawer.get (op->stats.maxgrace);
755	break;
756
757	case KW_exp:
758	thawer.get (op->stats.exp);
759	break;
760	case KW_perm_exp:
761	thawer.get (op->perm_exp);
762	break;
763	case KW_food:
764	thawer.get (op->stats.food);
765	break;
766	case KW_dam:
767	thawer.get (op->stats.dam);
768	break;
769	case KW_wc:
770	thawer.get (op->stats.wc);
771	break;
772	case KW_ac:
773	thawer.get (op->stats.ac);
774	break;
775	case KW_nrof:
776	thawer.get (op->nrof);
777	break;
778	case KW_level:
779	thawer.get (op->level);
780	break;
781	case KW_direction:
782	thawer.get (op->direction);
783	break;
784	case KW_type:
785	thawer.get (op->type);
786	break;
787	case KW_subtype:
788	thawer.get (op->subtype);
789	break;
790	case KW_value:
791	thawer.get (op->value);
792	break;
793	case KW_weight:
794	thawer.get (op->weight);
795	break;
796	case KW_carrying:
797	thawer.get (op->carrying);
798	break;
799	case KW_attacktype:
800	thawer.get (op->attacktype);
801	break;
802	case KW_path_attuned:
803	thawer.get (op->path_attuned);
804	break;
805	case KW_path_repelled:
806	thawer.get (op->path_repelled);
807	break;
808	case KW_path_denied:
809	thawer.get (op->path_denied);
810	break;
811	case KW_invisible:
812	thawer.get (op->invisible);
813	break;
814	case KW_magic:
815	thawer.get (op->magic);
816	break;
817	case KW_state:
818	thawer.get (op->state);
819	break;
820	case KW_move_slow_penalty:
821	thawer.get (op->move_slow_penalty);
822	break;
823	case KW_material:
824	thawer.get (op->material);
825	break;
826	case KW_materialname:
827	thawer.get (op->materialname);
828	break;
829
830	/* These are the new values */
831	case KW_move_block:
832	set_move (op->move_block, thawer.get_str ());
833	break;
834	case KW_move_allow:
835	set_move (op->move_allow, thawer.get_str ());
836	break;
837	case KW_move_type:
838	set_move (op->move_type, thawer.get_str ());
839	break;
840	case KW_move_on:
841	set_move (op->move_on, thawer.get_str ());
842	break;
843	case KW_move_off:
844	set_move (op->move_off, thawer.get_str ());
845	break;
846	case KW_move_slow:
847	set_move (op->move_slow, thawer.get_str ());
848	break;
849
850	/* These are all legacy - any new objects should use the move_ .. values */
851	case KW_no_pass:
852	{
853	if (thawer.get_sint32 ())
854	op->move_block = MOVE_ALL;
855	else	558	else
856	op->move_block = 0;
857	}
858
859	break;
860
861	/* These are all legacy - any new objects should use the move_ .. values */
862	case KW_walk_on:
863	{	559	{
864	if (thawer.get_sint32 ())	560	tmp = object::create ();
865	op->move_on |= MOVE_WALK;	561	/* record the name of the broken object */
		562	tmp->name = str;
		563	}
		564
		565	parse_object (tmp, thawer, map_flags);
		566
		567	if (tmp->arch)
		568	{
		569	// was: insert_ob_in_ob (tmp, op);
		570	// but manually adding it can improve map loading times a lot
		571	// also, appending instead of prepending keeps the
		572	// save ordering the same between repeated load/saves.
		573	CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
		574	CLEAR_FLAG (tmp, FLAG_REMOVED);
		575
		576	if (!op_inv)
		577	{
		578	op->inv = tmp;
		579	tmp->above = 0;
		580	}
		581	else
		582	{
		583	while (op_inv->below)
		584	op_inv = op_inv->below;
		585
		586	op_inv->below = tmp;
		587	tmp->above = op_inv;
		588	}
		589
		590	tmp->below = 0;
		591	tmp->env = op;
		592	op_inv = tmp;
		593	}
866	else	594	else
867	op->move_on &= ~MOVE_WALK;
868	}
869
870	break;
871
872	/* These are all legacy - any new objects should use the move_ .. values */
873	case KW_walk_off:
874	{
875	if (thawer.get_sint32 ())
876	op->move_off |= MOVE_WALK;
877	else
878	op->move_off &= ~MOVE_WALK;
879	}
880	break;
881
882	/* These are all legacy - any new objects should use the move_ .. values */
883	case KW_fly_on:
884	{
885	if (thawer.get_sint32 ())
886	op->move_on |= MOVE_FLY_LOW;
887	else
888	op->move_on &= ~MOVE_FLY_LOW;
889	}
890	break;
891
892	/* These are all legacy - any new objects should use the move_ .. values */
893	case KW_fly_off:
894	{
895	if (thawer.get_sint32 ())
896	op->move_off |= MOVE_FLY_LOW;
897	else
898	op->move_off &= ~MOVE_FLY_LOW;
899	}
900	break;
901
902	//TODO: remove these after convertign archetypes
903	case KW_can_use_wand:
904	GET_FLAG (op, FLAG_USE_RANGE);
905	break;
906
907	/* These are all legacy - any new objects should use the move_ .. values */
908	case KW_flying:
909	{
910	if (thawer.get_sint32 ())
911	op->move_type |= MOVE_FLY_LOW;
912	else
913	op->move_type &= ~MOVE_FLY_LOW;
914	}
915	break;
916
917
918	case KW_identified:
919	GET_FLAG (op, FLAG_IDENTIFIED);
920	//TODO: move to check_object or so
921	if (QUERY_FLAG (op, FLAG_IDENTIFIED))
922	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
923
924	break;
925
926	case KW_wiz:
927	GET_FLAG (op, FLAG_WIZ);
928	//TODO: move to check_object
929	if (QUERY_FLAG (op, FLAG_WIZ))
930	{	595	{
931	SET_FLAG (op, FLAG_WAS_WIZ);	596	LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
932	SET_FLAG (op, FLAG_WIZPASS);	597	tmp->destroy ();
933	SET_FLAG (op, FLAG_WIZCAST);	598	}
934	}	599	}
935	else	600	else
936	{	601	{
937	CLEAR_FLAG (op, FLAG_WIZPASS);	602	/* This is the actual archetype definition then */
938	CLEAR_FLAG (op, FLAG_WIZCAST);	603	op->arch = archetype::find (str);
		604
		605	if (op->arch)
		606	op->arch->clone.copy_to (op);
		607	else if (!arch_init)
		608	/* record the name of the broken object */
		609	op->name = str;
939	}	610	}
		611	}
940	break;	612	break;
941		613
		614	case KW_other_arch:
		615	op->other_arch = archetype::find (thawer.get_str ());
		616	break;
		617
		618	case KW_animation:
		619	{
		620	const char *str = thawer.get_str ();
		621
		622	if (!str)
		623	{
		624	op->animation_id = 0;
		625	CLEAR_FLAG (op, FLAG_ANIMATE);
		626	}
		627	else
		628	{
		629	op->animation_id = find_animation (str);
		630	SET_FLAG (op, FLAG_ANIMATE);
		631	}
		632	}
		633
		634	break;
		635
		636	case KW_last_heal: thawer.get (op->last_heal); break;
		637	case KW_last_sp: thawer.get (op->last_sp); break;
		638	case KW_last_grace: thawer.get (op->last_grace); break;
		639	case KW_last_eat: thawer.get (op->last_eat); break;
		640	case KW_speed_left: thawer.get (op->speed_left); break;
		641
		642	case KW_speed:
		643	thawer.get (op->speed);
		644
		645	//TODO: maybe do in check_object
		646	// removed check for style maps
		647	if (op->speed < 0)
		648	op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
		649
		650	break;
		651
		652	case KW_slow_move:
		653	op->move_slow |= MOVE_WALK;
		654	thawer.get (op->move_slow_penalty);
		655	break;
		656
		657	case KW_face:
		658	op->face = &new_faces[FindFace (thawer.get_str (), 0)];
		659	break;
		660
		661	case KW_x: thawer.get (op->x); break;
		662	case KW_y: thawer.get (op->y); break;
		663
		664	case KW_Str: // uppercase alias
		665	case KW_str: thawer.get (op->stats.Str); break;
		666	case KW_Dex: // uppercase alias
		667	case KW_dex: thawer.get (op->stats.Dex); break;
		668	case KW_Con: // uppercase alias
		669	case KW_con: thawer.get (op->stats.Con); break;
		670	case KW_Wis: // uppercase alias
		671	case KW_wis: thawer.get (op->stats.Wis); break;
		672	case KW_Cha: // uppercase alias
		673	case KW_cha: thawer.get (op->stats.Cha); break;
		674	case KW_Int: // uppercase alias
		675	case KW_int: thawer.get (op->stats.Int); break;
		676	case KW_Pow: // uppercase alias
		677	case KW_pow: thawer.get (op->stats.Pow); break;
		678
		679	case KW_hp: thawer.get (op->stats.hp); break;
		680	case KW_maxhp: thawer.get (op->stats.maxhp); break;
		681	case KW_sp: thawer.get (op->stats.sp); break;
		682	case KW_maxsp: thawer.get (op->stats.maxsp); break;
		683	case KW_grace: thawer.get (op->stats.grace); break;
		684	case KW_maxgrace: thawer.get (op->stats.maxgrace); break;
		685
		686	case KW_exp: thawer.get (op->stats.exp); break;
		687	case KW_perm_exp: thawer.get (op->perm_exp); break;
		688	case KW_food: thawer.get (op->stats.food); break;
		689	case KW_dam: thawer.get (op->stats.dam); break;
		690	case KW_wc: thawer.get (op->stats.wc); break;
		691	case KW_ac: thawer.get (op->stats.ac); break;
		692	case KW_nrof: thawer.get (op->nrof); break;
		693	case KW_level: thawer.get (op->level); break;
		694	case KW_direction: thawer.get (op->direction); break;
		695	case KW_type: thawer.get (op->type); break;
		696	case KW_subtype: thawer.get (op->subtype); break;
		697	case KW_value: thawer.get (op->value); break;
		698	case KW_weight: thawer.get (op->weight); break;
		699	case KW_carrying: thawer.get (op->carrying); break;
		700	case KW_attacktype: thawer.get (op->attacktype); break;
		701	case KW_path_attuned: thawer.get (op->path_attuned); break;
		702	case KW_path_repelled: thawer.get (op->path_repelled); break;
		703	case KW_path_denied: thawer.get (op->path_denied); break;
		704	case KW_invisible: thawer.get (op->invisible); break;
		705	case KW_magic: thawer.get (op->magic); break;
		706	case KW_state: thawer.get (op->state); break;
		707	case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;
		708	case KW_material: thawer.get (op->material); break;
		709	case KW_materialname: thawer.get (op->materialname); break;
		710
		711	/* These are the new values */
		712	case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
		713	case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
		714	case KW_move_type: set_move (op->move_type, thawer.get_str ()); break;
		715	case KW_move_on: set_move (op->move_on, thawer.get_str ()); break;
		716	case KW_move_off: set_move (op->move_off, thawer.get_str ()); break;
		717	case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break;
		718
		719	/* These are all legacy - any new objects should use the move_ .. values */
		720	case KW_no_pass:
		721	{
		722	if (thawer.get_sint32 ())
		723	op->move_block = MOVE_ALL;
		724	else
		725	op->move_block = 0;
		726	}
		727
		728	break;
		729
		730	/* These are all legacy - any new objects should use the move_ .. values */
		731	case KW_walk_on:
		732	{
		733	if (thawer.get_sint32 ())
		734	op->move_on |= MOVE_WALK;
		735	else
		736	op->move_on &= ~MOVE_WALK;
		737	}
		738
		739	break;
		740
		741	/* These are all legacy - any new objects should use the move_ .. values */
		742	case KW_walk_off:
		743	{
		744	if (thawer.get_sint32 ())
		745	op->move_off |= MOVE_WALK;
		746	else
		747	op->move_off &= ~MOVE_WALK;
		748	}
		749	break;
		750
		751	/* These are all legacy - any new objects should use the move_ .. values */
942	case KW_friendly:	752	case KW_fly_on:
		753	{
		754	if (thawer.get_sint32 ())
		755	op->move_on |= MOVE_FLY_LOW;
		756	else
		757	op->move_on &= ~MOVE_FLY_LOW;
		758	}
		759	break;
		760
		761	/* These are all legacy - any new objects should use the move_ .. values */
		762	case KW_fly_off:
		763	{
		764	if (thawer.get_sint32 ())
		765	op->move_off |= MOVE_FLY_LOW;
		766	else
		767	op->move_off &= ~MOVE_FLY_LOW;
		768	}
		769	break;
		770
		771	//TODO: remove these after converting archetypes
		772	case KW_can_use_wand:
		773	GET_FLAG (op, FLAG_USE_RANGE);
		774	break;
		775
		776	/* These are all legacy - any new objects should use the move_ .. values */
		777	case KW_flying:
		778	{
		779	if (thawer.get_sint32 ())
		780	op->move_type |= MOVE_FLY_LOW;
		781	else
		782	op->move_type &= ~MOVE_FLY_LOW;
		783	}
		784	break;
		785
		786
		787	case KW_identified:
943	GET_FLAG (op, FLAG_FRIENDLY);	788	GET_FLAG (op, FLAG_IDENTIFIED);
944	//TODO: move to check_object or so	789	//TODO: move to check_object or so
945	if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))	790	if (QUERY_FLAG (op, FLAG_IDENTIFIED))
946	add_friendly_object (op);	791	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
		792
947	break;	793	break;
948		794
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:	795	case KW_wiz:
1049	GET_FLAG (op, FLAG_WAS_WIZ);	796	GET_FLAG (op, FLAG_WIZ);
1050	break;	797	//TODO: move to check_object
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);	798	if (QUERY_FLAG (op, FLAG_WIZ))
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	{	799	{
1405	thawer.get_ml (KW_endmsg, op->msg);	800	SET_FLAG (op, FLAG_WAS_WIZ);
1406	//TODO: allow longer messages	801	SET_FLAG (op, FLAG_WIZPASS);
1407	if (strlen (op->msg) >= HUGE_BUF)	802	SET_FLAG (op, FLAG_WIZCAST);
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	}	803	}
1413	break;	804	else
1414
1415	case KW_lore:
1416	{	805	{
1417	shstr msgbuf;	806	CLEAR_FLAG (op, FLAG_WIZPASS);
1418		807	CLEAR_FLAG (op, FLAG_WIZCAST);
1419	thawer.get_ml (KW_endlore, op->lore);
1420	//TODO: allow longer messages
1421	/* Just print a warning so we can be reasonably safe
1422	* about not overflowing the buffer.
1423	*/
1424	if (strlen (op->lore) > (HUGE_BUF / 2))
1425	LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1426	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1427	}	808	}
1428	break;	809	break;
1429		810
		811	case KW_friendly:
		812	GET_FLAG (op, FLAG_FRIENDLY);
		813	//TODO: move to check_object or so
		814	if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
		815	add_friendly_object (op);
		816	break;
		817
		818	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
		819	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
		820	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
		821	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
		822	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
		823	case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
		824	case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
		825	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
		826	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
		827	case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
		828	case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
		829	case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
		830	case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
		831	case KW_alive: GET_FLAG (op, FLAG_ALIVE); break;
		832	case KW_applied: GET_FLAG (op, FLAG_APPLIED); break;
		833	case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break;
		834	case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break;
		835	case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break;
		836	case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break;
		837	case KW_changing: GET_FLAG (op, FLAG_CHANGING); break;
		838	case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break;
		839	case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break;
		840	case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break;
		841	case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break;
		842	case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break;
		843	case KW_scared: GET_FLAG (op, FLAG_SCARED); break;
		844	case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break;
		845	case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break;
		846	case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break;
		847	case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break;
		848	case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break;
		849	case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
		850	case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break;
		851	case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break;
		852	case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break;
		853	case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break;
		854	case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break;
		855	case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break;
		856	case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break;
		857	case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break;
		858	case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
		859	case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
		860	case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
		861	case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
		862	case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
		863	case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
		864	case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
		865	case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
		866	case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
		867	case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
		868	case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
		869	case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break;
		870	case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
		871	case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break;
		872	case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break;
		873	case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break;
		874	case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break;
		875	case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break;
		876	case KW_cursed: GET_FLAG (op, FLAG_CURSED); break;
		877	case KW_damned: GET_FLAG (op, FLAG_DAMNED); break;
		878	case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break;
		879	case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break;
		880	case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break;
		881	case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break;
		882	case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break;
		883	case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break;
		884	case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break;
		885	case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break;
		886	case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break;
		887	case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break;
		888	case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break;
		889	case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break;
		890	case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break;
		891	case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break;
		892	case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break;
		893	case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break;
		894	case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break;
		895	case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break;
		896	case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break;
		897	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
		898	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
		899	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
		900	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
		901	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
		902
		903	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
		904	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
		905	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
		906	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
		907	case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break;
		908	case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break;
		909	case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break;
		910	case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break;
		911	case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break;
		912	case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break;
		913	case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break;
		914	case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break;
		915	case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break;
		916	case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break;
		917	case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break;
		918	case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break;
		919	case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break;
		920	case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break;
		921	case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break;
		922	case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break;
		923	case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break;
		924	case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break;
		925	case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break;
		926	case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break;
		927	case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break;
		928	case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break;
		929	case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break;
		930
		931	case KW_luck: thawer.get (op->stats.luck); break;
		932	case KW_run_away: thawer.get (op->run_away); break;
		933	case KW_pick_up: thawer.get (op->pick_up); break;
		934	case KW_item_power: thawer.get (op->item_power); break;
		935	case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break;
		936	case KW_anim_speed: thawer.get (op->anim_speed); break;
		937	case KW_container: thawer.get (op->weight_limit); break;
		938	case KW_will_apply: thawer.get (op->will_apply); break;
		939	case KW_attack_movement: thawer.get (op->attack_movement); break;
		940	case KW_move_state: thawer.get (op->move_status); break;
		941	case KW_expmul: thawer.get (op->expmul); break;
		942	case KW_glow_radius: thawer.get (op->glow_radius); break;
		943	case KW_weapontype: thawer.get (op->weapontype); break;
		944	case KW_tooltype: thawer.get (op->tooltype); break;
		945	case KW_casting_time: thawer.get (op->casting_time); break;
		946	case KW_elevation: thawer.get (op->elevation); break;
		947	case KW_smoothlevel: thawer.get (op->smoothlevel); break;
		948	case KW_client_type: thawer.get (op->client_type); break;
		949	case KW_duration: thawer.get (op->duration); break;
		950	case KW_range: thawer.get (op->range); break;
		951	case KW_range_modifier: thawer.get (op->range_modifier); break;
		952	case KW_dam_modifier: thawer.get (op->dam_modifier); break;
		953	case KW_duration_modifier: thawer.get (op->duration_modifier); break;
		954
		955	//TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
		956	//TODO: parse from other include files
		957	case KW_body_range: thawer.get (op->body_info[0]); break;
		958	case KW_body_arm: thawer.get (op->body_info[1]); break;
		959	case KW_body_torso: thawer.get (op->body_info[2]); break;
		960	case KW_body_head: thawer.get (op->body_info[3]); break;
		961	case KW_body_neck: thawer.get (op->body_info[4]); break;
		962	case KW_body_skill: thawer.get (op->body_info[5]); break;
		963	case KW_body_finger: thawer.get (op->body_info[6]); break;
		964	case KW_body_shoulder: thawer.get (op->body_info[7]); break;
		965	case KW_body_foot: thawer.get (op->body_info[8]); break;
		966	case KW_body_hand: thawer.get (op->body_info[9]); break;
		967	case KW_body_wrist: thawer.get (op->body_info[10]); break;
		968	case KW_body_waist: thawer.get (op->body_info[11]); break;
		969	case KW_can_apply:
		970	break;
		971
		972	case KW_connected:
		973	add_button_link (op, op->map, thawer.get_sint32 ());
		974	break;
		975
		976	case KW_randomitems:
		977	op->randomitems = find_treasurelist (thawer.get_str ());
		978	break;
		979
		980	case KW_msg:
		981	thawer.get_ml (KW_endmsg, op->msg);
		982	//TODO: allow longer messages
		983	if (strlen (op->msg) >= HUGE_BUF)
		984	{
		985	LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
		986	op->msg = "ERROR, please report: string too long, winged.\n";
		987	}
		988	break;
		989
		990	case KW_lore:
		991	thawer.get_ml (KW_endlore, op->lore);
		992	//TODO: allow longer messages
		993	/* Just print a warning so we can be reasonably safe
		994	* about not overflowing the buffer.
		995	*/
		996	if (strlen (op->lore) > (HUGE_BUF / 2))
		997	LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
		998	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
		999	break;
		1000
1430	case KW_editable:	1001	case KW_editable:
1431	case KW_editor_folder:	1002	case KW_editor_folder:
1432	break;	1003	break;
1433		1004
1434	case KW_More: // uppercase alias	1005	case KW_More: // uppercase alias
1435	case KW_more:	1006	case KW_more:
1436	/* We need to record that this is a multipart object,	1007	/* We need to record that this is a multipart object,
1437	* so the calling function can glue things back together	1008	* so the calling function can glue things back together
1438	*/	1009	*/
1439	ismore = 1;	1010	ismore = 1;
1440	break;	1011	break;
1441		1012
1442	case KW_end:	1013	case KW_end:
1443	check_loaded_object (op);	1014	check_loaded_object (op);
1444		1015
1445	if (!arch_init)	1016	if (!arch_init)
1446	op->instantiate ();	1017	op->instantiate ();
1447		1018
1448	return ismore ? LL_MORE : LL_NORMAL;	1019	return ismore ? LL_MORE : LL_NORMAL;
1449		1020
1450	case KW_EOF:	1021	case KW_EOF:
1451	return LL_EOF;	1022	return LL_EOF;
1452		1023
1453	case KW_ERROR:	1024	case KW_ERROR:
1454	set_ob_key_value (op, thawer.line, thawer.last_value, true);	1025	set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1455	//printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D	1026	//fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1456
1457	//TODO: skip line, ugly, factor parsing better
1458	if (thawer.last_value)
1459	thawer.line = thawer.last_value;
1460
1461	thawer.line += strlen (thawer.line) + 1;
1462
1463	break;	1027	break;
1464		1028
1465	default:	1029	default:
1466	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);	1030	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1467	break;	1031	break;
1468	}	1032	}
1469	}	1033	}
1470	}	1034	}
1471		1035
1472	/*	1036	/*
…		…
1481	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should	1045	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1482	* be reset.	1046	* be reset.
1483	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)	1047	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1484	*	1048	*
1485	*/	1049	*/
1486
1487	int	1050	int
1488	load_object (object_thawer & fp, object *op, int map_flags)	1051	load_object (object_thawer &fp, object *op, int map_flags)
1489	{	1052	{
		1053	// cede every 500 objects loaded
		1054	{
		1055	static int cede_counter = 0;
		1056
		1057	if (++cede_counter >= 500)
		1058	{
		1059	cede_counter = 0;
		1060	if (coroapi::nready ())
		1061	coroapi::cede ();
		1062	}
		1063	}
		1064
1490	return parse_object (op, fp, map_flags);	1065	return parse_object (op, fp, map_flags);
1491	}	1066	}
1492
1493		1067
1494	/* This takes a buffer, scans it for variables, and sets those variables	1068	/* This takes a buffer, scans it for variables, and sets those variables
1495	* as appropriate in op.	1069	* as appropriate in op.
1496	*	1070	*
1497	* This function appears to be used in only 2 places - in crossedit to	1071	* This function appears to be used in only 2 places - in crossedit to
1498	* override values and in c_wiz to mutate values.	1072	* override values and in c_wiz to mutate values.
1499	*/	1073	*/
1500	int	1074	int
1501	set_variable (object *op, char *buf)	1075	set_variable (object *op, char *buf)
1502	{	1076	{
1503	return 0;
1504	#if 0
1505	int retval;
1506	object_thawer thawer (0);	1077	object_thawer thawer (buf, (AV *)0);
1507		1078
1508	strcpy (msgbuf, "");
1509	strcpy (lorebuf, "");
1510	retval = parse_object (op, thawer, 0);	1079	return parse_object (op, thawer, 0);
1511	yy_switch_to_buffer (yycurbuf);
1512	yy_delete_buffer (yybufstate);
1513	yy_pop_state ();
1514	return retval;
1515	#endif
1516	}	1080	}
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		1081
1562	/*	1082	/*
1563	* Initialises the array of variable-names. Needed before any	1083	* Initialises the array of variable-names. Needed before any
1564	* objects can be loaded. Called by init_library().	1084	* objects can be loaded. Called by init_library().
1565	*/	1085	*/
…		…
1620	}	1140	}
1621	#endif	1141	#endif
1622		1142
1623	// compare *op against *tmp and output differences	1143	// compare *op against *tmp and output differences
1624	void	1144	void
1625	put (object_freezer & f, object *op, object *tmp)	1145	put (object_freezer &f, object *op, object *tmp)
1626	{	1146	{
		1147	static const keyword resist_save[NROFATTACKS] = {
		1148	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
		1149	# include "attackinc.h"
		1150	# undef def
		1151	};
		1152
		1153	/* This is a list of keywords that correspond to the FLAG_.. values.
		1154	* This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
		1155	* the 15'th element of this array should match that name.
		1156	* If an entry is NULL, that is a flag not to loaded/saved.
		1157	*/
		1158	static const keyword flag_names [NUM_FLAGS] = {
		1159	KW_alive,
		1160	KW_wiz,
		1161	KW_NULL,
		1162	KW_NULL,
		1163	KW_was_wiz,
		1164	KW_applied,
		1165	KW_unpaid,
		1166	KW_can_use_shield,
		1167	KW_no_pick,
		1168	KW_NULL, // walk_on
		1169	KW_NULL, // no_pass
		1170	/* 10 */
		1171	KW_is_animated,
		1172	KW_NULL, // slow_move
		1173	KW_NULL, // flying
		1174	KW_monster,
		1175	KW_friendly,
		1176	KW_generator,
		1177	KW_is_thrown,
		1178	KW_auto_apply,
		1179	KW_NULL, // was KW_treasure
		1180	KW_player_sold,
		1181	/* 20 */
		1182	KW_see_invisible,
		1183	KW_can_roll,
		1184	KW_overlay_floor,
		1185	KW_is_turnable,
		1186	KW_NULL, // walk_off
		1187	KW_NULL, // fly_on
		1188	KW_NULL, // fly_off
		1189	KW_is_used_up,
		1190	KW_identified,
		1191	KW_reflecting,
		1192	/* 30 */
		1193	KW_changing,
		1194	KW_splitting,
		1195	KW_hitback,
		1196	KW_startequip,
		1197	KW_blocksview,
		1198	KW_undead,
		1199	KW_scared,
		1200	KW_unaggressive,
		1201	KW_reflect_missile,
		1202	KW_reflect_spell,
		1203	/* 40 */
		1204	KW_no_magic,
		1205	KW_no_fix_player,
		1206	KW_is_lightable,
		1207	KW_tear_down,
		1208	KW_run_away,
		1209	KW_NULL, // pass_thru
		1210	KW_NULL, // an_pass_thru
		1211	KW_pick_up,
		1212	KW_unique,
		1213	KW_no_drop,
		1214	/* 50 */
		1215	KW_NULL, // wizcast
		1216	KW_can_cast_spell,
		1217	KW_can_use_scroll,
		1218	KW_can_use_range,
		1219	KW_can_use_bow,
		1220	KW_can_use_armour,
		1221	KW_can_use_weapon,
		1222	KW_can_use_ring,
		1223	KW_has_ready_range,
		1224	KW_has_ready_bow,
		1225	/* 60 */
		1226	KW_xrays,
		1227	KW_NULL,
		1228	KW_is_floor,
		1229	KW_lifesave,
		1230	KW_no_strength,
		1231	KW_sleep,
		1232	KW_stand_still,
		1233	KW_random_move,
		1234	KW_only_attack,
		1235	KW_confused,
		1236	/* 70 */
		1237	KW_stealth,
		1238	KW_NULL,
		1239	KW_NULL,
		1240	KW_cursed,
		1241	KW_damned,
		1242	KW_see_anywhere,
		1243	KW_known_magical,
		1244	KW_known_cursed,
		1245	KW_can_use_skill,
		1246	KW_been_applied,
		1247	/* 80 */
		1248	KW_has_ready_scroll,
		1249	KW_can_use_rod,
		1250	KW_NULL,
		1251	KW_can_use_horn,
		1252	KW_make_invisible,
		1253	KW_inv_locked,
		1254	KW_is_wooded,
		1255	KW_is_hilly,
		1256	KW_has_ready_skill,
		1257	KW_has_ready_weapon,
		1258	/* 90 */
		1259	KW_no_skill_ident,
		1260	KW_is_blind,
		1261	KW_can_see_in_dark,
		1262	KW_is_cauldron,
		1263	KW_NULL,
		1264	KW_no_steal,
		1265	KW_one_hit,
		1266	KW_NULL,
		1267	KW_berserk,
		1268	KW_neutral,
		1269	/* 100 */
		1270	KW_no_attack,
		1271	KW_no_damage,
		1272	KW_NULL,
		1273	KW_NULL,
		1274	KW_activate_on_push,
		1275	KW_activate_on_release,
		1276	KW_is_water,
		1277	KW_use_content_on_gen,
		1278	KW_NULL,
		1279	KW_is_buildable,
		1280	/* 110 */
		1281	};
		1282
1627	int i;	1283	int i;
1628		1284
1629	/* This saves the key/value lists. We do it first so that any	1285	/* 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.	1286	* keys that match field names will be overwritten by the loader.
1631	*/	1287	*/
…		…
1633	{	1289	{
1634	/* Find the field in the opposing member. */	1290	/* Find the field in the opposing member. */
1635	key_value *arch_field = get_ob_key_link (tmp, my_field->key);	1291	key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1636		1292
1637	/* If there's no partnering field, or it's got a different value, save our field. */	1293	/* 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)	1294	if (!arch_field || my_field->value != arch_field->value)
1639	f.put (my_field->key, my_field->value);	1295	f.put (my_field->key, my_field->value);
1640	}	1296	}
1641		1297
1642	/* We don't need to worry about the arch's extra fields - they	1298	/* We don't need to worry about the arch's extra fields - they
1643	* will get taken care of the copy_object function.	1299	* will get taken care of the copy_to method.
1644	*/	1300	*/
		1301
		1302	{
		1303	char uids[64];
		1304	snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
		1305	f.put (KW_uuid, (const char *)uids);
		1306	}
1645		1307
1646	#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v)	1308	#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)	1309	#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v)
1648		1310
1649	CMP_OUT (name);	1311	CMP_OUT (name);
…		…
1658	if (op->lore != tmp->lore)	1320	if (op->lore != tmp->lore)
1659	f.put (KW_lore, KW_endlore, op->lore);	1321	f.put (KW_lore, KW_endlore, op->lore);
1660		1322
1661	CMP_OUT (other_arch);	1323	CMP_OUT (other_arch);
1662	CMP_OUT (face);	1324	CMP_OUT (face);
1663
1664	if (!op->face || !op->face->name)
1665	printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>"); //D
1666		1325
1667	if (op->animation_id != tmp->animation_id)	1326	if (op->animation_id != tmp->animation_id)
1668	if (op->animation_id)	1327	if (op->animation_id)
1669	{	1328	{
1670	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);	1329	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
…		…
1762	CMP_OUT (move_on);	1421	CMP_OUT (move_on);
1763	CMP_OUT (move_off);	1422	CMP_OUT (move_off);
1764	CMP_OUT (move_slow);	1423	CMP_OUT (move_slow);
1765	CMP_OUT (move_slow_penalty);	1424	CMP_OUT (move_slow_penalty);
1766		1425
1767	if (!COMPARE_FLAGS (op, tmp))	1426	if (op->flag != tmp->flag)
1768	for (i = 0; i <= NUM_FLAGS; i++)	1427	for (i = 0; i <= NUM_FLAGS; i++)
1769	if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))	1428	if (flag_names [i] && op->flag [i] != tmp->flag [i])
1770	f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0");	1429	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1771		1430
1772	/* Save body locations */	1431	/* Save body locations */
1773	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1432	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1774	if (op->body_info[i] != tmp->body_info[i])	1433	if (op->body_info[i] != tmp->body_info[i])
1775	f.put (body_locations[i].save_name, op->body_info[i]);	1434	f.put (body_locations[i].save_name, op->body_info[i]);
…		…
1777		1436
1778	/*	1437	/*
1779	* Dumps all variables in an object to a file.	1438	* 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,	1439	* 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.	1440	* 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	*/	1441	*/
1785
1786	void	1442	void
1787	save_object (object_freezer & fp, object *op, int flag)	1443	save_object (object_freezer &fp, object *op, int flag)
1788	{	1444	{
1789	archetype *at;
1790	object *tmp, *old;
1791
1792	/* Even if the object does have an owner, it would seem that we should	1445	/* Even if the object does have an owner, it would seem that we should
1793	* still save it.	1446	* still save it.
1794	*/	1447	*/
1795	if (op->owner)	1448	if (op->owner)
1796	return;	1449	return;
1797		1450
1798	/* If it is unpaid and we don't want to save those, just return. */	1451	/* If it is unpaid and we don't want to save those, just return. */
1799	if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))	1452	if (!(flag & 1) && op->flag [FLAG_UNPAID])
1800	return;	1453	return;
1801		1454
1802	if ((at = op->arch) == NULL)	1455	archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1803	at = empty_archetype;
1804		1456
1805	fp.put (KW_arch, at->name);	1457	fp.put (KW_arch, at->name);
1806
1807	put (fp, op, &at->clone);	1458	put (fp, op, &at->clone);
1808		1459
1809	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */	1460	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1810		1461
1811	old = NULL;
1812
1813	if (flag & 2)
1814	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1462	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1815	save_object (fp, tmp, flag);	1463	save_object (fp, tmp, flag);
1816	else
1817	/* Slightly different logic because tmp/op will be removed by
1818	* the save_object we call. So we just keep looking at op->inv
1819	* until there is nothing left. In theory, the variable old
1820	* should not be needed, as recursive loops shouldn't happen.
1821	*/
1822	while ((tmp = op->inv) != NULL)
1823	{
1824	if (old == tmp)
1825	{
1826	LOG (llevError, " Recursive loop in inventory\n");
1827	break;
1828	}
1829
1830	save_object (fp, tmp, flag);
1831	old = tmp;
1832	}
1833
1834	if (!(flag & 2))
1835	{
1836	remove_ob (op);
1837	free_object (op);
1838	}
1839		1464
1840	fp.put (op);	1465	fp.put (op);
1841	fprintf (fp, "end\n");	1466	fp.put (KW_end, 0);
1842	}	1467	}
		1468

Diff Legend

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