Author: cazfi
Date: Mon Sep 28 03:17:00 2015
New Revision: 29987
URL: http://svn.gna.org/viewcvs/freeciv?rev=29987&view=rev
Log:
Moved score related entries from player sections to new score sections in the
savegame.
See patch #6370
Modified:
branches/S2_6/server/savecompat.c
branches/S2_6/server/savegame2.c
Modified: branches/S2_6/server/savecompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savecompat.c?rev=29987&r1=29986&r2=29987&view=diff
==============================================================================
--- branches/S2_6/server/savecompat.c (original)
+++ branches/S2_6/server/savecompat.c Mon Sep 28 03:17:00 2015
@@ -763,6 +763,7 @@
enum barbarian_type new_barb_type;
int i;
const char *name;
+ int score;
/* Renamed 'capital' to 'got_first_city'. */
if (secfile_lookup_bool(loading->file, &got_first_city,
@@ -800,6 +801,24 @@
"player%d.trait.mod%d", plrno, i),
"Trait mod: %s", secfile_error());
secfile_insert_int(loading->file, val, "player%d.trait%d.mod", plrno, i);
+ }
+
+ score = secfile_lookup_int_default(loading->file, -1,
+ "player%d.units_built", plrno);
+ if (score >= 0) {
+ secfile_insert_int(loading->file, score, "score%d.units_built", plrno);
+ }
+
+ score = secfile_lookup_int_default(loading->file, -1,
+ "player%d.units_killed", plrno);
+ if (score >= 0) {
+ secfile_insert_int(loading->file, score, "score%d.units_killed", plrno);
+ }
+
+ score = secfile_lookup_int_default(loading->file, -1,
+ "player%d.units_lost", plrno);
+ if (score >= 0) {
+ secfile_insert_int(loading->file, score, "score%d.units_lost", plrno);
}
}
Modified: branches/S2_6/server/savegame2.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame2.c?rev=29987&r1=29986&r2=29987&view=diff
==============================================================================
--- branches/S2_6/server/savegame2.c (original)
+++ branches/S2_6/server/savegame2.c Mon Sep 28 03:17:00 2015
@@ -4169,13 +4169,13 @@
/* Unit statistics. */
plr->score.units_built =
secfile_lookup_int_default(loading->file, 0,
- "player%d.units_built", plrno);
+ "score%d.units_built", plrno);
plr->score.units_killed =
secfile_lookup_int_default(loading->file, 0,
- "player%d.units_killed", plrno);
+ "score%d.units_killed", plrno);
plr->score.units_lost =
secfile_lookup_int_default(loading->file, 0,
- "player%d.units_lost", plrno);
+ "score%d.units_lost", plrno);
/* Load space ship data. */
{
@@ -4440,11 +4440,11 @@
/* Unit statistics. */
secfile_insert_int(saving->file, plr->score.units_built,
- "player%d.units_built", plrno);
+ "score%d.units_built", plrno);
secfile_insert_int(saving->file, plr->score.units_killed,
- "player%d.units_killed", plrno);
+ "score%d.units_killed", plrno);
secfile_insert_int(saving->file, plr->score.units_lost,
- "player%d.units_lost", plrno);
+ "score%d.units_lost", plrno);
/* Save space ship status. */
secfile_insert_int(saving->file, ship->state, "player%d.spaceship.state",
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
