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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.22 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.48 by root, Fri Jan 19 17:50:10 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
29	#include <global.h>	30	#include <global.h>
30	#include <loader.h>	31	#include <loader.h>
31	#include <newserver.h>
32	#include <sproto.h>	32	#include <sproto.h>
		33
		34	// future resource loader base class
		35	struct loader_base
		36	{
		37	virtual archetype get_arch (const char name);
		38	virtual void put_arch (archetype *arch);
		39
		40	virtual object get_object (const char name);
		41	virtual void put_object (object *op);
		42
		43	virtual player *get_player ();
		44	virtual void put_player (player *pl);
		45
		46	virtual region *get_region ();
		47	virtual void put_region (region *region);
		48
		49	virtual facetile get_face (const char name);
		50	virtual void put_face (facetile *face);
		51
		52	virtual treasurelist get_treasure (const char name, bool one = false);
		53	virtual void put_treasure (treasurelist *treasure);
		54
		55	virtual animation get_animation (const char name);
		56	virtual void put_animation (animation *anim);
		57	};
		58
		59	// future generic resource loader
		60	// handles generic stuff valid in most files, such as
		61	// animations, treasures, faces and so on
		62	struct loader_generic : loader_base
		63	{
		64	virtual region *get_region ();
		65	virtual void put_region (region *region);
		66
		67	virtual facetile get_face (const char name);
		68	virtual void put_face (facetile *face);
		69
		70	virtual treasurelist get_treasure (const char name, bool one = false);
		71	virtual void put_treasure (treasurelist *treasure);
		72
		73	virtual animation get_animation (const char name);
		74	virtual void put_animation (animation *anim);
		75	};
33		76
34	/* Maps the MOVE_* values to names */	77	/* Maps the MOVE_* values to names */
35	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };	78	static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36		79
37	/* This table is only necessary to convert objects that existed before the	80	/* This table is only necessary to convert objects that existed before the
264	static void	307	static void
265	check_loaded_object (object *op)	308	check_loaded_object (object *op)
266	{	309	{
267	int ip;	310	int ip;
268		311
269	/* We do some specialized handling to handle legacy cases of name_pl.	312	/* We do some specialised handling to handle legacy cases of name_pl.
270	* If the object doesn't have a name_pl, we just use the object name -	313	* If the object doesn't have a name_pl, we just use the object name -
271	* this isn't perfect (things won't be properly pluralized), but works to	314	* this isn't perfect (things won't be properly pluralised), but works to
272	* that degree (5 heart is still quite understandable). But the case we	315	* that degree (5 heart is still quite understandable). But the case we
273	* also have to catch is if this object is not using the normal name for	316	* also have to catch is if this object is not using the normal name for
274	* the object. In that case, we also want to use the loaded name.	317	* the object. In that case, we also want to use the loaded name.
275	* Otherwise, what happens is that the the plural name will lose	318	* Otherwise, what happens is that the the plural name will lose
276	* information (appear as just 'hearts' and not 'goblins heart')	319	* information (appear as just 'hearts' and not 'goblins heart')
…		…
280		323
281	if (!op->name_pl)	324	if (!op->name_pl)
282	op->name_pl = op->name;	325	op->name_pl = op->name;
283		326
284	/* objects now have a materialname. try to patch it in */	327	/* objects now have a materialname. try to patch it in */
285	if (!(IS_WEAPON (op) && op->level > 0))	328	if (!(op->is_weapon () && op->level > 0))
286	{	329	{
287	if (op->map != NULL)	330	if (op->map != NULL)
288	set_materialname (op, op->map->difficulty, NULL);	331	set_materialname (op, op->map->difficulty, NULL);
289	else	332	else
290	set_materialname (op, 5, NULL);	333	set_materialname (op, 5, NULL);
…		…
321	{	364	{
322	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());	365	LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
323	op->gen_sp_armour = op->last_heal;	366	op->gen_sp_armour = op->last_heal;
324	op->last_heal = 0;	367	op->last_heal = 0;
325	}	368	}
326	if (editor)	369
327	ip = 0;
328	else
329	ip = calc_item_power (op, 0);	370	ip = calc_item_power (op, 0);
330	/* Legacy objects from before item power was in the game */	371	/* Legacy objects from before item power was in the game */
331	if (!op->item_power && ip)	372	if (!op->item_power && ip)
332	{	373	{
333	if (ip > 3)	374	if (ip > 3)
334	{	375	{
…		…
488	SET_FLAG (op, flag); \	529	SET_FLAG (op, flag); \
489	else \	530	else \
490	CLEAR_FLAG (op, flag) \	531	CLEAR_FLAG (op, flag) \
491		532
492	int	533	int
493	parse_object (object *op, object_thawer & thawer, int map_flags)	534	parse_object (object *op, object_thawer &thawer, int map_flags)
494	{	535	{
495	bool ismore = 0;	536	bool ismore = 0;
496	object *op_inv = op->inv;	537	object *op_inv = op->inv;
497		538
498	for (;;)	539	for (;;)
…		…
503	{	544	{
504	case KW_Object: // uppercase alias	545	case KW_Object: // uppercase alias
505	case KW_object:	546	case KW_object:
506	thawer.get (op->name);	547	thawer.get (op->name);
507		548
508	if (op->arch != NULL)	549	if (op->arch)
509	op->arch->name = op->name;	550	op->arch->name = op->name;
510		551
511	break;	552	break;
512		553
513	case KW_uuid:	554	case KW_uuid:
…		…
552	*/	593	*/
553	archetype *arch = archetype::find (str);	594	archetype *arch = archetype::find (str);
554		595
555	object *tmp;	596	object *tmp;
556		597
557	if (arch != NULL)	598	if (arch)
558	tmp = arch_to_object (arch);	599	tmp = arch_to_object (arch);
559	else	600	else
560	{	601	{
561	tmp = object::create ();	602	tmp = object::create ();
562	/* record the name of the broken object */	603	/* record the name of the broken object */
563	tmp->name = str;	604	tmp->name = str;
564	}	605	}
		606
		607	// decativate the object we, as we are still going
		608	// to read the speed value. Objects should be activated
		609	// when the map, object or player is completly loaded.
		610	tmp->deactivate ();
565		611
566	parse_object (tmp, thawer, map_flags);	612	parse_object (tmp, thawer, map_flags);
567		613
568	if (tmp->arch)	614	if (tmp->arch)
569	{	615	{
…		…
602	{	648	{
603	/* This is the actual archetype definition then */	649	/* This is the actual archetype definition then */
604	op->arch = archetype::find (str);	650	op->arch = archetype::find (str);
605		651
606	if (op->arch)	652	if (op->arch)
		653	{
607	op->arch->clone.copy_to (op);	654	op->arch->clone.copy_to (op);
		655	// copy_to activates, this should be fixed properly
		656	op->deactivate ();
		657	}
608	else if (!arch_init)	658	else if (!arch_init)
609	/* record the name of the broken object */	659	/* record the name of the broken object */
610	op->name = str;	660	op->name = str;
611	}	661	}
612	}	662	}
…		…
623	if (!str)	673	if (!str)
624	{	674	{
625	op->animation_id = 0;	675	op->animation_id = 0;
626	CLEAR_FLAG (op, FLAG_ANIMATE);	676	CLEAR_FLAG (op, FLAG_ANIMATE);
627	}	677	}
628	else
629	{
630	op->animation_id = find_animation (str);	678	else if ((op->animation_id = find_animation (str)))
631	SET_FLAG (op, FLAG_ANIMATE);	679	SET_FLAG (op, FLAG_ANIMATE);
632	}
633	}	680	}
634		681
635	break;	682	break;
636		683
637	case KW_last_heal: thawer.get (op->last_heal); break;	684	case KW_last_heal: thawer.get (op->last_heal); break;
…		…
642		689
643	case KW_speed:	690	case KW_speed:
644	thawer.get (op->speed);	691	thawer.get (op->speed);
645		692
646	//TODO: maybe do in check_object	693	//TODO: maybe do in check_object
647	if (!(map_flags & MAP_STYLE))	694	// removed check for style maps
648	{
649	if (op->speed < 0)	695	if (op->speed < 0)
650	op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;	696	op->speed_left = op->speed_left - rndm ();
651
652	update_ob_speed (op);
653	}
654		697
655	break;	698	break;
656		699
657	case KW_slow_move:	700	case KW_slow_move:
658	op->move_slow \|= MOVE_WALK;	701	op->move_slow \|= MOVE_WALK;
…		…
812	CLEAR_FLAG (op, FLAG_WIZCAST);	855	CLEAR_FLAG (op, FLAG_WIZCAST);
813	}	856	}
814	break;	857	break;
815		858
816	case KW_friendly:	859	case KW_friendly:
817	GET_FLAG (op, FLAG_FRIENDLY);	860	if (thawer.get_sint32 ())
818	//TODO: move to check_object or so	861	if (op->type != PLAYER)
819	if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
820	add_friendly_object (op);	862	add_friendly_object (op);
		863
821	break;	864	break;
822		865
823	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;	866	case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
824	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;	867	case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
825	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;	868	case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
826	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;	869	case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
		870	case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
827	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;	871	case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
828	case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;	872	case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
829	case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;	873	case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
830	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;	874	case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
831	case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
832	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;	875	case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
833	case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;	876	case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
834	case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;	877	case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
835	case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;	878	case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
836	case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;	879	case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
…		…
903	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;	946	case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
904	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;	947	case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
905	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;	948	case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
906	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;	949	case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
907	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;	950	case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
		951	case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
908		952
909	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;	953	case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
910	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;	954	case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
911	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;	955	case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
912	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;	956	case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
…		…
982	case KW_randomitems:	1026	case KW_randomitems:
983	op->randomitems = find_treasurelist (thawer.get_str ());	1027	op->randomitems = find_treasurelist (thawer.get_str ());
984	break;	1028	break;
985		1029
986	case KW_msg:	1030	case KW_msg:
987	{
988	thawer.get_ml (KW_endmsg, op->msg);	1031	thawer.get_ml (KW_endmsg, op->msg);
989	//TODO: allow longer messages	1032	//TODO: allow longer messages
990	if (strlen (op->msg) >= HUGE_BUF)	1033	if (strlen (op->msg) >= HUGE_BUF)
991	{	1034	{
992	LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);	1035	LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
993	op->msg = "ERROR, please report: string too long, winged.\n";	1036	op->msg = "ERROR, please report: string too long, winged.\n";
994	}	1037	}
995	}
996	break;	1038	break;
997		1039
998	case KW_lore:	1040	case KW_lore:
999	{
1000	shstr msgbuf;
1001
1002	thawer.get_ml (KW_endlore, op->lore);	1041	thawer.get_ml (KW_endlore, op->lore);
1003	//TODO: allow longer messages	1042	//TODO: allow longer messages
1004	/* Just print a warning so we can be reasonably safe	1043	/* Just print a warning so we can be reasonably safe
1005	* about not overflowing the buffer.	1044	* about not overflowing the buffer.
1006	*/	1045	*/
1007	if (strlen (op->lore) > (HUGE_BUF / 2))	1046	if (strlen (op->lore) > (HUGE_BUF / 2))
1008	LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",	1047	LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1009	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);	1048	HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1010	}
1011	break;	1049	break;
1012		1050
1013	case KW_editable:	1051	case KW_editable:
1014	case KW_editor_folder:	1052	case KW_editor_folder:
1015	break;	1053	break;
…		…
1032		1070
1033	case KW_EOF:	1071	case KW_EOF:
1034	return LL_EOF;	1072	return LL_EOF;
1035		1073
1036	case KW_ERROR:	1074	case KW_ERROR:
1037	set_ob_key_value (op, thawer.line, thawer.last_value, true);	1075	set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1038	//printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D	1076	//fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1039
1040	//TODO: skip line, ugly, factor parsing better
1041	if (thawer.last_value)
1042	thawer.line = thawer.last_value;
1043
1044	thawer.line += strlen (thawer.line) + 1;
1045
1046	break;	1077	break;
1047		1078
1048	default:	1079	default:
1049	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);	1080	LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1050	break;	1081	break;
…		…
1064	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should	1095	* LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1065	* be reset.	1096	* be reset.
1066	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)	1097	* LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1067	*	1098	*
1068	*/	1099	*/
1069
1070	int	1100	int
1071	load_object (object_thawer & fp, object *op, int map_flags)	1101	load_object (object_thawer &fp, object *op, int map_flags)
1072	{	1102	{
		1103	coroapi::cede_every (1000); // cede once in a while
		1104
1073	return parse_object (op, fp, map_flags);	1105	return parse_object (op, fp, map_flags);
1074	}	1106	}
1075
1076		1107
1077	/* This takes a buffer, scans it for variables, and sets those variables	1108	/* This takes a buffer, scans it for variables, and sets those variables
1078	* as appropriate in op.	1109	* as appropriate in op.
1079	*	1110	*
1080	* This function appears to be used in only 2 places - in crossedit to	1111	* This function appears to be used in only 2 places - in crossedit to
…		…
1183	KW_monster,	1214	KW_monster,
1184	KW_friendly,	1215	KW_friendly,
1185	KW_generator,	1216	KW_generator,
1186	KW_is_thrown,	1217	KW_is_thrown,
1187	KW_auto_apply,	1218	KW_auto_apply,
1188	KW_treasure,	1219	KW_NULL, // was KW_treasure
1189	KW_player_sold,	1220	KW_player_sold,
1190	/* 20 */	1221	/* 20 */
1191	KW_see_invisible,	1222	KW_see_invisible,
1192	KW_can_roll,	1223	KW_can_roll,
1193	KW_overlay_floor,	1224	KW_overlay_floor,
…		…
1276	KW_berserk,	1307	KW_berserk,
1277	KW_neutral,	1308	KW_neutral,
1278	/* 100 */	1309	/* 100 */
1279	KW_no_attack,	1310	KW_no_attack,
1280	KW_no_damage,	1311	KW_no_damage,
1281	KW_NULL,	1312	KW_obj_original,
1282	KW_NULL,	1313	KW_NULL,
1283	KW_activate_on_push,	1314	KW_activate_on_push,
1284	KW_activate_on_release,	1315	KW_activate_on_release,
1285	KW_is_water,	1316	KW_is_water,
1286	KW_use_content_on_gen,	1317	KW_use_content_on_gen,
1287	KW_NULL,	1318	KW_NULL,
1288	KW_is_buildable,	1319	KW_is_buildable,
1289	/* 110 */	1320	/* 110 */
		1321	KW_destroy_on_death,
		1322	KW_NULL,
1290	};	1323	};
1291		1324
1292	int i;	1325	int i;
1293		1326
1294	/* This saves the key/value lists. We do it first so that any	1327	/* This saves the key/value lists. We do it first so that any
1295	* keys that match field names will be overwritten by the loader.	1328	* keys that match field names will be overwritten by the loader.
1296	*/	1329	*/
1297	for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next)	1330	for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1298	{	1331	{
1299	/* Find the field in the opposing member. */	1332	/* Find the field in the opposing member. */
1300	key_value *arch_field = get_ob_key_link (tmp, my_field->key);	1333	key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1301		1334
1302	/* If there's no partnering field, or it's got a different value, save our field. */	1335	/* If there's no partnering field, or it's got a different value, save our field. */
…		…
1430	CMP_OUT (move_on);	1463	CMP_OUT (move_on);
1431	CMP_OUT (move_off);	1464	CMP_OUT (move_off);
1432	CMP_OUT (move_slow);	1465	CMP_OUT (move_slow);
1433	CMP_OUT (move_slow_penalty);	1466	CMP_OUT (move_slow_penalty);
1434		1467
1435	if (!COMPARE_FLAGS (op, tmp))	1468	if (op->flag != tmp->flag)
1436	for (i = 0; i <= NUM_FLAGS; i++)	1469	for (i = 0; i <= NUM_FLAGS; i++)
1437	if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))	1470	if (flag_names [i] && op->flag [i] != tmp->flag [i])
1438	f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0");	1471	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1439		1472
1440	/* Save body locations */	1473	/* Save body locations */
1441	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1474	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1442	if (op->body_info[i] != tmp->body_info[i])	1475	if (op->body_info[i] != tmp->body_info[i])
1443	f.put (body_locations[i].save_name, op->body_info[i]);	1476	f.put (body_locations[i].save_name, op->body_info[i]);
…		…
1445		1478
1446	/*	1479	/*
1447	* Dumps all variables in an object to a file.	1480	* Dumps all variables in an object to a file.
1448	* If bit 0 of flag is set, unpaid objects will be saved. As of now,	1481	* If bit 0 of flag is set, unpaid objects will be saved. As of now,
1449	* the only place this is not set is when saving the player.	1482	* the only place this is not set is when saving the player.
1450	* If bit 1 of flag is set, don't remove the object after save. As of now,
1451	* all of the callers are setting this.
1452	*/	1483	*/
1453
1454	void	1484	void
1455	save_object (object_freezer & fp, object *op, int flag)	1485	save_object (object_freezer &fp, object *op, int flag)
1456	{	1486	{
1457	archetype *at;
1458	object tmp, old;
1459
1460	/* Even if the object does have an owner, it would seem that we should	1487	/* Even if the object does have an owner, it would seem that we should
1461	* still save it.	1488	* still save it.
1462	*/	1489	*/
1463	if (op->owner)	1490	if (op->owner)
1464	return;	1491	return;
1465		1492
1466	/* If it is unpaid and we don't want to save those, just return. */	1493	/* If it is unpaid and we don't want to save those, just return. */
1467	if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))	1494	if (!(flag & 1) && op->flag [FLAG_UNPAID])
1468	return;	1495	return;
1469		1496
1470	if ((at = op->arch) == NULL)	1497	archetype at = op->arch ? (archetype )op->arch : empty_archetype;
1471	at = empty_archetype;
1472		1498
1473	fp.put (KW_arch, at->name);	1499	fp.put (KW_arch, at->name);
1474
1475	put (fp, op, &at->clone);	1500	put (fp, op, &at->clone);
1476		1501
1477	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */	1502	/* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1478		1503
1479	old = NULL;
1480
1481	if (flag & 2)
1482	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1504	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1483	save_object (fp, tmp, flag);	1505	save_object (fp, tmp, flag);
1484	else
1485	/* Slightly different logic because tmp/op will be removed by
1486	* the save_object we call. So we just keep looking at op->inv
1487	* until there is nothing left. In theory, the variable old
1488	* should not be needed, as recursive loops shouldn't happen.
1489	*/
1490	while ((tmp = op->inv) != NULL)
1491	{
1492	if (old == tmp)
1493	{
1494	LOG (llevError, " Recursive loop in inventory\n");
1495	break;
1496	}
1497
1498	save_object (fp, tmp, flag);
1499	old = tmp;
1500	}
1501
1502	if (!(flag & 2))
1503	op->destroy ();
1504		1506
1505	fp.put (op);	1507	fp.put (op);
1506	fprintf (fp, "end\n");	1508	fp.put (KW_end);
1507	}	1509	}
1508		1510

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.22 by root, Tue Dec 12 21:39:56 2006 UTC vs. Revision 1.48 by root, Fri Jan 19 17:50:10 2007 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.22 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.48 by root, Fri Jan 19 17:50:10 2007 UTC