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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.27 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.52 by root, Thu Feb 1 19:15:38 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	/////////////////////////////////////////////////////////////////////////////
		34
		35	// the base class warns about and skips everything
		36	archetype *
		37	loader_base::get_arch (const char *name)
		38	{
		39	LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
		40	filename, name);
		41
		42	return new archetype;
		43	}
		44
		45	object *
		46	loader_base::get_object (const char *name)
		47	{
		48	LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
		49	filename, name);
		50
		51	return object::create ();
		52	}
		53
		54	player *
		55	loader_base::get_player ()
		56	{
		57	LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
		58	filename);
		59
		60	return player::create ();
		61	}
		62
		63	region *
		64	loader_base::get_region (const char *name)
		65	{
		66	LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
		67	filename, name);
		68
		69	return new region;
		70	}
		71
		72	facetile *
		73	loader_base::get_face (const char *name)
		74	{
		75	LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
		76	filename, name);
		77
		78	return new facetile;
		79	}
		80
		81	treasurelist *
		82	loader_base::get_treasure (const char *name, bool one)
		83	{
		84	LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
		85	filename, name);
		86
		87	return new treasurelist;//D
		88	}
		89
		90	animation *
		91	loader_base::get_animation (const char *name)
		92	{
		93	LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
		94	filename, name);
		95
		96	return new animation;
		97	}
		98
		99	void
		100	loader_base::put_arch (archetype *arch)
		101	{
		102	delete arch;
		103	}
		104
		105	void
		106	loader_base::put_object (object *op)
		107	{
		108	op->destroy ();
		109	}
		110
		111	void
		112	loader_base::put_player (player *pl)
		113	{
		114	delete pl;
		115	}
		116
		117	void
		118	loader_base::put_region (region *region)
		119	{
		120	delete region;
		121	}
		122
		123	void
		124	loader_base::put_face (facetile *face)
		125	{
		126	delete face;
		127	}
		128
		129	void
		130	loader_base::put_treasure (treasurelist *treasure)
		131	{
		132	delete treasure;
		133	}
		134
		135	void
		136	loader_base::put_animation (animation *anim)
		137	{
		138	delete anim;
		139	}
		140
		141	/////////////////////////////////////////////////////////////////////////////
		142
		143	bool loader_base::parse (object_thawer &thawer)
		144	{
		145	for (;;)
		146	{
		147	keyword kw = thawer.get_kv ();
		148
		149	switch (kw)
		150	{
		151	case KW_region:
		152	{
		153	region *rgn = get_region (thawer.get_str ());
		154
		155	if (!parse_region (thawer, rgn))
		156	{
		157	delete rgn;
		158	return false;
		159	}
		160
		161	put_region (rgn);
		162	}
		163	break;
		164
		165	case KW_EOF:
		166	return true;
		167
		168	default:
		169	if (!thawer.parse_error (kw, "resource file"))
		170	return false;
		171	}
		172	}
		173	}
		174
		175	bool loader_base::load (const char *filename)
		176	{
		177	this->filename = filename;
		178
		179	object_thawer fp (filename);
		180
		181	if (!fp)
		182	return false;
		183
		184	return parse (fp);
		185	}
		186
		187	/////////////////////////////////////////////////////////////////////////////
32		188
33	/* Maps the MOVE_* values to names */	189	/* Maps the MOVE_* values to names */
34	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };	190	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
35		191
36	/* This table is only necessary to convert objects that existed before the	192	/* This table is only necessary to convert objects that existed before the
263	static void	419	static void
264	check_loaded_object (object *op)	420	check_loaded_object (object *op)
265	{	421	{
266	int ip;	422	int ip;
267		423
268	/* We do some specialized handling to handle legacy cases of name_pl.	424	/* 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 -	425	* 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	426	* 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	427	* 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	428	* 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.	429	* 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	430	* Otherwise, what happens is that the the plural name will lose
275	* information (appear as just 'hearts' and not 'goblins heart')	431	* information (appear as just 'hearts' and not 'goblins heart')
…		…
320	{	476	{
321	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());	477	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;	478	op->gen_sp_armour = op->last_heal;
323	op->last_heal = 0;	479	op->last_heal = 0;
324	}	480	}
325	if (editor)	481
326	ip = 0;
327	else
328	ip = calc_item_power (op, 0);	482	ip = calc_item_power (op, 0);
329	/* Legacy objects from before item power was in the game */	483	/* Legacy objects from before item power was in the game */
330	if (!op->item_power && ip)	484	if (!op->item_power && ip)
331	{	485	{
332	if (ip > 3)	486	if (ip > 3)
333	{	487	{
…		…
375	}	529	}
376		530
377	if (QUERY_FLAG (op, FLAG_MONSTER))	531	if (QUERY_FLAG (op, FLAG_MONSTER))
378	{	532	{
379	if (op->stats.hp > op->stats.maxhp)	533	if (op->stats.hp > op->stats.maxhp)
		534	{
380	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);	535	LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
		536	op->stats.maxhp = op->stats.hp;
		537	}
381		538
382	/* The archs just need to be updated for this */	539	/* The archs just need to be updated for this */
383	if (op->move_type == 0)	540	if (op->move_type == 0)
384	op->move_type = MOVE_WALK;	541	op->move_type = MOVE_WALK;
385	}	542	}
…		…
487	SET_FLAG (op, flag); \	644	SET_FLAG (op, flag); \
488	else \	645	else \
489	CLEAR_FLAG (op, flag) \	646	CLEAR_FLAG (op, flag) \
490		647
491	int	648	int
492	parse_object (object *op, object_thawer & thawer, int map_flags)	649	parse_object (object *op, object_thawer &thawer, int map_flags)
493	{	650	{
494	bool ismore = 0;	651	bool ismore = 0;
495	object *op_inv = op->inv;	652	object *op_inv = op->inv;
496		653
497	for (;;)	654	for (;;)
…		…
502	{	659	{
503	case KW_Object: // uppercase alias	660	case KW_Object: // uppercase alias
504	case KW_object:	661	case KW_object:
505	thawer.get (op->name);	662	thawer.get (op->name);
506		663
507	if (op->arch != NULL)	664	if (op->arch)
508	op->arch->name = op->name;	665	op->arch->name = op->name;
509		666
510	break;	667	break;
511		668
512	case KW_uuid:	669	case KW_uuid:
…		…
551	*/	708	*/
552	archetype *arch = archetype::find (str);	709	archetype *arch = archetype::find (str);
553		710
554	object *tmp;	711	object *tmp;
555		712
556	if (arch != NULL)	713	if (arch)
557	tmp = arch_to_object (arch);	714	tmp = arch_to_object (arch);
558	else	715	else
559	{	716	{
560	tmp = object::create ();	717	tmp = object::create ();
561	/* record the name of the broken object */	718	/* record the name of the broken object */
562	tmp->name = str;	719	tmp->name = str;
563	}	720	}
		721
		722	// decativate the object we, as we are still going
		723	// to read the speed value. Objects should be activated
		724	// when the map, object or player is completly loaded.
		725	tmp->deactivate ();
564		726
565	parse_object (tmp, thawer, map_flags);	727	parse_object (tmp, thawer, map_flags);
566		728
567	if (tmp->arch)	729	if (tmp->arch)
568	{	730	{
…		…
601	{	763	{
602	/* This is the actual archetype definition then */	764	/* This is the actual archetype definition then */
603	op->arch = archetype::find (str);	765	op->arch = archetype::find (str);
604		766
605	if (op->arch)	767	if (op->arch)
		768	{
606	op->arch->clone.copy_to (op);	769	op->arch->clone.copy_to (op);
		770	// copy_to activates, this should be fixed properly
		771	op->deactivate ();
		772	}
607	else if (!arch_init)	773	else if (!arch_init)
608	/* record the name of the broken object */	774	/* record the name of the broken object */
609	op->name = str;	775	op->name = str;
610	}	776	}
611	}	777	}
…		…
622	if (!str)	788	if (!str)
623	{	789	{
624	op->animation_id = 0;	790	op->animation_id = 0;
625	CLEAR_FLAG (op, FLAG_ANIMATE);	791	CLEAR_FLAG (op, FLAG_ANIMATE);
626	}	792	}
627	else
628	{
629	op->animation_id = find_animation (str);	793	else if ((op->animation_id = find_animation (str)))
630	SET_FLAG (op, FLAG_ANIMATE);	794	SET_FLAG (op, FLAG_ANIMATE);
631	}
632	}	795	}
633		796
634	break;	797	break;
635		798
636	case KW_last_heal: thawer.get (op->last_heal); break;	799	case KW_last_heal: thawer.get (op->last_heal); break;
…		…
641		804
642	case KW_speed:	805	case KW_speed:
643	thawer.get (op->speed);	806	thawer.get (op->speed);
644		807
645	//TODO: maybe do in check_object	808	//TODO: maybe do in check_object
646	if (!(map_flags & MAP_STYLE))	809	// removed check for style maps
647	{
648	if (op->speed < 0)	810	if (op->speed < 0)
649	op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;	811	op->speed_left = op->speed_left - rndm ();
650
651	update_ob_speed (op);
652	}
653		812
654	break;	813	break;
655		814
656	case KW_slow_move:	815	case KW_slow_move:
657	op->move_slow \|= MOVE_WALK;	816	op->move_slow \|= MOVE_WALK;
…		…
811	CLEAR_FLAG (op, FLAG_WIZCAST);	970	CLEAR_FLAG (op, FLAG_WIZCAST);
812	}	971	}
813	break;	972	break;
814		973
815	case KW_friendly:	974	case KW_friendly:
816	GET_FLAG (op, FLAG_FRIENDLY);	975	if (thawer.get_sint32 ())
817	//TODO: move to check_object or so	976	if (op->type != PLAYER)
818	if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
819	add_friendly_object (op);	977	add_friendly_object (op);
		978
820	break;	979	break;
821		980
822	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;	981	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
823	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;	982	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
824	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;	983	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
825	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;	984	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
		985	case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
826	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;	986	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827	case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;	987	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;	988	case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;	989	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
830	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;	990	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
…		…
901	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;	1061	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
902	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;	1062	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
903	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;	1063	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
904	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;	1064	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
905	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;	1065	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
		1066	case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
906		1067
907	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;	1068	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
908	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;	1069	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
909	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;	1070	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
910	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;	1071	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
…		…
980	case KW_randomitems:	1141	case KW_randomitems:
981	op->randomitems = find_treasurelist (thawer.get_str ());	1142	op->randomitems = find_treasurelist (thawer.get_str ());
982	break;	1143	break;
983		1144
984	case KW_msg:	1145	case KW_msg:
985	{
986	thawer.get_ml (KW_endmsg, op->msg);	1146	thawer.get_ml (KW_endmsg, op->msg);
987	//TODO: allow longer messages	1147	//TODO: allow longer messages
988	if (strlen (op->msg) >= HUGE_BUF)	1148	if (strlen (op->msg) >= HUGE_BUF)
989	{	1149	{
990	LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);	1150	LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
991	op->msg = "ERROR, please report: string too long, winged.\n";	1151	op->msg = "ERROR, please report: string too long, winged.\n";
992	}	1152	}
993	}
994	break;	1153	break;
995		1154
996	case KW_lore:	1155	case KW_lore:
997	{
998	shstr msgbuf;
999
1000	thawer.get_ml (KW_endlore, op->lore);	1156	thawer.get_ml (KW_endlore, op->lore);
1001	//TODO: allow longer messages	1157	//TODO: allow longer messages
1002	/* Just print a warning so we can be reasonably safe	1158	/* Just print a warning so we can be reasonably safe
1003	* about not overflowing the buffer.	1159	* about not overflowing the buffer.
1004	*/	1160	*/
1005	if (strlen (op->lore) > (HUGE_BUF / 2))	1161	if (strlen (op->lore) > (HUGE_BUF / 2))
1006	LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",	1162	LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1007	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);	1163	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008	}
1009	break;	1164	break;
1010		1165
1011	case KW_editable:	1166	case KW_editable:
1012	case KW_editor_folder:	1167	case KW_editor_folder:
1013	break;	1168	break;
…		…
1030		1185
1031	case KW_EOF:	1186	case KW_EOF:
1032	return LL_EOF;	1187	return LL_EOF;
1033		1188
1034	case KW_ERROR:	1189	case KW_ERROR:
1035	set_ob_key_value (op, thawer.line, thawer.last_value, true);	1190	set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036	//printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D	1191	//fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1037
1038	//TODO: skip line, ugly, factor parsing better
1039	if (thawer.last_value)
1040	thawer.line = thawer.last_value;
1041
1042	thawer.line += strlen (thawer.line) + 1;
1043
1044	break;	1192	break;
1045		1193
1046	default:	1194	default:
1047	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);	1195	if (!thawer.parse_error (kw, "object", op->name))
		1196	return false;
1048	break;	1197	break;
1049	}	1198	}
1050	}	1199	}
1051	}	1200	}
1052		1201
…		…
1062	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should	1211	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1063	* be reset.	1212	* be reset.
1064	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)	1213	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1065	*	1214	*
1066	*/	1215	*/
1067
1068	int	1216	int
1069	load_object (object_thawer & fp, object *op, int map_flags)	1217	load_object (object_thawer &fp, object *op, int map_flags)
1070	{	1218	{
		1219	coroapi::cede_every (1000); // cede once in a while
		1220
1071	return parse_object (op, fp, map_flags);	1221	return parse_object (op, fp, map_flags);
1072	}	1222	}
1073
1074		1223
1075	/* This takes a buffer, scans it for variables, and sets those variables	1224	/* This takes a buffer, scans it for variables, and sets those variables
1076	* as appropriate in op.	1225	* as appropriate in op.
1077	*	1226	*
1078	* This function appears to be used in only 2 places - in crossedit to	1227	* This function appears to be used in only 2 places - in crossedit to
…		…
1274	KW_berserk,	1423	KW_berserk,
1275	KW_neutral,	1424	KW_neutral,
1276	/* 100 */	1425	/* 100 */
1277	KW_no_attack,	1426	KW_no_attack,
1278	KW_no_damage,	1427	KW_no_damage,
1279	KW_NULL,	1428	KW_obj_original,
1280	KW_NULL,	1429	KW_NULL,
1281	KW_activate_on_push,	1430	KW_activate_on_push,
1282	KW_activate_on_release,	1431	KW_activate_on_release,
1283	KW_is_water,	1432	KW_is_water,
1284	KW_use_content_on_gen,	1433	KW_use_content_on_gen,
1285	KW_NULL,	1434	KW_NULL,
1286	KW_is_buildable,	1435	KW_is_buildable,
1287	/* 110 */	1436	/* 110 */
		1437	KW_destroy_on_death,
		1438	KW_NULL,
1288	};	1439	};
1289		1440
1290	int i;	1441	int i;
1291		1442
1292	/* This saves the key/value lists. We do it first so that any	1443	/* This saves the key/value lists. We do it first so that any
1293	* keys that match field names will be overwritten by the loader.	1444	* keys that match field names will be overwritten by the loader.
1294	*/	1445	*/
1295	for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next)	1446	for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1296	{	1447	{
1297	/* Find the field in the opposing member. */	1448	/* Find the field in the opposing member. */
1298	key_value *arch_field = get_ob_key_link (tmp, my_field->key);	1449	key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1299		1450
1300	/* If there's no partnering field, or it's got a different value, save our field. */	1451	/* If there's no partnering field, or it's got a different value, save our field. */
…		…
1443		1594
1444	/*	1595	/*
1445	* Dumps all variables in an object to a file.	1596	* Dumps all variables in an object to a file.
1446	* If bit 0 of flag is set, unpaid objects will be saved. As of now,	1597	* If bit 0 of flag is set, unpaid objects will be saved. As of now,
1447	* the only place this is not set is when saving the player.	1598	* the only place this is not set is when saving the player.
1448	* If bit 1 of flag is set, don't remove the object after save. As of now,
1449	* all of the callers are setting this.
1450	*/	1599	*/
1451
1452	void	1600	void
1453	save_object (object_freezer & fp, object *op, int flag)	1601	save_object (object_freezer &fp, object *op, int flag)
1454	{	1602	{
1455	archetype *at;
1456	object tmp, old;
1457
1458	/* Even if the object does have an owner, it would seem that we should	1603	/* Even if the object does have an owner, it would seem that we should
1459	* still save it.	1604	* still save it.
1460	*/	1605	*/
1461	if (op->owner)	1606	if (op->owner)
1462	return;	1607	return;
1463		1608
1464	/* If it is unpaid and we don't want to save those, just return. */	1609	/* If it is unpaid and we don't want to save those, just return. */
1465	if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))	1610	if (!(flag & 1) && op->flag [FLAG_UNPAID])
1466	return;	1611	return;
1467		1612
1468	if ((at = op->arch) == NULL)	1613	archetype at = op->arch ? (archetype )op->arch : empty_archetype;
1469	at = empty_archetype;
1470		1614
1471	fp.put (KW_arch, at->name);	1615	fp.put (KW_arch, at->name);
1472
1473	put (fp, op, &at->clone);	1616	put (fp, op, &at->clone);
1474		1617
1475	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */	1618	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1476		1619
1477	old = NULL;
1478
1479	if (flag & 2)
1480	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1620	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1481	save_object (fp, tmp, flag);	1621	save_object (fp, tmp, flag);
1482	else
1483	/* Slightly different logic because tmp/op will be removed by
1484	* the save_object we call. So we just keep looking at op->inv
1485	* until there is nothing left. In theory, the variable old
1486	* should not be needed, as recursive loops shouldn't happen.
1487	*/
1488	while ((tmp = op->inv) != NULL)
1489	{
1490	if (old == tmp)
1491	{
1492	LOG (llevError, " Recursive loop in inventory\n");
1493	break;
1494	}
1495
1496	save_object (fp, tmp, flag);
1497	old = tmp;
1498	}
1499
1500	if (!(flag & 2))
1501	op->destroy ();
1502		1622
1503	fp.put (op);	1623	fp.put (op);
1504	fprintf (fp, "end\n");	1624	fp.put (KW_end);
1505	}	1625	}
1506		1626

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.27 by root, Sat Dec 23 06:41:39 2006 UTC vs. Revision 1.52 by root, Thu Feb 1 19:15:38 2007 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.27 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.52 by root, Thu Feb 1 19:15:38 2007 UTC