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

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

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.28 by root, Mon Dec 25 11:25:49 2006 UTC vs. Revision 1.50 by root, Fri Jan 19 18:06:51 2007 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.28 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.50 by root, Fri Jan 19 18:06:51 2007 UTC