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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.112 by root, Tue Apr 29 15:19:30 2008 UTC vs.
Revision 1.116 by root, Tue May 6 16:32:34 2008 UTC

…		…
405	if ((type == SPELLBOOK \|\| type == RUNE) && slaying && !inv && !loading_arch)	405	if ((type == SPELLBOOK \|\| type == RUNE) && slaying && !inv && !loading_arch)
406	{	406	{
407	LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());	407	LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
408	object *tmp = get_archetype_by_object_name (slaying);	408	object *tmp = get_archetype_by_object_name (slaying);
409	insert_ob_in_ob (tmp, this);	409	insert_ob_in_ob (tmp, this);
410	randomitems = NULL; /* So another spell isn't created for this object */	410	randomitems = 0; /* So another spell isn't created for this object */
411	/* without this, value is all screwed up */	411	/* without this, value is all screwed up */
412	value = arch->value * inv->value;	412	value = arch->value * inv->value;
413	}	413	}
414		414
415	if (QUERY_FLAG (this, FLAG_MONSTER))	415	if (QUERY_FLAG (this, FLAG_MONSTER))
…		…
519		519
520	bool	520	bool
521	object::parse_kv (object_thawer &f)	521	object::parse_kv (object_thawer &f)
522	{	522	{
523	object *op_inv = inv;	523	object *op_inv = inv;
		524	key_value *last_kv = key_values;
524		525
525	for (;;)	526	for (;;)
526	{	527	{
527	switch (f.kw)	528	switch (f.kw)
528	{	529	{
…		…
606	CLEAR_FLAG (this, FLAG_ANIMATE);	607	CLEAR_FLAG (this, FLAG_ANIMATE);
607	animation_id = 0;	608	animation_id = 0;
608		609
609	const char *str = f.get_str ();	610	const char *str = f.get_str ();
610	if (str && (animation_id = find_animation (str)))	611	if (str && (animation_id = find_animation (str)))
611	SET_FLAG (this, FLAG_ANIMATE);	612	SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
612	}	613	}
613	break;	614	break;
614		615
615	case KW_last_heal: f.get (last_heal); break;	616	case KW_last_heal: f.get (last_heal); break;
616	case KW_last_sp: f.get (last_sp); break;	617	case KW_last_sp: f.get (last_sp); break;
…		…
987		988
988	f.next ();	989	f.next ();
989	return true;	990	return true;
990		991
991	case KW_ERROR:	992	case KW_ERROR:
992	set_ob_key_value (this, f.kw_str, f.value, true);	993	// append as key value pair (do not use kv_set as it prepends)
		994	// we also do not even try to find old values, duplicate keys stay duplicate
		995	{
		996	key_value *kv = new key_value;
		997
		998	kv->next = 0;
		999	kv->key = shstr (f.kw_str);
		1000	kv->value = shstr (f.value);
		1001
		1002	if (!last_kv)
		1003	key_values = last_kv = kv;
		1004	else
		1005	{
		1006	while (last_kv->next)
		1007	last_kv = last_kv->next;
		1008
		1009	last_kv->next = kv;
		1010	last_kv = kv;
		1011	}
		1012	}
993	//fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D	1013	//fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
994	break;	1014	break;
995		1015
996	default:	1016	default:
997	if (!f.parse_error ("object", name))	1017	if (!f.parse_error ("object", name))
…		…
1018		1038
1019	assert (arch); //D maybe use exception handling of sorts?	1039	assert (arch); //D maybe use exception handling of sorts?
1020		1040
1021	f.next ();	1041	f.next ();
1022		1042
1023	object *op = object::create ();	1043	object *op = arch->instance ();
1024
1025	op->map = map;	1044	op->map = map;
1026	arch->copy_to (op);
1027	// copy_to activates, this should be fixed properly	1045	// instance() activates, this should be fixed properly
1028	op->deactivate ();	1046	op->deactivate ();
1029		1047
1030	if (!op->parse_kv (f))	1048	if (!op->parse_kv (f))
1031	{	1049	{
1032	op->destroy (true);	1050	op->destroy (true);
…		…
1242	/* 110 */	1260	/* 110 */
1243	KW_destroy_on_death,	1261	KW_destroy_on_death,
1244	KW_NULL,	1262	KW_NULL,
1245	};	1263	};
1246		1264
1247	int i;
1248
1249	/* This saves the key/value lists. We do it first so that any	1265	/* This saves the key/value lists. We do it first so that any
1250	* keys that match field names will be overwritten by the loader.	1266	* keys that match field names will be overwritten by the loader.
1251	*/	1267	*/
1252	for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)	1268	for (key_value *kv = op->key_values; kv; kv = kv->next)
1253	{	1269	if (!tmp->key_values \|\| tmp->kv (kv->key) != kv->value)
1254	/* Find the field in the opposing member. */	1270	f.put (kv->key, kv->value);
1255	key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1256
1257	/* If there's no partnering field, or it's got a different value, save our field. */
1258	if (!arch_field \|\| my_field->value != arch_field->value)
1259	f.put (my_field->key, my_field->value);
1260	}
1261		1271
1262	/* We don't need to worry about the arch's extra fields - they	1272	/* We don't need to worry about the arch's extra fields - they
1263	* will get taken care of the copy_to method.	1273	* will get taken care of the copy_to method.
1264	*/	1274	*/
1265		1275
…		…
1288	if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);	1298	if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1289	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 != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1290		1300
1291	if (op->animation_id != tmp->animation_id)	1301	if (op->animation_id != tmp->animation_id)
1292	if (op->animation_id)	1302	if (op->animation_id)
		1303	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
		1304	else
1293	{	1305	{
1294	f.put (KW_animation, animations[GET_ANIM_ID (op)].name);	1306	f.put (KW_animation, (const char *)0);
1295		1307	op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1296	if (!QUERY_FLAG (op, FLAG_ANIMATE))
1297	f.put (KW_is_animated, (sint32)0);
1298	}	1308	}
1299	else
1300	f.put (KW_animation, (const char *)0);
1301		1309
1302	CMP_OUT2 (str, stats.Str);	1310	CMP_OUT2 (str, stats.Str);
1303	CMP_OUT2 (dex, stats.Dex);	1311	CMP_OUT2 (dex, stats.Dex);
1304	CMP_OUT2 (con, stats.Con);	1312	CMP_OUT2 (con, stats.Con);
1305	CMP_OUT2 (wis, stats.Wis);	1313	CMP_OUT2 (wis, stats.Wis);
…		…
1335	CMP_OUT (direction);	1343	CMP_OUT (direction);
1336	CMP_OUT (type);	1344	CMP_OUT (type);
1337	CMP_OUT (subtype);	1345	CMP_OUT (subtype);
1338	CMP_OUT (attacktype);	1346	CMP_OUT (attacktype);
1339		1347
1340	for (i = 0; i < NROFATTACKS; i++)	1348	for (int i = 0; i < NROFATTACKS; i++)
1341	if (expect_false (op->resist[i] != tmp->resist[i]))	1349	if (expect_false (op->resist[i] != tmp->resist[i]))
1342	f.put (resist_save[i], op->resist[i]);	1350	f.put (resist_save[i], op->resist[i]);
1343		1351
1344	CMP_OUT (path_attuned);	1352	CMP_OUT (path_attuned);
1345	CMP_OUT (path_repelled);	1353	CMP_OUT (path_repelled);
…		…
1356	CMP_OUT (last_sp);	1364	CMP_OUT (last_sp);
1357	CMP_OUT (last_grace);	1365	CMP_OUT (last_grace);
1358	CMP_OUT (last_eat);	1366	CMP_OUT (last_eat);
1359	CMP_OUT (glow_radius);	1367	CMP_OUT (glow_radius);
1360		1368
1361	if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op)))	1369	if (op->flag [FLAG_IS_LINKED])
		1370	if (int i = get_button_value (op))
1362	f.put (KW_connected, i);	1371	f.put (KW_connected, i);
1363		1372
1364	CMP_OUT (randomitems);	1373	CMP_OUT (randomitems);
1365	CMP_OUT2 (container, weight_limit);	1374	CMP_OUT2 (container, weight_limit);
1366		1375
1367	CMP_OUT (run_away);	1376	CMP_OUT (run_away);
…		…
1387	CMP_OUT (move_off);	1396	CMP_OUT (move_off);
1388	CMP_OUT (move_slow);	1397	CMP_OUT (move_slow);
1389	CMP_OUT (move_slow_penalty);	1398	CMP_OUT (move_slow_penalty);
1390		1399
1391	if (op->flag != tmp->flag)	1400	if (op->flag != tmp->flag)
1392	for (i = 0; i <= NUM_FLAGS; i++)	1401	for (int i = 0; i <= NUM_FLAGS; i++)
1393	if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))	1402	if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1394	f.put (flag_names [i], op->flag [i] ? "1" : "0");	1403	f.put (flag_names [i], op->flag [i] ? "1" : "0");
1395		1404
1396	// save body locations	1405	// save body locations
1397	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1406	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1398	if (expect_false (op->slot[i].info != tmp->slot[i].info))	1407	if (expect_false (op->slot[i].info != tmp->slot[i].info))
1399	f.put (body_locations[i].save_name, op->slot[i].info);	1408	f.put (body_locations[i].save_name, op->slot[i].info);
1400	}	1409	}
1401		1410
1402	/*	1411	/*

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.112 by root, Tue Apr 29 15:19:30 2008 UTC vs. Revision 1.116 by root, Tue May 6 16:32:34 2008 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.112 by root, Tue Apr 29 15:19:30 2008 UTC vs.
Revision 1.116 by root, Tue May 6 16:32:34 2008 UTC