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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.132 by root, Thu Sep 17 01:57:31 2009 UTC vs.
Revision 1.139 by root, Sun Nov 8 22:28:10 2009 UTC

…		…
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008,2009 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>
…		…
26	#include <sproto.h>	27	#include <sproto.h>
27		28
28	/////////////////////////////////////////////////////////////////////////////	29	/////////////////////////////////////////////////////////////////////////////
29		30
30	extern archetype *loading_arch;	31	extern archetype *loading_arch;
		32
		33	//+GPL
31		34
32	/* This table is only necessary to convert objects that existed before the	35	/* This table is only necessary to convert objects that existed before the
33	* spell object conversion to the new object. It was not practical	36	* spell object conversion to the new object. It was not practical
34	* to go through every mapping looking for every potion, rod, wand, etc	37	* to go through every mapping looking for every potion, rod, wand, etc
35	* that had a sp set and update to the new value. So this maps the	38	* that had a sp set and update to the new value. So this maps the
…		…
536		539
537	next: ;	540	next: ;
538	}	541	}
539	}	542	}
540		543
		544	//-GPL
		545
541	#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()	546	#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
542		547
543	bool	548	bool
544	object::parse_kv (object_thawer &f)	549	object::parse_kv (object_thawer &f)
545	{	550	{
…		…
993	loading_arch	998	loading_arch
994	? treasurelist::get (f.get_str ())	999	? treasurelist::get (f.get_str ())
995	: treasurelist::find (f.get_str ());	1000	: treasurelist::find (f.get_str ());
996		1001
997	if (!randomitems)	1002	if (!randomitems)
		1003	{
998	LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());	1004	LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
		1005	randomitems = treasurelist::get (shstr_none); // avoid crashes
		1006	}
999	}	1007	}
1000	else	1008	else
1001	randomitems = 0;	1009	randomitems = 0;
1002	break;	1010	break;
1003		1011
…		…
1062	archetype *arch = archetype::find (f.get_str ());	1070	archetype *arch = archetype::find (f.get_str ());
1063		1071
1064	if (!arch)	1072	if (!arch)
1065	{	1073	{
1066	LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());	1074	LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1067	arch = archetype::find ("earthwall");	1075	arch = archetype::find (shstr_earthwall);
1068	}	1076	}
1069		1077
1070	assert (arch); //D maybe use exception handling of sorts?	1078	assert (arch); //D maybe use exception handling of sorts?
1071		1079
1072	f.next ();	1080	f.next ();
…		…
1098	object_thawer f (buf, (AV *)0);	1106	object_thawer f (buf, (AV *)0);
1099		1107
1100	return op->parse_kv (f);	1108	return op->parse_kv (f);
1101	}	1109	}
1102		1110
1103	/* This returns a string of the integer movement type */
1104	#if 0
1105	// unused function
1106	static char *
1107	get_string_move_type (MoveType mt)
1108	{
1109	static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1110	int i, all_count = 0, count;
1111
1112	strcpy (retbuf, "");
1113	strcpy (retbuf_all, " all");
1114
1115	/* Quick check, and probably fairly common */
1116	if (mt == MOVE_ALL)
1117	return retbuf_all + 1;
1118	if (mt == 0)
1119	{
1120	strcpy (retbuf, "0");
1121	return retbuf;
1122	}
1123
1124	/* We basically slide the bits down. Why look at MOVE_ALL?
1125	* because we may want to return a string like 'all -swim',
1126	* and if we just looked at mt, we couldn't get that.
1127	*/
1128	for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1129	{
1130	if (mt & (1 << count))
1131	{
1132	strcat (retbuf, " ");
1133	strcat (retbuf, move_name[count]);
1134	}
1135	else
1136	{
1137	strcat (retbuf_all, " -");
1138	strcat (retbuf_all, move_name[count]);
1139	all_count++;
1140	}
1141	}
1142	/* Basically, if there is a single negation, return it, eg
1143	* 'all -swim'. But more than that, just return the
1144	* enumerated values. It doesn't make sense to return
1145	* 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1146	*/
1147	if (all_count <= 1)
1148	return retbuf_all + 1;
1149	else
1150	return retbuf + 1;
1151	}
1152	#endif
1153
1154	// compare op against tmp and output differences	1111	// compare op against arch and output differences
1155	static void	1112	static void
1156	write_diff (object_freezer &f, object op, object tmp)	1113	write_diff (object_freezer &f, object op, object arch)
1157	{	1114	{
1158	static const keyword resist_save[NROFATTACKS] = {	1115	static const keyword resist_save[NROFATTACKS] = {
1159	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,	1116	# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1160	# include "attackinc.h"	1117	# include "attackinc.h"
1161	# undef def	1118	# undef def
…		…
1295		1252
1296	/* This saves the key/value lists. We do it first so that any	1253	/* This saves the key/value lists. We do it first so that any
1297	* keys that match field names will be overwritten by the loader.	1254	* keys that match field names will be overwritten by the loader.
1298	*/	1255	*/
1299	for (key_value *kv = op->key_values; kv; kv = kv->next)	1256	for (key_value *kv = op->key_values; kv; kv = kv->next)
1300	if (!tmp->key_values \|\| tmp->kv (kv->key) != kv->value)	1257	if (!arch->key_values \|\| arch->kv (kv->key) != kv->value)
1301	f.put (kv->key, kv->value);	1258	f.put (kv->key, kv->value);
1302		1259
1303	/* We don't need to worry about the arch's extra fields - they	1260	if (op->uuid)
1304	* will get taken care of the copy_to method.
1305	*/
1306
1307	f.put (KW_uuid, op->uuid.c_str ());	1261	f.put (KW_uuid, op->uuid.c_str ());
1308		1262
1309	#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 != arch->v)) f.put (KW_ ## v, op->v)
1310	#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 != arch->v)) f.put (KW_ ## k, op->v)
		1265
		1266	CMP_OUT (x);
		1267	CMP_OUT (y);
		1268
		1269	CMP_OUT (type);
		1270	CMP_OUT (subtype);
		1271	CMP_OUT (direction);
		1272
		1273	CMP_OUT (name);
		1274	CMP_OUT (name_pl);
		1275
		1276	CMP_OUT (speed);
		1277	CMP_OUT (speed_left);
		1278
		1279	CMP_OUT (title);
		1280	CMP_OUT (race);
		1281	CMP_OUT (slaying);
		1282	CMP_OUT (skill);
		1283
		1284	CMP_OUT (tag);
		1285	CMP_OUT (custom_name);
1311		1286
1312	if (object *owner = op->owner)	1287	if (object *owner = op->owner)
1313	f.put (KW_owner, static_cast<const char *>(owner->ref ()));	1288	f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1314		1289
1315	CMP_OUT (name);	1290	// memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1316	CMP_OUT (name_pl);	1291
1317	CMP_OUT (custom_name);
1318	CMP_OUT (title);
1319	CMP_OUT (race);
1320	CMP_OUT (skill);
1321	CMP_OUT (slaying);
1322	CMP_OUT (tag);
1323	CMP_OUT (other_arch);	1292	CMP_OUT (other_arch);
1324		1293
1325	if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );	1294	if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1326	if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);	1295	if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1327		1296
1328	if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);	1297	if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1329	if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);	1298	if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1330	if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);	1299	if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1331		1300
1332	if (op->animation_id != tmp->animation_id)	1301	if (op->animation_id != arch->animation_id)
1333	if (op->has_anim ())	1302	if (op->has_anim ())
1334	f.put (KW_animation, op->anim ().name);	1303	f.put (KW_animation, op->anim ().name);
1335	else	1304	else
1336	{	1305	{
1337	f.put (KW_animation, (const char *)0);	1306	f.put (KW_animation, (const char *)0);
…		…
1353	CMP_OUT2 (grace, stats.grace);	1322	CMP_OUT2 (grace, stats.grace);
1354	CMP_OUT2 (maxgrace, stats.maxgrace);	1323	CMP_OUT2 (maxgrace, stats.maxgrace);
1355	CMP_OUT2 (exp, stats.exp);	1324	CMP_OUT2 (exp, stats.exp);
1356		1325
1357	CMP_OUT (perm_exp);	1326	CMP_OUT (perm_exp);
1358	CMP_OUT (expmul);	1327	//CMP_OUT (expmul);
1359		1328
1360	CMP_OUT2 (food, stats.food);	1329	CMP_OUT2 (food, stats.food);
1361	CMP_OUT2 (dam, stats.dam);	1330	CMP_OUT2 (dam, stats.dam);
1362	CMP_OUT2 (luck, stats.luck);	1331	CMP_OUT2 (luck, stats.luck);
1363	CMP_OUT2 (wc, stats.wc);	1332	CMP_OUT2 (wc, stats.wc);
1364	CMP_OUT2 (ac, stats.ac);	1333	CMP_OUT2 (ac, stats.ac);
1365		1334
1366	CMP_OUT (x);
1367	CMP_OUT (y);
1368	CMP_OUT (speed);
1369	CMP_OUT (speed_left);
1370	CMP_OUT2 (move_state, move_status);	1335	CMP_OUT2 (move_state, move_status);
1371	CMP_OUT (attack_movement);	1336	CMP_OUT (attack_movement);
1372	CMP_OUT (nrof);	1337	CMP_OUT (nrof);
1373	CMP_OUT (level);	1338	CMP_OUT (level);
1374	CMP_OUT (direction);
1375	CMP_OUT (type);
1376	CMP_OUT (subtype);
1377	CMP_OUT (attacktype);	1339	CMP_OUT (attacktype);
1378		1340
		1341	// using memcmp here seems to be a loss - us gcc vectorising?
1379	for (int i = 0; i < NROFATTACKS; i++)	1342	for (int i = 0; i < NROFATTACKS; i++)
1380	if (expect_false (op->resist[i] != tmp->resist[i]))	1343	if (expect_false (op->resist[i] != arch->resist[i]))
1381	f.put (resist_save[i], op->resist[i]);	1344	f.put (resist_save[i], op->resist[i]);
1382		1345
1383	CMP_OUT (path_attuned);	1346	CMP_OUT (path_attuned);
1384	CMP_OUT (path_repelled);	1347	CMP_OUT (path_repelled);
1385	CMP_OUT (path_denied);	1348	CMP_OUT (path_denied);
…		…
1424	CMP_OUT (move_on);	1387	CMP_OUT (move_on);
1425	CMP_OUT (move_off);	1388	CMP_OUT (move_off);
1426	CMP_OUT (move_slow);	1389	CMP_OUT (move_slow);
1427	CMP_OUT (move_slow_penalty);	1390	CMP_OUT (move_slow_penalty);
1428		1391
		1392	// obj_original is the only commonly differing flag between archetype
		1393	// and object, so special-case it here to be able to skip the loop
		1394	object::flags_t diff = op->flags ^ arch->flags;
		1395
		1396	if (expect_true (diff.any ()))
		1397	{
		1398	if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()))
		1399	{
		1400	// some other flags differ, too
1429	if (op->flag != tmp->flag)	1401	if (op->flag != arch->flag)
1430	for (int i = 0; i <= NUM_FLAGS; i++)	1402	for (int i = 0; i <= NUM_FLAGS; i++)
1431	if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))	1403	if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i]))
1432	f.put (flag_names [i], op->flag [i] ? "1" : "0");	1404	f.put (flag_names [i], op->flag [i] ? "1" : "0");
		1405	}
		1406	else
		1407	{
		1408	// only obj_original differs
		1409	f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
		1410	}
		1411	}
1433		1412
1434	// save body locations	1413	// save body locations. gcc's memcmp does an abysmal job when used
1435	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)	1414	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1436	if (expect_false (op->slot[i].info != tmp->slot[i].info))	1415	if (expect_false (op->slot[i].info != arch->slot[i].info))
1437	f.put (body_locations[i].save_name, op->slot[i].info);	1416	f.put (body_locations[i].save_name, op->slot[i].info);
1438	}	1417	}
1439		1418
1440	/*	1419	/*
1441	* Dumps all variables in an object to a file.	1420	* Dumps all variables in an object to a file.

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.132 by root, Thu Sep 17 01:57:31 2009 UTC vs. Revision 1.139 by root, Sun Nov 8 22:28:10 2009 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.132 by root, Thu Sep 17 01:57:31 2009 UTC vs.
Revision 1.139 by root, Sun Nov 8 22:28:10 2009 UTC