From f94ff0ce9d3ad9baf680d39784b0b49b7a95595d Mon Sep 17 00:00:00 2001
From: Per Inge Mathisen <per@wz2100.net>
Date: Fri, 13 Jul 2007 18:14:25 +0000
Subject: [PATCH] New .sta file format in plain text. This should fix problems
 people have had with corrupted player name and such when mixing 2.0 and 2.1
 versions, or old and new versions of 2.1.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2070 4a71c877-e1ca-e34f-864e-861f7616d084
---
 src/multistat.c | 59 +++++++++++++++++++++++++------------------------
 src/multistat.h |  8 -------
 2 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/src/multistat.c b/src/multistat.c
index c78746441..fcc320ea0 100644
--- a/src/multistat.c
+++ b/src/multistat.c
@@ -585,47 +585,52 @@ BOOL setMultiStats(SDWORD dp, PLAYERSTATS plStats, BOOL bLocal)
 	return TRUE;
 }
 
-
 // ////////////////////////////////////////////////////////////////////////////
 // Load Player Stats
-BOOL loadMultiStats(char *sPlayerName, PLAYERSTATS *playerStats)
+BOOL loadMultiStats(char *sPlayerName, PLAYERSTATS *st)
 {
 	char				fileName[255];
 	UDWORD				size;
 	char				*pFileData;
-	PLAYERSTATS			blankstats = {0};
-	SAVEDPLAYERSTATS		st;
 
 	// Prevent an empty player name (where the first byte is a 0x0 terminating char already)
 	if (!*sPlayerName)
+	{
 		strcpy(sPlayerName, _("Player"));
+	}
 
 	snprintf(fileName, sizeof(fileName), "%s%s.sta", MultiPlayersPath, sPlayerName);
 
 	debug(LOG_WZ, "loadMultiStats: %s", fileName);
+
 	// check player already exists
 	if ( !PHYSFS_exists( fileName ) )
 	{
+		PLAYERSTATS			blankstats;
+
+		memset(&blankstats, 0, sizeof(PLAYERSTATS));
 		saveMultiStats(sPlayerName,sPlayerName,&blankstats);		// didnt exist so create.
 	}
+	else
+	{
+		loadFile(fileName,&pFileData,&size);
 
-	loadFile(fileName,&pFileData,&size);
-	memcpy(&st, (SAVEDPLAYERSTATS*)pFileData, sizeof(SAVEDPLAYERSTATS));
+		if (strncmp(pFileData, "WZ.STA.v2", 9) != 0)
+		{
+			return FALSE; // wrong version or not a stats file
+		}
 
-	//set stats.
-	memcpy(playerStats,&(st.stats), sizeof(PLAYERSTATS));	// get
+		sscanf(pFileData, "WZ.STA.v2\n%s %u %u %u %u",
+		       sPlayerName, &st->wins, &st->losses, &st->totalKills, &st->totalScore);
 
-	//set the name. ASSUME STRING IS LONG ENOUGH!
-	strcpy(sPlayerName,st.name);
-
-	free(pFileData);
+		free(pFileData);
+	}
 
 	// reset recent scores
-	playerStats->recentKills = 0;
-	playerStats->recentScore = 0;
-	playerStats->killsToAdd  = 0;
-	playerStats->scoreToAdd  = 0;
-
+	st->recentKills = 0;
+	st->recentScore = 0;
+	st->killsToAdd  = 0;
+	st->scoreToAdd  = 0;
 
 	// clear any skirmish stats.
 	for(size = 0;size<MAX_PLAYERS;size++)
@@ -639,24 +644,20 @@ BOOL loadMultiStats(char *sPlayerName, PLAYERSTATS *playerStats)
 
 // ////////////////////////////////////////////////////////////////////////////
 // Save Player Stats
-BOOL saveMultiStats(const char *sFileName, const char *sPlayerName, const PLAYERSTATS *playerStats)
+#define MAX_STA_SIZE 500
+BOOL saveMultiStats(const char *sFileName, const char *sPlayerName, const PLAYERSTATS *st)
 {
-	char				fileName[255]="";
-	SAVEDPLAYERSTATS		st;
+	char buffer[MAX_STA_SIZE];
+	char fileName[255]="";
 
-	// prepare file.
-	memcpy(&st.stats, playerStats, sizeof(PLAYERSTATS));
-	memset(st.name, 0, 255);
-	strcpy(st.name, sPlayerName);
+	snprintf(buffer, MAX_STA_SIZE, "WZ.STA.v2\n%s %u %u %u %u",
+	         sPlayerName, st->wins, st->losses, st->totalKills, st->totalScore);
 
 	strcpy(fileName,MultiPlayersPath);
 	strcat(fileName,sFileName);
 	strcat(fileName,".sta");
 
-	// we write some uninitialised bytes here (the last of the struct)
-	// this is caused by struct sizes getting rounded up to a nice value
-	// FIXME: ugly cast
-	saveFile(fileName, (char *)&st, sizeof(SAVEDPLAYERSTATS));
+	saveFile(fileName, buffer, strlen(buffer));
 
 	return TRUE;
 }
@@ -665,7 +666,7 @@ BOOL saveMultiStats(const char *sFileName, const char *sPlayerName, const PLAYER
 // score update functions
 
 // update players damage stats.
-void updateMultiStatsDamage	(UDWORD attacker, UDWORD defender, UDWORD inflicted)
+void updateMultiStatsDamage(UDWORD attacker, UDWORD defender, UDWORD inflicted)
 {
 	PLAYERSTATS st;
 
diff --git a/src/multistat.h b/src/multistat.h
index 9d3734e70..e1f5876f1 100644
--- a/src/multistat.h
+++ b/src/multistat.h
@@ -43,14 +43,6 @@ typedef struct
 
 } PLAYERSTATS;
 
-// This is the definition of the multiplay/players/*.sta files
-typedef struct								// complete info.
-{
-	char        name[255];
-	PLAYERSTATS stats;
-} SAVEDPLAYERSTATS;
-
-
 typedef struct _forcemember {
 	DROID_TEMPLATE		*pTempl;			// pointer to template to use for this droid
 	struct _forcemember	*psNext;			// Pointer to next template