From f4583fda98b578966969db7d94a0bae3c87b0c80 Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Mon, 30 Jan 2012 22:48:38 +0000
Subject: Replaced most FILE operations with a cFile object

git-svn-id: http://mc-server.googlecode.com/svn/trunk@196 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 source/cPlayer.cpp | 124 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 66 insertions(+), 58 deletions(-)

(limited to 'source/cPlayer.cpp')

diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp
index c3ba32840..8e161900c 100644
--- a/source/cPlayer.cpp
+++ b/source/cPlayer.cpp
@@ -764,6 +764,10 @@ void cPlayer::LoadPermissionsFromDisk()
 	ResolvePermissions();
 }
 
+
+
+
+
 bool cPlayer::LoadFromDisk() // TODO - This should also get/set/whatever the correct world for this player
 {
 	LoadPermissionsFromDisk();
@@ -778,59 +782,62 @@ bool cPlayer::LoadFromDisk() // TODO - This should also get/set/whatever the cor
 	char SourceFile[128];
 	sprintf_s(SourceFile, 128, "players/%s.json", m_pState->PlayerName.c_str() );
 
-	FILE* f;
-	#ifdef _WIN32
-	if( fopen_s(&f, SourceFile, "rb" ) == 0 )	// no error
-	#else
-	if( (f = fopen(SourceFile, "rb" ) ) != 0 )	// no error
-	#endif
-	{
-		// Get file size
-		fseek (f , 0 , SEEK_END);
-		long FileSize = ftell (f);
-		rewind(f);
-
-		char* buffer = new char[ FileSize ];
-		if( fread( buffer, FileSize, 1, f) != 1 ) { LOGERROR("ERROR READING FROM FILE %s", SourceFile); fclose(f); return false; }
-		fclose(f);
-
-		Json::Value root;
-		Json::Reader reader;
-		if( !reader.parse( buffer, root, false ) )
-		{
-			LOGERROR("ERROR WHILE PARSING JSON FROM FILE %s", SourceFile);
-		}
-		
-		delete [] buffer;
-
-		Json::Value & JSON_PlayerPosition = root["position"];
-		if( JSON_PlayerPosition.size() == 3 )
-		{
-			m_Pos->x = JSON_PlayerPosition[(unsigned int)0].asDouble();
-			m_Pos->y = JSON_PlayerPosition[(unsigned int)1].asDouble();
-			m_Pos->z = JSON_PlayerPosition[(unsigned int)2].asDouble();
-		}
+	cFile f;
+	if (!f.Open(SourceFile, cFile::fmRead))
+	{
+		return false;
+	}
 
-		Json::Value & JSON_PlayerRotation = root["rotation"];
-		if( JSON_PlayerRotation.size() == 3 )
-		{
-			m_Rot->x = (float)JSON_PlayerRotation[(unsigned int)0].asDouble();
-			m_Rot->y = (float)JSON_PlayerRotation[(unsigned int)1].asDouble();
-			m_Rot->z = (float)JSON_PlayerRotation[(unsigned int)2].asDouble();
-		}
+	// Get file size
+	long FileSize = f.GetSize();
 
-		m_Health = (short)root.get("health", 0 ).asInt();
-		m_FoodLevel = (short)root.get("food", 0 ).asInt();
-		m_Inventory->LoadFromJson(root["inventory"]);
-		m_CreativeInventory->LoadFromJson(root["creativeinventory"]);
+	char * buffer = new char[FileSize];
+	if (f.Read(buffer, FileSize) != FileSize )
+	{
+		LOGERROR("ERROR READING FROM FILE \"%s\"", SourceFile); 
+		return false;
+	}
+	f.Close();
 
-		m_pState->LoadedWorldName = root.get("world", "world").asString();
+	Json::Value root;
+	Json::Reader reader;
+	if( !reader.parse( buffer, root, false ) )
+	{
+		LOGERROR("ERROR WHILE PARSING JSON FROM FILE %s", SourceFile);
+	}
 		
-		return true;
+	delete [] buffer;
+
+	Json::Value & JSON_PlayerPosition = root["position"];
+	if( JSON_PlayerPosition.size() == 3 )
+	{
+		m_Pos->x = JSON_PlayerPosition[(unsigned int)0].asDouble();
+		m_Pos->y = JSON_PlayerPosition[(unsigned int)1].asDouble();
+		m_Pos->z = JSON_PlayerPosition[(unsigned int)2].asDouble();
 	}
-	return false;
+
+	Json::Value & JSON_PlayerRotation = root["rotation"];
+	if( JSON_PlayerRotation.size() == 3 )
+	{
+		m_Rot->x = (float)JSON_PlayerRotation[(unsigned int)0].asDouble();
+		m_Rot->y = (float)JSON_PlayerRotation[(unsigned int)1].asDouble();
+		m_Rot->z = (float)JSON_PlayerRotation[(unsigned int)2].asDouble();
+	}
+
+	m_Health = (short)root.get("health", 0 ).asInt();
+	m_FoodLevel = (short)root.get("food", 0 ).asInt();
+	m_Inventory->LoadFromJson(root["inventory"]);
+	m_CreativeInventory->LoadFromJson(root["creativeinventory"]);
+
+	m_pState->LoadedWorldName = root.get("world", "world").asString();
+	
+	return true;
 }
 
+
+
+
+
 bool cPlayer::SaveToDisk()
 {
 	cMakeDir::MakeDir("players");
@@ -867,23 +874,24 @@ bool cPlayer::SaveToDisk()
 	char SourceFile[128];
 	sprintf_s(SourceFile, 128, "players/%s.json", m_pState->PlayerName.c_str() );
 
-	FILE* f;
-	#ifdef _WIN32
-	if( fopen_s(&f, SourceFile, "wb" ) == 0 )	// no error
-	#else
-	if( (f = fopen(SourceFile, "wb" ) ) != 0 )	// no error
-	#endif
+	cFile f;
+	if (!f.Open(SourceFile, cFile::fmWrite))
 	{
-		if( fwrite( JsonData.c_str(), JsonData.size(), 1, f ) != 1 ) { LOGERROR("ERROR WRITING PLAYER JSON TO FILE %s", SourceFile ); return false; }
-		fclose(f);
-		return true;
+		LOGERROR("ERROR WRITING PLAYER \"%s\" TO FILE \"%s\" - cannot open file", m_pState->PlayerName.c_str(), SourceFile);
+		return false;
 	}
-
-	LOGERROR("ERROR WRITING PLAYER %s TO FILE %s", m_pState->PlayerName.c_str(), SourceFile);
-	return false;
+	if (f.Write(JsonData.c_str(), JsonData.size()) != JsonData.size())
+	{
+		LOGERROR("ERROR WRITING PLAYER JSON TO FILE \"%s\"", SourceFile); 
+		return false;
+	}
+	return true;
 }
 
 
+
+
+
 const char* cPlayer::GetName()
 {
 	return m_pState->PlayerName.c_str();
-- 
cgit v1.2.3