[ViewVC] Diff of: cvs/deliantra/server/common/loader.C

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.24 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.51 by root, Thu Feb 1 17:29:16 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	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
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27		28
28
29	#include <global.h>	29	#include <global.h>
30	#include <loader.h>	30	#include <loader.h>
31	#include <sproto.h>	31	#include <sproto.h>
		32
		33	// resource loader pure base class
		34	struct loader_base
		35	{
		36	const char *filename;
		37	virtual const char *type () const = 0;
		38
		39	virtual archetype get_arch (const char name);
		40	virtual void put_arch (archetype *arch);
		41
		42	virtual object get_object (const char name);
		43	virtual void put_object (object *op);
		44
		45	virtual player *get_player ();
		46	virtual void put_player (player *pl);
		47
		48	virtual region get_region (const char name);
		49	virtual void put_region (region *region);
		50
		51	virtual facetile get_face (const char name);
		52	virtual void put_face (facetile *face);
		53
		54	virtual treasurelist get_treasure (const char name, bool one = false);
		55	virtual void put_treasure (treasurelist *treasure);
		56
		57	virtual animation get_animation (const char name);
		58	virtual void put_animation (animation *anim);
		59	};
		60
		61	// pure base class for default archetype loader
		62	struct loader_arch : virtual loader_base {
		63	archetype get_arch (const char name);
		64	void put_arch (archetype *arch);
		65	};
		66
		67	// pure base class for default object loader
		68	struct loader_object : virtual loader_base {
		69	object get_object (const char name);
		70	void put_object (object *op);
		71	};
		72
		73	// pure base class for default player loader
		74	struct loader_player : virtual loader_base {
		75	virtual player *get_player ();
		76	virtual void put_player (player *pl);
		77	};
		78
		79	// pure base class for default region loader
		80	struct loader_region : virtual loader_base {
		81	region *get_region ();
		82	void put_region (region *region);
		83	};
		84
		85	// pure base class for default face loader
		86	struct loader_face : virtual loader_base {
		87	facetile get_face (const char name);
		88	void put_face (facetile *face);
		89	};
		90
		91	// pure base class for default treasure loader
		92	struct loader_treasure : virtual loader_base {
		93	treasurelist get_treasure (const char name, bool one = false);
		94	void put_treasure (treasurelist *treasure);
		95	};
		96
		97	// pure base class for default animation loader
		98	struct loader_animation : virtual loader_base {
		99	animation get_animation (const char name);
		100	void put_animation (animation *anim);
		101	};
		102
		103	// future generic resource loader
		104	// handles generic stuff valid in most files, such as
		105	// animations, treasures, faces and so on
		106	struct loader_generic
		107	: virtual loader_base,
		108	loader_object, loader_player,
		109	loader_region, loader_face,
		110	loader_treasure, loader_animation
		111	{
		112	const char *type () const = 0;
		113	};
		114
		115	// the base class warns about and skips everything
		116	archetype *
		117	loader_base::get_arch (const char *name)
		118	{
		119	LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n",
		120	filename, name, type ());
		121
		122	return new archetype;
		123	}
		124
		125	object *
		126	loader_base::get_object (const char *name)
		127	{
		128	LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n",
		129	filename, name, type ());
		130
		131	return object::create ();
		132	}
		133
		134	player *
		135	loader_base::get_player ()
		136	{
		137	LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n",
		138	filename, type ());
		139
		140	return player::create ();
		141	}
		142
		143	region *
		144	loader_base::get_region (const char *name)
		145	{
		146	LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n",
		147	filename, name, type ());
		148
		149	return new region;
		150	}
		151
		152	facetile *
		153	loader_base::get_face (const char *name)
		154	{
		155	LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n",
		156	filename, name, type ());
		157
		158	return new facetile;
		159	}
		160
		161	treasurelist *
		162	loader_base::get_treasure (const char *name, bool one)
		163	{
		164	LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n",
		165	filename, name, type ());
		166
		167	return new treasurelist;//D
		168	}
		169
		170	animation *
		171	loader_base::get_animation (const char *name)
		172	{
		173	LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n",
		174	filename, name, type ());
		175
		176	return new animation;
		177	}
		178
		179	void
		180	loader_base::put_arch (archetype *arch)
		181	{
		182	delete arch;
		183	}
		184
		185	void
		186	loader_base::put_object (object *op)
		187	{
		188	op->destroy ();
		189	}
		190
		191	void
		192	loader_base::put_player (player *pl)
		193	{
		194	delete pl;
		195	}
		196
		197	void
		198	loader_base::put_region (region *region)
		199	{
		200	delete region;
		201	}
		202
		203	void
		204	loader_base::put_face (facetile *face)
		205	{
		206	delete face;
		207	}
		208
		209	void
		210	loader_base::put_treasure (treasurelist *treasure)
		211	{
		212	delete treasure;
		213	}
		214
		215	void
		216	loader_base::put_animation (animation *anim)
		217	{
		218	delete anim;
		219	}
32		220
33	/* Maps the MOVE_* values to names */	221	/* Maps the MOVE_* values to names */
34	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };	222	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
35		223
36	/* This table is only necessary to convert objects that existed before the	224	/* This table is only necessary to convert objects that existed before the
263	static void	451	static void
264	check_loaded_object (object *op)	452	check_loaded_object (object *op)
265	{	453	{
266	int ip;	454	int ip;
267		455
268	/* We do some specialized handling to handle legacy cases of name_pl.	456	/* We do some specialised handling to handle legacy cases of name_pl.
269	* If the object doesn't have a name_pl, we just use the object name -	457	* If the object doesn't have a name_pl, we just use the object name -
270	* this isn't perfect (things won't be properly pluralized), but works to	458	* this isn't perfect (things won't be properly pluralised), but works to
271	* that degree (5 heart is still quite understandable). But the case we	459	* that degree (5 heart is still quite understandable). But the case we
272	* also have to catch is if this object is not using the normal name for	460	* also have to catch is if this object is not using the normal name for
273	* the object. In that case, we also want to use the loaded name.	461	* the object. In that case, we also want to use the loaded name.
274	* Otherwise, what happens is that the the plural name will lose	462	* Otherwise, what happens is that the the plural name will lose
275	* information (appear as just 'hearts' and not 'goblins heart')	463	* information (appear as just 'hearts' and not 'goblins heart')
…		…
279		467
280	if (!op->name_pl)	468	if (!op->name_pl)
281	op->name_pl = op->name;	469	op->name_pl = op->name;
282		470
283	/* objects now have a materialname. try to patch it in */	471	/* objects now have a materialname. try to patch it in */
284	if (!(IS_WEAPON (op) && op->level > 0))	472	if (!(op->is_weapon () && op->level > 0))
285	{	473	{
286	if (op->map != NULL)	474	if (op->map != NULL)
287	set_materialname (op, op->map->difficulty, NULL);	475	set_materialname (op, op->map->difficulty, NULL);
288	else	476	else
289	set_materialname (op, 5, NULL);	477	set_materialname (op, 5, NULL);
…		…
320	{	508	{
321	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());	509	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
322	op->gen_sp_armour = op->last_heal;	510	op->gen_sp_armour = op->last_heal;
323	op->last_heal = 0;	511	op->last_heal = 0;
324	}	512	}
325	if (editor)	513
326	ip = 0;
327	else
328	ip = calc_item_power (op, 0);	514	ip = calc_item_power (op, 0);
329	/* Legacy objects from before item power was in the game */	515	/* Legacy objects from before item power was in the game */
330	if (!op->item_power && ip)	516	if (!op->item_power && ip)
331	{	517	{
332	if (ip > 3)	518	if (ip > 3)
333	{	519	{
…		…
375	}	561	}
376		562
377	if (QUERY_FLAG (op, FLAG_MONSTER))	563	if (QUERY_FLAG (op, FLAG_MONSTER))
378	{	564	{
379	if (op->stats.hp > op->stats.maxhp)	565	if (op->stats.hp > op->stats.maxhp)
		566	{
380	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);	567	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
		568	op->stats.maxhp = op->stats.hp;
		569	}
381		570
382	/* The archs just need to be updated for this */	571	/* The archs just need to be updated for this */
383	if (op->move_type == 0)	572	if (op->move_type == 0)
384	op->move_type = MOVE_WALK;	573	op->move_type = MOVE_WALK;
385	}	574	}
…		…
487	SET_FLAG (op, flag); \	676	SET_FLAG (op, flag); \
488	else \	677	else \
489	CLEAR_FLAG (op, flag) \	678	CLEAR_FLAG (op, flag) \
490		679
491	int	680	int
492	parse_object (object *op, object_thawer & thawer, int map_flags)	681	parse_object (object *op, object_thawer &thawer, int map_flags)
493	{	682	{
494	bool ismore = 0;	683	bool ismore = 0;
495	object *op_inv = op->inv;	684	object *op_inv = op->inv;
496		685
497	for (;;)	686	for (;;)
…		…
502	{	691	{
503	case KW_Object: // uppercase alias	692	case KW_Object: // uppercase alias
504	case KW_object:	693	case KW_object:
505	thawer.get (op->name);	694	thawer.get (op->name);
506		695
507	if (op->arch != NULL)	696	if (op->arch)
508	op->arch->name = op->name;	697	op->arch->name = op->name;
509		698
510	break;	699	break;
511		700
512	case KW_uuid:	701	case KW_uuid:
…		…
551	*/	740	*/
552	archetype *arch = archetype::find (str);	741	archetype *arch = archetype::find (str);
553		742
554	object *tmp;	743	object *tmp;
555		744
556	if (arch != NULL)	745	if (arch)
557	tmp = arch_to_object (arch);	746	tmp = arch_to_object (arch);
558	else	747	else
559	{	748	{
560	tmp = object::create ();	749	tmp = object::create ();
561	/* record the name of the broken object */	750	/* record the name of the broken object */
562	tmp->name = str;	751	tmp->name = str;
563	}	752	}
		753
		754	// decativate the object we, as we are still going
		755	// to read the speed value. Objects should be activated
		756	// when the map, object or player is completly loaded.
		757	tmp->deactivate ();
564		758
565	parse_object (tmp, thawer, map_flags);	759	parse_object (tmp, thawer, map_flags);
566		760
567	if (tmp->arch)	761	if (tmp->arch)
568	{	762	{
…		…
601	{	795	{
602	/* This is the actual archetype definition then */	796	/* This is the actual archetype definition then */
603	op->arch = archetype::find (str);	797	op->arch = archetype::find (str);
604		798
605	if (op->arch)	799	if (op->arch)
		800	{
606	op->arch->clone.copy_to (op);	801	op->arch->clone.copy_to (op);
		802	// copy_to activates, this should be fixed properly
		803	op->deactivate ();
		804	}
607	else if (!arch_init)	805	else if (!arch_init)
608	/* record the name of the broken object */	806	/* record the name of the broken object */
609	op->name = str;	807	op->name = str;
610	}	808	}
611	}	809	}
…		…
622	if (!str)	820	if (!str)
623	{	821	{
624	op->animation_id = 0;	822	op->animation_id = 0;
625	CLEAR_FLAG (op, FLAG_ANIMATE);	823	CLEAR_FLAG (op, FLAG_ANIMATE);
626	}	824	}
627	else
628	{
629	op->animation_id = find_animation (str);	825	else if ((op->animation_id = find_animation (str)))
630	SET_FLAG (op, FLAG_ANIMATE);	826	SET_FLAG (op, FLAG_ANIMATE);
631	}
632	}	827	}
633		828
634	break;	829	break;
635		830
636	case KW_last_heal: thawer.get (op->last_heal); break;	831	case KW_last_heal: thawer.get (op->last_heal); break;
…		…
641		836
642	case KW_speed:	837	case KW_speed:
643	thawer.get (op->speed);	838	thawer.get (op->speed);
644		839
645	//TODO: maybe do in check_object	840	//TODO: maybe do in check_object
646	if (!(map_flags & MAP_STYLE))	841	// removed check for style maps
647	{
648	if (op->speed < 0)	842	if (op->speed < 0)
649	op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;	843	op->speed_left = op->speed_left - rndm ();
650
651	update_ob_speed (op);
652	}
653		844
654	break;	845	break;
655		846
656	case KW_slow_move:	847	case KW_slow_move:
657	op->move_slow \|= MOVE_WALK;	848	op->move_slow \|= MOVE_WALK;
…		…
811	CLEAR_FLAG (op, FLAG_WIZCAST);	1002	CLEAR_FLAG (op, FLAG_WIZCAST);
812	}	1003	}
813	break;	1004	break;
814		1005
815	case KW_friendly:	1006	case KW_friendly:
816	GET_FLAG (op, FLAG_FRIENDLY);	1007	if (thawer.get_sint32 ())
817	//TODO: move to check_object or so	1008	if (op->type != PLAYER)
818	if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
819	add_friendly_object (op);	1009	add_friendly_object (op);
		1010
820	break;	1011	break;
821		1012
822	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;	1013	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
823	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;	1014	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
824	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;	1015	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
825	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;	1016	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
		1017	case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
826	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;	1018	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827	case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;	1019	case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
828	case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;	1020	case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;	1021	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
830	case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
831	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;	1022	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
832	case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;	1023	case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
833	case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;	1024	case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
834	case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;	1025	case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
835	case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;	1026	case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
…		…
902	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;	1093	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
903	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;	1094	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
904	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;	1095	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
905	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;	1096	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
906	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;	1097	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
		1098	case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
907		1099
908	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;	1100	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
909	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;	1101	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
910	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;	1102	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
911	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;	1103	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
…		…
981	case KW_randomitems:	1173	case KW_randomitems:
982	op->randomitems = find_treasurelist (thawer.get_str ());	1174	op->randomitems = find_treasurelist (thawer.get_str ());
983	break;	1175	break;
984		1176
985	case KW_msg:	1177	case KW_msg:
986	{
987	thawer.get_ml (KW_endmsg, op->msg);	1178	thawer.get_ml (KW_endmsg, op->msg);
988	//TODO: allow longer messages	1179	//TODO: allow longer messages
989	if (strlen (op->msg) >= HUGE_BUF)	1180	if (strlen (op->msg) >= HUGE_BUF)
990	{	1181	{
991	LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);	1182	LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
992	op->msg = "ERROR, please report: string too long, winged.\n";	1183	op->msg = "ERROR, please report: string too long, winged.\n";
993	}	1184	}
994	}
995	break;	1185	break;
996		1186
997	case KW_lore:	1187	case KW_lore:
998	{
999	shstr msgbuf;
1000
1001	thawer.get_ml (KW_endlore, op->lore);	1188	thawer.get_ml (KW_endlore, op->lore);
1002	//TODO: allow longer messages	1189	//TODO: allow longer messages
1003	/* Just print a warning so we can be reasonably safe	1190	/* Just print a warning so we can be reasonably safe
1004	* about not overflowing the buffer.	1191	* about not overflowing the buffer.
1005	*/	1192	*/
1006	if (strlen (op->lore) > (HUGE_BUF / 2))	1193	if (strlen (op->lore) > (HUGE_BUF / 2))
1007	LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",	1194	LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1008	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);	1195	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1009	}
1010	break;	1196	break;
1011		1197
1012	case KW_editable:	1198	case KW_editable:
1013	case KW_editor_folder:	1199	case KW_editor_folder:
1014	break;	1200	break;
…		…
1031		1217
1032	case KW_EOF:	1218	case KW_EOF:
1033	return LL_EOF;	1219	return LL_EOF;
1034		1220
1035	case KW_ERROR:	1221	case KW_ERROR:
1036	set_ob_key_value (op, thawer.line, thawer.last_value, true);	1222	set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1037	//printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D	1223	//fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1038
1039	//TODO: skip line, ugly, factor parsing better
1040	if (thawer.last_value)
1041	thawer.line = thawer.last_value;
1042
1043	thawer.line += strlen (thawer.line) + 1;
1044
1045	break;	1224	break;
1046		1225
1047	default:	1226	default:
1048	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);	1227	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1049	break;	1228	break;
…		…
1063	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should	1242	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1064	* be reset.	1243	* be reset.
1065	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)	1244	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1066	*	1245	*
1067	*/	1246	*/
1068
1069	int	1247	int
1070	load_object (object_thawer & fp, object *op, int map_flags)	1248	load_object (object_thawer &fp, object *op, int map_flags)
1071	{	1249	{
		1250	coroapi::cede_every (1000); // cede once in a while
		1251
1072	return parse_object (op, fp, map_flags);	1252	return parse_object (op, fp, map_flags);
1073	}	1253	}
1074
1075		1254
1076	/* This takes a buffer, scans it for variables, and sets those variables	1255	/* This takes a buffer, scans it for variables, and sets those variables
1077	* as appropriate in op.	1256	* as appropriate in op.
1078	*	1257	*
1079	* This function appears to be used in only 2 places - in crossedit to	1258	* This function appears to be used in only 2 places - in crossedit to
…		…
1182	KW_monster,	1361	KW_monster,
1183	KW_friendly,	1362	KW_friendly,
1184	KW_generator,	1363	KW_generator,
1185	KW_is_thrown,	1364	KW_is_thrown,
1186	KW_auto_apply,	1365	KW_auto_apply,
1187	KW_treasure,	1366	KW_NULL, // was KW_treasure
1188	KW_player_sold,	1367	KW_player_sold,
1189	/* 20 */	1368	/* 20 */
1190	KW_see_invisible,	1369	KW_see_invisible,
1191	KW_can_roll,	1370	KW_can_roll,
1192	KW_overlay_floor,	1371	KW_overlay_floor,
…		…
1275	KW_berserk,	1454	KW_berserk,
1276	KW_neutral,	1455	KW_neutral,
1277	/* 100 */	1456	/* 100 */
1278	KW_no_attack,	1457	KW_no_attack,
1279	KW_no_damage,	1458	KW_no_damage,
1280	KW_NULL,	1459	KW_obj_original,
1281	KW_NULL,	1460	KW_NULL,
1282	KW_activate_on_push,	1461	KW_activate_on_push,
1283	KW_activate_on_release,	1462	KW_activate_on_release,
1284	KW_is_water,	1463	KW_is_water,
1285	KW_use_content_on_gen,	1464	KW_use_content_on_gen,
1286	KW_NULL,	1465	KW_NULL,
1287	KW_is_buildable,	1466	KW_is_buildable,
1288	/* 110 */	1467	/* 110 */
		1468	KW_destroy_on_death,
		1469	KW_NULL,
1289	};	1470	};
1290		1471
1291	int i;	1472	int i;
1292		1473
1293	/* This saves the key/value lists. We do it first so that any	1474	/* This saves the key/value lists. We do it first so that any
1294	* keys that match field names will be overwritten by the loader.	1475	* keys that match field names will be overwritten by the loader.
1295	*/	1476	*/
1296	for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next)	1477	for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1297	{	1478	{
1298	/* Find the field in the opposing member. */	1479	/* Find the field in the opposing member. */
1299	key_value *arch_field = get_ob_key_link (tmp, my_field->key);	1480	key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1300		1481
1301	/* If there's no partnering field, or it's got a different value, save our field. */	1482	/* If there's no partnering field, or it's got a different value, save our field. */
…		…
1429	CMP_OUT (move_on);	1610	CMP_OUT (move_on);
1430	CMP_OUT (move_off);	1611	CMP_OUT (move_off);
1431	CMP_OUT (move_slow);	1612	CMP_OUT (move_slow);
1432	CMP_OUT (move_slow_penalty);	1613	CMP_OUT (move_slow_penalty);
1433		1614
1434	if (op->flags != tmp->flags)	1615	if (op->flag != tmp->flag)
1435	for (i = 0; i <= NUM_FLAGS; i++)	1616	for (i = 0; i <= NUM_FLAGS; i++)
1436	if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))	1617	if (flag_names [i] && op->flag [i] != tmp->flag [i])
1437	f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0");	1618	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1438		1619
1439	/* Save body locations */	1620	/* Save body locations */
1440	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1621	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1441	if (op->body_info[i] != tmp->body_info[i])	1622	if (op->body_info[i] != tmp->body_info[i])
1442	f.put (body_locations[i].save_name, op->body_info[i]);	1623	f.put (body_locations[i].save_name, op->body_info[i]);
…		…
1444		1625
1445	/*	1626	/*
1446	* Dumps all variables in an object to a file.	1627	* Dumps all variables in an object to a file.
1447	* If bit 0 of flag is set, unpaid objects will be saved. As of now,	1628	* If bit 0 of flag is set, unpaid objects will be saved. As of now,
1448	* the only place this is not set is when saving the player.	1629	* the only place this is not set is when saving the player.
1449	* If bit 1 of flag is set, don't remove the object after save. As of now,
1450	* all of the callers are setting this.
1451	*/	1630	*/
1452
1453	void	1631	void
1454	save_object (object_freezer & fp, object *op, int flag)	1632	save_object (object_freezer &fp, object *op, int flag)
1455	{	1633	{
1456	archetype *at;
1457	object tmp, old;
1458
1459	/* Even if the object does have an owner, it would seem that we should	1634	/* Even if the object does have an owner, it would seem that we should
1460	* still save it.	1635	* still save it.
1461	*/	1636	*/
1462	if (op->owner)	1637	if (op->owner)
1463	return;	1638	return;
1464		1639
1465	/* If it is unpaid and we don't want to save those, just return. */	1640	/* If it is unpaid and we don't want to save those, just return. */
1466	if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))	1641	if (!(flag & 1) && op->flag [FLAG_UNPAID])
1467	return;	1642	return;
1468		1643
1469	if ((at = op->arch) == NULL)	1644	archetype at = op->arch ? (archetype )op->arch : empty_archetype;
1470	at = empty_archetype;
1471		1645
1472	fp.put (KW_arch, at->name);	1646	fp.put (KW_arch, at->name);
1473
1474	put (fp, op, &at->clone);	1647	put (fp, op, &at->clone);
1475		1648
1476	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */	1649	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1477		1650
1478	old = NULL;
1479
1480	if (flag & 2)
1481	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1651	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1482	save_object (fp, tmp, flag);	1652	save_object (fp, tmp, flag);
1483	else
1484	/* Slightly different logic because tmp/op will be removed by
1485	* the save_object we call. So we just keep looking at op->inv
1486	* until there is nothing left. In theory, the variable old
1487	* should not be needed, as recursive loops shouldn't happen.
1488	*/
1489	while ((tmp = op->inv) != NULL)
1490	{
1491	if (old == tmp)
1492	{
1493	LOG (llevError, " Recursive loop in inventory\n");
1494	break;
1495	}
1496
1497	save_object (fp, tmp, flag);
1498	old = tmp;
1499	}
1500
1501	if (!(flag & 2))
1502	op->destroy ();
1503		1653
1504	fp.put (op);	1654	fp.put (op);
1505	fprintf (fp, "end\n");	1655	fp.put (KW_end);
1506	}	1656	}
1507		1657

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.24 by root, Mon Dec 18 02:35:00 2006 UTC vs. Revision 1.51 by root, Thu Feb 1 17:29:16 2007 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.24 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.51 by root, Thu Feb 1 17:29:16 2007 UTC