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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.113 by root, Fri May 2 21:01:53 2008 UTC vs.
Revision 1.119 by elmex, Mon Sep 1 22:29:17 2008 UTC

…		…
386	LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);	386	LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
387	#endif	387	#endif
388	}	388	}
389		389
390	/* Old spellcasting object - need to load in the appropiate object */	390	/* Old spellcasting object - need to load in the appropiate object */
391	if ((type == ROD \|\| type == WAND \|\| type == SCROLL \|\| type == HORN \|\| type == FIREWALL \|\|	391	if ((type == ROD
		392	\|\| type == WAND
		393	\|\| type == SCROLL
		394	\|\| type == HORN
		395	\|\| type == FIREWALL
392	/* POTIONS and ALTARS don't always cast spells, but if they do, update them */	396	/* POTIONS and ALTARS don't always cast spells, but if they do, update them */
393	((type == POTION \|\| type == ALTAR) && stats.sp)) && !inv && !loading_arch)	397	\|\| ((type == POTION \|\| type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
		398	&& !inv
		399	&& !loading_arch
		400	&& stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
394	{	401	{
395	/* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'	402	/* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
396	* in that spell was stored in sp.	403	* in that spell was stored in sp.
397	*/	404	*/
398	LOG (llevError, "old spellcasting object found: %s", debug_desc ());	405	LOG (llevError, "old spellcasting object found: %s", debug_desc ());
399	object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);	406	object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
400	insert_ob_in_ob (tmp, this);	407	insert_ob_in_ob (tmp, this);
401	randomitems = NULL; /* So another spell isn't created for this object */	408	randomitems = 0;
402	}	409	}
403		410
404	/* spellbooks & runes use slaying. But not to arch name, but to spell name */	411	/* spellbooks & runes use slaying. But not to arch name, but to spell name */
405	if ((type == SPELLBOOK \|\| type == RUNE) && slaying && !inv && !loading_arch)	412	if ((type == SPELLBOOK \|\| type == RUNE) && slaying && !inv && !loading_arch)
406	{	413	{
407	LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());	414	LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
408	object *tmp = get_archetype_by_object_name (slaying);	415	object *tmp = get_archetype_by_object_name (slaying);
409	insert_ob_in_ob (tmp, this);	416	insert_ob_in_ob (tmp, this);
410	randomitems = NULL; /* So another spell isn't created for this object */	417	randomitems = 0; /* So another spell isn't created for this object */
411	/* without this, value is all screwed up */	418	/* without this, value is all screwed up */
412	value = arch->value * inv->value;	419	value = arch->value * inv->value;
413	}	420	}
414		421
415	if (QUERY_FLAG (this, FLAG_MONSTER))	422	if (QUERY_FLAG (this, FLAG_MONSTER))
…		…
519		526
520	bool	527	bool
521	object::parse_kv (object_thawer &f)	528	object::parse_kv (object_thawer &f)
522	{	529	{
523	object *op_inv = inv;	530	object *op_inv = inv;
		531	key_value *last_kv = key_values;
524		532
525	for (;;)	533	for (;;)
526	{	534	{
527	switch (f.kw)	535	switch (f.kw)
528	{	536	{
…		…
606	CLEAR_FLAG (this, FLAG_ANIMATE);	614	CLEAR_FLAG (this, FLAG_ANIMATE);
607	animation_id = 0;	615	animation_id = 0;
608		616
609	const char *str = f.get_str ();	617	const char *str = f.get_str ();
610	if (str && (animation_id = find_animation (str)))	618	if (str && (animation_id = find_animation (str)))
611	SET_FLAG (this, FLAG_ANIMATE);	619	SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
612	}	620	}
613	break;	621	break;
614		622
615	case KW_last_heal: f.get (last_heal); break;	623	case KW_last_heal: f.get (last_heal); break;
616	case KW_last_sp: f.get (last_sp); break;	624	case KW_last_sp: f.get (last_sp); break;
…		…
920	case KW_expmul: f.get (expmul); break;	928	case KW_expmul: f.get (expmul); break;
921	case KW_glow_radius: f.get (glow_radius); break;	929	case KW_glow_radius: f.get (glow_radius); break;
922	case KW_weapontype: f.get (weapontype); break;	930	case KW_weapontype: f.get (weapontype); break;
923	case KW_tooltype: f.get (tooltype); break;	931	case KW_tooltype: f.get (tooltype); break;
924	case KW_casting_time: f.get (casting_time); break;	932	case KW_casting_time: f.get (casting_time); break;
		933
		934	// elevation is deprecated
925	case KW_elevation: f.get (elevation); break;	935	case KW_elevation: break;
		936
926	case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;	937	case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
927	case KW_client_type: f.get (client_type); break;	938	case KW_client_type: f.get (client_type); break;
928	case KW_duration: f.get (duration); break;	939	case KW_duration: f.get (duration); break;
929	case KW_range: f.get (range); break;	940	case KW_range: f.get (range); break;
930	case KW_range_modifier: f.get (range_modifier); break;	941	case KW_range_modifier: f.get (range_modifier); break;
…		…
987		998
988	f.next ();	999	f.next ();
989	return true;	1000	return true;
990		1001
991	case KW_ERROR:	1002	case KW_ERROR:
992	set_ob_key_value (this, f.kw_str, f.value, true);	1003	// append as key value pair (do not use kv_set as it prepends)
		1004	// we also do not even try to find old values, duplicate keys stay duplicate
		1005	{
		1006	key_value *kv = new key_value;
		1007
		1008	kv->next = 0;
		1009	kv->key = shstr (f.kw_str);
		1010	kv->value = shstr (f.value);
		1011
		1012	if (!last_kv)
		1013	key_values = last_kv = kv;
		1014	else
		1015	{
		1016	while (last_kv->next)
		1017	last_kv = last_kv->next;
		1018
		1019	last_kv->next = kv;
		1020	last_kv = kv;
		1021	}
		1022	}
993	//fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D	1023	//fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
994	break;	1024	break;
995		1025
996	default:	1026	default:
997	if (!f.parse_error ("object", name))	1027	if (!f.parse_error ("object", name))
…		…
1240	/* 110 */	1270	/* 110 */
1241	KW_destroy_on_death,	1271	KW_destroy_on_death,
1242	KW_NULL,	1272	KW_NULL,
1243	};	1273	};
1244		1274
1245	int i;
1246
1247	/* This saves the key/value lists. We do it first so that any	1275	/* This saves the key/value lists. We do it first so that any
1248	* keys that match field names will be overwritten by the loader.	1276	* keys that match field names will be overwritten by the loader.
1249	*/	1277	*/
1250	for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)	1278	for (key_value *kv = op->key_values; kv; kv = kv->next)
1251	{	1279	if (!tmp->key_values \|\| tmp->kv (kv->key) != kv->value)
1252	/* Find the field in the opposing member. */	1280	f.put (kv->key, kv->value);
1253	key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1254
1255	/* If there's no partnering field, or it's got a different value, save our field. */
1256	if (!arch_field \|\| my_field->value != arch_field->value)
1257	f.put (my_field->key, my_field->value);
1258	}
1259		1281
1260	/* We don't need to worry about the arch's extra fields - they	1282	/* We don't need to worry about the arch's extra fields - they
1261	* will get taken care of the copy_to method.	1283	* will get taken care of the copy_to method.
1262	*/	1284	*/
1263		1285
…		…
1286	if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);	1308	if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1287	if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);	1309	if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1288		1310
1289	if (op->animation_id != tmp->animation_id)	1311	if (op->animation_id != tmp->animation_id)
1290	if (op->animation_id)	1312	if (op->animation_id)
		1313	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
		1314	else
1291	{	1315	{
1292	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);	1316	f.put (KW_animation, (const char *)0);
1293		1317	op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1294	if (!QUERY_FLAG (op, FLAG_ANIMATE))
1295	f.put (KW_is_animated, (sint32)0);
1296	}	1318	}
1297	else
1298	f.put (KW_animation, (const char *)0);
1299		1319
1300	CMP_OUT2 (str, stats.Str);	1320	CMP_OUT2 (str, stats.Str);
1301	CMP_OUT2 (dex, stats.Dex);	1321	CMP_OUT2 (dex, stats.Dex);
1302	CMP_OUT2 (con, stats.Con);	1322	CMP_OUT2 (con, stats.Con);
1303	CMP_OUT2 (wis, stats.Wis);	1323	CMP_OUT2 (wis, stats.Wis);
…		…
1333	CMP_OUT (direction);	1353	CMP_OUT (direction);
1334	CMP_OUT (type);	1354	CMP_OUT (type);
1335	CMP_OUT (subtype);	1355	CMP_OUT (subtype);
1336	CMP_OUT (attacktype);	1356	CMP_OUT (attacktype);
1337		1357
1338	for (i = 0; i < NROFATTACKS; i++)	1358	for (int i = 0; i < NROFATTACKS; i++)
1339	if (expect_false (op->resist[i] != tmp->resist[i]))	1359	if (expect_false (op->resist[i] != tmp->resist[i]))
1340	f.put (resist_save[i], op->resist[i]);	1360	f.put (resist_save[i], op->resist[i]);
1341		1361
1342	CMP_OUT (path_attuned);	1362	CMP_OUT (path_attuned);
1343	CMP_OUT (path_repelled);	1363	CMP_OUT (path_repelled);
…		…
1354	CMP_OUT (last_sp);	1374	CMP_OUT (last_sp);
1355	CMP_OUT (last_grace);	1375	CMP_OUT (last_grace);
1356	CMP_OUT (last_eat);	1376	CMP_OUT (last_eat);
1357	CMP_OUT (glow_radius);	1377	CMP_OUT (glow_radius);
1358		1378
1359	if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op)))	1379	if (op->flag [FLAG_IS_LINKED])
		1380	if (int i = get_button_value (op))
1360	f.put (KW_connected, i);	1381	f.put (KW_connected, i);
1361		1382
1362	CMP_OUT (randomitems);	1383	CMP_OUT (randomitems);
1363	CMP_OUT2 (container, weight_limit);	1384	CMP_OUT2 (container, weight_limit);
1364		1385
1365	CMP_OUT (run_away);	1386	CMP_OUT (run_away);
1366	CMP_OUT (pick_up);	1387	CMP_OUT (pick_up);
1367	CMP_OUT (will_apply);	1388	CMP_OUT (will_apply);
1368	CMP_OUT (smoothlevel);	1389	CMP_OUT (smoothlevel);
1369	CMP_OUT (weapontype);	1390	CMP_OUT (weapontype);
1370	CMP_OUT (tooltype);	1391	CMP_OUT (tooltype);
1371	CMP_OUT (elevation);
1372	CMP_OUT (client_type);	1392	CMP_OUT (client_type);
1373	CMP_OUT (item_power);	1393	CMP_OUT (item_power);
1374	CMP_OUT (duration);	1394	CMP_OUT (duration);
1375	CMP_OUT (range);	1395	CMP_OUT (range);
1376	CMP_OUT (range_modifier);	1396	CMP_OUT (range_modifier);
…		…
1385	CMP_OUT (move_off);	1405	CMP_OUT (move_off);
1386	CMP_OUT (move_slow);	1406	CMP_OUT (move_slow);
1387	CMP_OUT (move_slow_penalty);	1407	CMP_OUT (move_slow_penalty);
1388		1408
1389	if (op->flag != tmp->flag)	1409	if (op->flag != tmp->flag)
1390	for (i = 0; i <= NUM_FLAGS; i++)	1410	for (int i = 0; i <= NUM_FLAGS; i++)
1391	if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))	1411	if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1392	f.put (flag_names [i], op->flag [i] ? "1" : "0");	1412	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1393		1413
1394	// save body locations	1414	// save body locations
1395	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1415	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1396	if (expect_false (op->slot[i].info != tmp->slot[i].info))	1416	if (expect_false (op->slot[i].info != tmp->slot[i].info))
1397	f.put (body_locations[i].save_name, op->slot[i].info);	1417	f.put (body_locations[i].save_name, op->slot[i].info);
1398	}	1418	}
1399		1419
1400	/*	1420	/*

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.113 by root, Fri May 2 21:01:53 2008 UTC vs. Revision 1.119 by elmex, Mon Sep 1 22:29:17 2008 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.113 by root, Fri May 2 21:01:53 2008 UTC vs.
Revision 1.119 by elmex, Mon Sep 1 22:29:17 2008 UTC