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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.126 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.136 by root, Wed Nov 4 00:02:48 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
461	}	462	}
462	else	463	else
463	move_type = MOVE_WALK;	464	move_type = MOVE_WALK;
464	}	465	}
465	}	466	}
		467
		468	// if the object has an animation, try to provide a default face
		469	if (has_anim ())
		470	{
		471	const animation &anim_ob = anim ();
		472
		473	if (anim_speed)
		474	// if this item is time-animated, force the last frame
		475	animate_object (this, 0);
		476	else if (flag [FLAG_MONSTER])
		477	// if it is a monster, set appropriate facing
		478	animate_object (this, direction);
		479	}
466	}	480	}
467		481
468	static void	482	static void
469	set_move (MoveType &mt, const char *str)	483	set_move (MoveType &mt, const char *str)
470	{	484	{
…		…
927	case KW_anim_speed: f.get (anim_speed); break;	941	case KW_anim_speed: f.get (anim_speed); break;
928	case KW_container: f.get (weight_limit); break;	942	case KW_container: f.get (weight_limit); break;
929	case KW_will_apply: f.get (will_apply); break;	943	case KW_will_apply: f.get (will_apply); break;
930	case KW_attack_movement: f.get (attack_movement); break;	944	case KW_attack_movement: f.get (attack_movement); break;
931	case KW_move_state: f.get (move_status); break;	945	case KW_move_state: f.get (move_status); break;
932	case KW_expmul: f.get (expmul); break;	946	//case KW_expmul: f.get (expmul); break;//D declared const for the time being
933	case KW_glow_radius: f.get (glow_radius); break;	947	case KW_glow_radius: f.get (glow_radius); break;
934	case KW_weapontype: f.get (weapontype); break;	948	case KW_weapontype: f.get (weapontype); break;
935	case KW_casting_time: f.get (casting_time); break;	949	case KW_casting_time: f.get (casting_time); break;
936		950
937	// elevation is deprecated	951	// elevation is deprecated
…		…
963	case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;	977	case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
964	case KW_can_apply:	978	case KW_can_apply:
965	break;	979	break;
966		980
967	case KW_connected:	981	case KW_connected:
968	add_button_link (this, map, f.get_sint32 ());	982	{
		983	shstr connected;
		984
		985	f.get (connected);
		986	add_link (map, connected);
		987	}
969	break;	988	break;
970		989
971	case KW_randomitems:	990	case KW_randomitems:
972	if (f.get_str ())	991	if (f.get_str ())
973	{	992	{
…		…
975	loading_arch	994	loading_arch
976	? treasurelist::get (f.get_str ())	995	? treasurelist::get (f.get_str ())
977	: treasurelist::find (f.get_str ());	996	: treasurelist::find (f.get_str ());
978		997
979	if (!randomitems)	998	if (!randomitems)
		999	{
980	LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());	1000	LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
		1001	randomitems = treasurelist::get (shstr_none); // avoid crashes
		1002	}
981	}	1003	}
982	else	1004	else
983	randomitems = 0;	1005	randomitems = 0;
984	break;	1006	break;
985		1007
…		…
1079	{	1101	{
1080	object_thawer f (buf, (AV *)0);	1102	object_thawer f (buf, (AV *)0);
1081		1103
1082	return op->parse_kv (f);	1104	return op->parse_kv (f);
1083	}	1105	}
1084
1085	/* This returns a string of the integer movement type */
1086	#if 0
1087	// unused function
1088	static char *
1089	get_string_move_type (MoveType mt)
1090	{
1091	static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1092	int i, all_count = 0, count;
1093
1094	strcpy (retbuf, "");
1095	strcpy (retbuf_all, " all");
1096
1097	/* Quick check, and probably fairly common */
1098	if (mt == MOVE_ALL)
1099	return retbuf_all + 1;
1100	if (mt == 0)
1101	{
1102	strcpy (retbuf, "0");
1103	return retbuf;
1104	}
1105
1106	/* We basically slide the bits down. Why look at MOVE_ALL?
1107	* because we may want to return a string like 'all -swim',
1108	* and if we just looked at mt, we couldn't get that.
1109	*/
1110	for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1111	{
1112	if (mt & (1 << count))
1113	{
1114	strcat (retbuf, " ");
1115	strcat (retbuf, move_name[count]);
1116	}
1117	else
1118	{
1119	strcat (retbuf_all, " -");
1120	strcat (retbuf_all, move_name[count]);
1121	all_count++;
1122	}
1123	}
1124	/* Basically, if there is a single negation, return it, eg
1125	* 'all -swim'. But more than that, just return the
1126	* enumerated values. It doesn't make sense to return
1127	* 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1128	*/
1129	if (all_count <= 1)
1130	return retbuf_all + 1;
1131	else
1132	return retbuf + 1;
1133	}
1134	#endif
1135		1106
1136	// compare op against tmp and output differences	1107	// compare op against tmp and output differences
1137	static void	1108	static void
1138	write_diff (object_freezer &f, object op, object tmp)	1109	write_diff (object_freezer &f, object op, object tmp)
1139	{	1110	{
…		…
1284		1255
1285	/* We don't need to worry about the arch's extra fields - they	1256	/* We don't need to worry about the arch's extra fields - they
1286	* will get taken care of the copy_to method.	1257	* will get taken care of the copy_to method.
1287	*/	1258	*/
1288		1259
		1260	if (op->uuid)
1289	f.put (KW_uuid, op->uuid.c_str ());	1261	f.put (KW_uuid, op->uuid.c_str ());
1290		1262
1291	#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)	1263	#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1292	#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)	1264	#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1293		1265
1294	if (object *owner = op->owner)	1266	if (object *owner = op->owner)
…		…
1310	if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);	1282	if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1311	if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);	1283	if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1312	if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);	1284	if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1313		1285
1314	if (op->animation_id != tmp->animation_id)	1286	if (op->animation_id != tmp->animation_id)
1315	if (op->animation_id)	1287	if (op->has_anim ())
1316	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);	1288	f.put (KW_animation, op->anim ().name);
1317	else	1289	else
1318	{	1290	{
1319	f.put (KW_animation, (const char *)0);	1291	f.put (KW_animation, (const char *)0);
1320	op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?	1292	op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1321	}	1293	}
…		…
1378	CMP_OUT (last_grace);	1350	CMP_OUT (last_grace);
1379	CMP_OUT (last_eat);	1351	CMP_OUT (last_eat);
1380	CMP_OUT (glow_radius);	1352	CMP_OUT (glow_radius);
1381		1353
1382	if (op->flag [FLAG_IS_LINKED])	1354	if (op->flag [FLAG_IS_LINKED])
1383	if (int i = get_button_value (op))	1355	if (auto (ol, op->find_link ()))
1384	f.put (KW_connected, i);	1356	f.put (KW_connected, ol->id);
1385		1357
1386	CMP_OUT (randomitems);	1358	CMP_OUT (randomitems);
1387	CMP_OUT2 (container, weight_limit);	1359	CMP_OUT2 (container, weight_limit);
1388		1360
1389	CMP_OUT (run_away);	1361	CMP_OUT (run_away);
…		…
1425	* the only place this is not set is when saving the player.	1397	* the only place this is not set is when saving the player.
1426	*/	1398	*/
1427	bool	1399	bool
1428	object::write (object_freezer &f)	1400	object::write (object_freezer &f)
1429	{	1401	{
1430	archetype *at = arch ? arch : archetype::empty;	1402	if (is_arch ())
1431		1403	{
		1404	f.put (KW_object, arch->archname);
		1405	write_diff (f, this, archetype::empty);
		1406	}
		1407	else
		1408	{
1432	f.put (KW_arch, at->archname);	1409	f.put (KW_arch, arch->archname);
1433	write_diff (f, this, at);	1410	write_diff (f, this, arch);
		1411	}
1434		1412
1435	for (object *tmp = inv; tmp; tmp = tmp->below)	1413	for (object *tmp = inv; tmp; tmp = tmp->below)
1436	tmp->write (f);	1414	tmp->write (f);
1437		1415
1438	f.put (this);	1416	f.put (this);

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.126 by root, Thu Jan 1 11:41:17 2009 UTC vs. Revision 1.136 by root, Wed Nov 4 00:02:48 2009 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.126 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.136 by root, Wed Nov 4 00:02:48 2009 UTC