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.15 by root, Wed Sep 13 02:05:19 2006 UTC vs.
Revision 1.67 by root, Sun Mar 18 03:05:39 2007 UTC

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

Diff Legend

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