Get rid of MSVC's __int64

Use either int64_t, uint64_t or long long and unsigned long long, defined as per C++11 standard

1 files changed, 13 insertions, 13 deletions

diff --git a/Minecraft.Client/MinecraftServer.h b/Minecraft.Client/MinecraftServer.h
index e61001a3..f63aeb0b 100644
--- a/Minecraft.Client/MinecraftServer.h
+++ b/Minecraft.Client/MinecraftServer.h
@@ -23,14 +23,14 @@ class CommandDispatcher;
 typedef struct _LoadSaveDataThreadParam
 {
 	LPVOID data;
-	__int64 fileSize;
+	int64_t fileSize;
 	const wstring saveName;
-	_LoadSaveDataThreadParam(LPVOID data, __int64 filesize, const wstring &saveName) : data( data ), fileSize( filesize ), saveName( saveName ) {}
+	_LoadSaveDataThreadParam(LPVOID data, int64_t filesize, const wstring &saveName) : data( data ), fileSize( filesize ), saveName( saveName ) {}
 } LoadSaveDataThreadParam;
 
 typedef struct _NetworkGameInitData
 {
-	__int64 seed;
+	int64_t seed;
 	LoadSaveDataThreadParam *saveData;
 	DWORD settings;
 	LevelGenerationOptions *levelGen;
@@ -125,9 +125,9 @@ public:
 	~MinecraftServer();
 private:
 	// 4J Added - LoadSaveDataThreadParam
-	bool initServer(__int64 seed, NetworkGameInitData *initData, DWORD initSettings, bool findSeed);
+	bool initServer(int64_t seed, NetworkGameInitData *initData, DWORD initSettings, bool findSeed);
 	void postProcessTerminate(ProgressRenderer *mcprogress);
-    bool loadLevel(LevelStorageSource *storageSource, const wstring& name, __int64 levelSeed, LevelType *pLevelType, NetworkGameInitData *initData);
+    bool loadLevel(LevelStorageSource *storageSource, const wstring& name, int64_t levelSeed, LevelType *pLevelType, NetworkGameInitData *initData);
     void setProgress(const wstring& status, int progress);
     void endProgress();
     void saveAllChunks();
@@ -154,7 +154,7 @@ public:
 
 public:
 	void halt();
-    void run(__int64 seed, void *lpParameter);
+    void run(int64_t seed, void *lpParameter);
 
 	void broadcastStartSavingPacket();
 	void broadcastStopSavingPacket();
@@ -165,7 +165,7 @@ public:
 	void handleConsoleInput(const wstring& msg, ConsoleInputSource *source);
     void handleConsoleInputs();
 //    void addTickable(Tickable tickable);	// 4J removed
-    static void main(__int64 seed, void *lpParameter);
+    static void main(int64_t seed, void *lpParameter);
 	static void HaltServer(bool bPrimaryPlayerSignedOut=false);
 
     File *getFile(const wstring& name);
@@ -185,9 +185,9 @@ private:
 	static MinecraftServer *server;
 
 	static bool setTimeOfDayAtEndOfTick;
-	static __int64 setTimeOfDay;
+	static int64_t setTimeOfDay;
 	static bool setTimeAtEndOfTick;
-	static __int64 setTime;
+	static int64_t setTime;
 
 	static bool	m_bPrimaryPlayerSignedOut;	// 4J-PB added to tell the stopserver not to save the game - another player may have signed in in their place, so ProfileManager.IsSignedIn isn't enough
 	static bool s_bServerHalted; // 4J Stu Added so that we can halt the server even before it's been created properly
@@ -211,9 +211,9 @@ public:
 
 public:
 	static PlayerList *getPlayerList() { if( server != NULL ) return server->players; else return NULL; }
-	static void SetTimeOfDay(__int64 time) { setTimeOfDayAtEndOfTick = true; setTimeOfDay = time; }
-	static void SetTime(__int64 time) { setTimeAtEndOfTick = true; setTime = time; }
-	
+	static void SetTimeOfDay(int64_t time) { setTimeOfDayAtEndOfTick = true; setTimeOfDay = time; }
+	static void SetTime(int64_t time) { setTimeAtEndOfTick = true; setTime = time; }
+
 	C4JThread::Event* m_serverPausedEvent;
 private:
 	// 4J Added
@@ -241,5 +241,5 @@ public:
 	void Suspend();
 	bool IsSuspending();
 
-	// 4J Stu - A load of functions were all added in 1.0.1 in the ServerInterface, but I don't think we need any of them 
+	// 4J Stu - A load of functions were all added in 1.0.1 in the ServerInterface, but I don't think we need any of them
 };