Remove all MSVC `__int64` (#742)

1 files changed, 30 insertions, 30 deletions

diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp
index 012ae19b..373a5e33 100644
--- a/Minecraft.Client/MinecraftServer.cpp
+++ b/Minecraft.Client/MinecraftServer.cpp
@@ -68,15 +68,15 @@
 //4J Added
 MinecraftServer *MinecraftServer::server = NULL;
 bool MinecraftServer::setTimeAtEndOfTick = false;
-__int64 MinecraftServer::setTime = 0;
+int64_t MinecraftServer::setTime = 0;
 bool MinecraftServer::setTimeOfDayAtEndOfTick = false;
-__int64 MinecraftServer::setTimeOfDay = 0;
+int64_t MinecraftServer::setTimeOfDay = 0;
 bool	MinecraftServer::m_bPrimaryPlayerSignedOut=false;
 bool	MinecraftServer::s_bServerHalted=false;
 bool	MinecraftServer::s_bSaveOnExitAnswered=false;
 #ifdef _ACK_CHUNK_SEND_THROTTLING
 bool MinecraftServer::s_hasSentEnoughPackets = false;
-__int64 MinecraftServer::s_tickStartTime = 0;
+int64_t MinecraftServer::s_tickStartTime = 0;
 vector<INetworkPlayer *> MinecraftServer::s_sentTo;
 #else
 int MinecraftServer::s_slowQueuePlayerIndex = 0;
@@ -581,7 +581,7 @@ MinecraftServer::~MinecraftServer()
 	DeleteCriticalSection(&m_consoleInputCS);
 }
 
-bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DWORD initSettings, bool findSeed)
+bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DWORD initSettings, bool findSeed)
 {
 	// 4J - removed
 #if 0
@@ -692,7 +692,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
 		// TODO: Stop loading, add error message.
 	}
 
-	__int64 levelNanoTime = System::nanoTime();
+	int64_t levelNanoTime = System::nanoTime();
 
         wstring levelName = (initData && !initData->levelName.empty()) ? initData->levelName : GetDedicatedServerString(settings, L"level-name", L"world");
 		wstring levelTypeString;
@@ -736,10 +736,10 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
 
 #if 0
 	wstring levelSeedString = settings->getString(L"level-seed", L"");
-	__int64 levelSeed = (new Random())->nextLong();
+	int64_t levelSeed = (new Random())->nextLong();
 	if (levelSeedString.length() > 0)
 	{
-		long newSeed = _fromString<__int64>(levelSeedString);
+		long newSeed = _fromString<int64_t>(levelSeedString);
 		if (newSeed != 0) {
 			levelSeed = newSeed;
 		}
@@ -866,7 +866,7 @@ void MinecraftServer::postProcessTerminate(ProgressRenderer *mcprogress)
 	DeleteCriticalSection(&m_postProcessCS);
 }
 
-bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring& name, __int64 levelSeed, LevelType *pLevelType, NetworkGameInitData *initData)
+bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring& name, int64_t levelSeed, LevelType *pLevelType, NetworkGameInitData *initData)
 {
 	//	4J - TODO - do with new save stuff
 	//    if (storageSource->requiresConversion(name))
@@ -1016,7 +1016,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 	m_postUpdateThread->SetPriority(THREAD_PRIORITY_ABOVE_NORMAL);
 	m_postUpdateThread->Run();
 
-	__int64 startTime = System::currentTimeMillis();
+	int64_t startTime = System::currentTimeMillis();
 
 	// 4J Stu - Added this to temporarily make starting games on vita faster
 #ifdef __PSVITA__
@@ -1046,7 +1046,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 		csf->closeHandle(fe);
 	}
 
-	__int64 lastTime = System::currentTimeMillis();
+	int64_t lastTime = System::currentTimeMillis();
 #ifdef _LARGE_WORLDS
 	if(app.GetGameNewWorldSize() > levels[0]->getLevelData()->getXZSizeOld())
 	{
@@ -1074,7 +1074,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 			}
 
 #if 0
-			__int64 lastStorageTickTime = System::currentTimeMillis();
+			int64_t lastStorageTickTime = System::currentTimeMillis();
 
 			// Test code to enable full creation of levels at start up
 			int halfsidelen = ( i == 0 ) ? 27 : 9;
@@ -1097,7 +1097,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 				}
 			}
 #else
-			__int64 lastStorageTickTime = System::currentTimeMillis();
+			int64_t lastStorageTickTime = System::currentTimeMillis();
 			Pos *spawnPos = level->getSharedSpawnPos();
 
 			int twoRPlusOne = r*2 + 1;
@@ -1114,7 +1114,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 						return false;
 					}
 					//					printf(">>>%d %d %d\n",i,x,z);
-					//                    __int64 now = System::currentTimeMillis();
+					//                    int64_t now = System::currentTimeMillis();
 					//                    if (now < lastTime) lastTime = now;
 					//                    if (now > lastTime + 1000)
 					{
@@ -1679,7 +1679,7 @@ bool MinecraftServer::getForceGameType()
 	return forceGameType;
 }
 
-__int64 MinecraftServer::getCurrentTimeMillis()
+int64_t MinecraftServer::getCurrentTimeMillis()
 {
 	return System::currentTimeMillis();
 }
@@ -1695,7 +1695,7 @@ void MinecraftServer::setPlayerIdleTimeout(int playerIdleTimeout)
 }
 
 extern int c0a, c0b, c1a, c1b, c1c, c2a, c2b;
-void MinecraftServer::run(__int64 seed, void *lpParameter)
+void MinecraftServer::run(int64_t seed, void *lpParameter)
 {
 	NetworkGameInitData *initData = NULL;
 	DWORD initSettings = 0;
@@ -1728,18 +1728,18 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 			}
 		}
 
-		__int64 lastTime = getCurrentTimeMillis();
-		__int64 unprocessedTime = 0;
+		int64_t lastTime = getCurrentTimeMillis();
+		int64_t unprocessedTime = 0;
 		while (running && !s_bServerHalted)
 		{
-			__int64 now = getCurrentTimeMillis();
+			int64_t now = getCurrentTimeMillis();
 
 			// 4J Stu - When we pause the server, we don't want to count that as time passed
 			// 4J Stu - TU-1 hotifx - Remove this line. We want to make sure that we tick connections at the proper rate when paused
 			//Fix for #13191 - The host of a game can get a message informing them that the connection to the server has been lost
 			//if(m_isServerPaused) lastTime = now;
 
-			__int64 passedTime = now - lastTime;
+			int64_t passedTime = now - lastTime;
 			if (passedTime > MS_PER_TICK * 40)
 			{
 				//                logger.warning("Can't keep up! Did the system time change, or is the server overloaded?");
@@ -1765,19 +1765,19 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 				else
 				{
 					//					int tickcount = 0;
-					//					__int64 beforeall = System::currentTimeMillis();
+					//					int64_t beforeall = System::currentTimeMillis();
 					while (unprocessedTime > MS_PER_TICK)
 					{
 						unprocessedTime -= MS_PER_TICK;
 						chunkPacketManagement_PreTick();
-//						__int64 before = System::currentTimeMillis();
+//						int64_t before = System::currentTimeMillis();
 						tick();
-//						__int64 after = System::currentTimeMillis();
+//						int64_t after = System::currentTimeMillis();
 //						PIXReportCounter(L"Server time",(float)(after-before));
 
 						chunkPacketManagement_PostTick();
 					}
-//					__int64 afterall = System::currentTimeMillis();
+//					int64_t afterall = System::currentTimeMillis();
 //					PIXReportCounter(L"Server time all",(float)(afterall-beforeall));
 //					PIXReportCounter(L"Server ticks",(float)tickcount);
 				}
@@ -2119,15 +2119,15 @@ void MinecraftServer::tick()
 				players->broadcastAll( shared_ptr<SetTimePacket>( new SetTimePacket(level->getGameTime(), level->getDayTime(), level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT) ) ), level->dimension->id);
 			}
 			// #ifndef __PS3__
-			static __int64 stc = 0;
-			__int64 st0 = System::currentTimeMillis();
+			static int64_t stc = 0;
+			int64_t st0 = System::currentTimeMillis();
 			PIXBeginNamedEvent(0,"Level tick %d",i);
 			((Level *)level)->tick();
-			__int64 st1 = System::currentTimeMillis();
+			int64_t st1 = System::currentTimeMillis();
 			PIXEndNamedEvent();
 			PIXBeginNamedEvent(0,"Update lights %d",i);
 
-			__int64 st2 = System::currentTimeMillis();
+			int64_t st2 = System::currentTimeMillis();
 			PIXEndNamedEvent();
 			PIXBeginNamedEvent(0,"Entity tick %d",i);
 			// 4J added to stop ticking entities in levels when players are not in those levels.
@@ -2155,7 +2155,7 @@ void MinecraftServer::tick()
 			level->getTracker()->tick();
 			PIXEndNamedEvent();
 
-			__int64 st3 = System::currentTimeMillis();
+			int64_t st3 = System::currentTimeMillis();
 			//			printf(">>>>>>>>>>>>>>>>>>>>>> Tick %d %d %d : %d\n", st1 - st0, st2 - st1, st3 - st2, st0 - stc );
 			stc = st0;
 			// #endif// __PS3__
@@ -2206,7 +2206,7 @@ void MinecraftServer::handleConsoleInputs()
 	}
 }
 
-void MinecraftServer::main(__int64 seed, void *lpParameter)
+void MinecraftServer::main(int64_t seed, void *lpParameter)
 {
 #if __PS3__
 	ShutdownManager::HasStarted(ShutdownManager::eServerThread );
@@ -2286,7 +2286,7 @@ bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
 
 void MinecraftServer::chunkPacketManagement_DidSendTo(INetworkPlayer *player)
 {
-	__int64 currentTime = System::currentTimeMillis();
+	int64_t currentTime = System::currentTimeMillis();
 
 	if( ( currentTime - s_tickStartTime ) >= MAX_TICK_TIME_FOR_PACKET_SENDS )
 	{