Remove AUTO_VAR macro and _toString function (#592)

1 files changed, 33 insertions, 33 deletions

diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp
index af9e226b..699ffa8c 100644
--- a/Minecraft.Client/MinecraftServer.cpp
+++ b/Minecraft.Client/MinecraftServer.cpp
@@ -211,7 +211,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 	{
 		wstring playerNames = (playerList != NULL) ? playerList->getPlayerNames() : L"";
 		if (playerNames.empty()) playerNames = L"(none)";
-		server->info(L"Players (" + _toString((playerList != NULL) ? playerList->getPlayerCount() : 0) + L"): " + playerNames);
+		server->info(L"Players (" + std::to_wstring((playerList != NULL) ? playerList->getPlayerCount() : 0) + L"): " + playerNames);
 		return true;
 	}
 
@@ -273,7 +273,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 				}
 			}
 
-			server->info(L"Added " + _toString(delta) + L" ticks.");
+			server->info(L"Added " + std::to_wstring(delta) + L" ticks.");
 			return true;
 		}
 
@@ -304,7 +304,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		}
 
 		SetAllLevelTimes(server, targetTime);
-		server->info(L"Time set to " + _toString(targetTime) + L".");
+		server->info(L"Time set to " + std::to_wstring(targetTime) + L".");
 		return true;
 	}
 
@@ -427,7 +427,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		}
 		if (itemId <= 0 || Item::items[itemId] == NULL)
 		{
-			server->warn(L"Unknown item id: " + _toString(itemId));
+			server->warn(L"Unknown item id: " + std::to_wstring(itemId));
 			return false;
 		}
 		if (amount <= 0)
@@ -442,7 +442,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		{
 			drop->throwTime = 0;
 		}
-		server->info(L"Gave item " + _toString(itemId) + L" x" + _toString(amount) + L" to " + player->getName() + L".");
+		server->info(L"Gave item " + std::to_wstring(itemId) + L" x" + std::to_wstring(amount) + L" to " + player->getName() + L".");
 		return true;
 	}
 
@@ -484,7 +484,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		Enchantment *enchantment = Enchantment::enchantments[enchantmentId];
 		if (enchantment == NULL)
 		{
-			server->warn(L"Unknown enchantment id: " + _toString(enchantmentId));
+			server->warn(L"Unknown enchantment id: " + std::to_wstring(enchantmentId));
 			return false;
 		}
 		if (!enchantment->canEnchant(selectedItem))
@@ -514,7 +514,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		}
 
 		selectedItem->enchant(enchantment, enchantmentLevel);
-		server->info(L"Enchanted " + player->getName() + L"'s held item with " + _toString(enchantmentId) + L" " + _toString(enchantmentLevel) + L".");
+		server->info(L"Enchanted " + player->getName() + L"'s held item with " + std::to_wstring(enchantmentId) + L" " + std::to_wstring(enchantmentLevel) + L".");
 		return true;
 	}
 
@@ -712,7 +712,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
 	}
 
 	LevelType *pLevelType = LevelType::getLevelType(levelTypeString);
-	if (pLevelType == NULL) 
+	if (pLevelType == NULL)
 	{
 		pLevelType = LevelType::lvl_normal;
 	}
@@ -771,7 +771,7 @@ int MinecraftServer::runPostUpdate(void* lpParam)
 	Entity::useSmallIds();		// This thread can end up spawning entities as resources
 	IntCache::CreateNewThreadStorage();
 	AABB::CreateNewThreadStorage();
-	Vec3::CreateNewThreadStorage();	
+	Vec3::CreateNewThreadStorage();
 	Compression::UseDefaultThreadStorage();
 	Level::enableLightingCache();
 	Tile::CreateNewThreadStorage();
@@ -892,7 +892,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 	{
 		// We are loading a file from disk with the data passed in
 
-#ifdef SPLIT_SAVES		
+#ifdef SPLIT_SAVES
 		ConsoleSaveFileOriginal oldFormatSave( initData->saveData->saveName, initData->saveData->data, initData->saveData->fileSize, false, initData->savePlatform );
 		ConsoleSaveFile* pSave = new ConsoleSaveFileSplit( &oldFormatSave );
 
@@ -936,7 +936,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 	}
 
 	//	McRegionLevelStorage *storage = new McRegionLevelStorage(new ConsoleSaveFile( L"" ), L"", L"", 0); // original
-	//    McRegionLevelStorage *storage = new McRegionLevelStorage(File(L"."), name, true); // TODO 
+	//    McRegionLevelStorage *storage = new McRegionLevelStorage(File(L"."), name, true); // TODO
 	for (unsigned int i = 0; i < levels.length; i++)
 	{
 		if( s_bServerHalted || !g_NetworkManager.IsInSession() )
@@ -1022,7 +1022,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 #ifdef __PSVITA__
 	int r = 48;
 #else
-	int r = 196;	
+	int r = 196;
 #endif
 
 	//  4J JEV: load gameRules.
@@ -1173,7 +1173,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 
 		if(!levels[0]->getLevelData()->getHasStronghold())
 		{
-			int x,z;			
+			int x,z;
 			if(app.GetTerrainFeaturePosition(eTerrainFeature_Stronghold,&x,&z))
 			{
 				levels[0]->getLevelData()->setXStronghold(x);
@@ -1401,7 +1401,7 @@ void MinecraftServer::Suspend()
 	// Save the start time
 	QueryPerformanceCounter( &qwTime );
 	if(m_bLoaded && ProfileManager.IsFullVersion() && (!StorageManager.GetSaveDisabled()))
-	{	
+	{
 		if (players != NULL)
 		{
 			players->saveAll(NULL);
@@ -1476,7 +1476,7 @@ void MinecraftServer::stopServer(bool didInit)
 #endif
 		// if trial version or saving is disabled, then don't save anything. Also don't save anything if we didn't actually get through the server initialisation.
 		if(m_saveOnExit && ProfileManager.IsFullVersion() && (!StorageManager.GetSaveDisabled()) && didInit)
-		{	
+		{
 			if (players != NULL)
 			{
 				players->saveAll(Minecraft::GetInstance()->progressRenderer, true);
@@ -1715,7 +1715,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 
 		if(pLevelData && pLevelData->getHasStronghold()==false)
 		{
-			int x,z;			
+			int x,z;
 			if(app.GetTerrainFeaturePosition(eTerrainFeature_Stronghold,&x,&z))
 			{
 				pLevelData->setXStronghold(x);
@@ -1815,7 +1815,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 				}
 			}
 
-			// Process delayed actions			
+			// Process delayed actions
 			eXuiServerAction eAction;
 			LPVOID param;
 			for(int i=0;i<XUSER_MAX_COUNT;i++)
@@ -1898,7 +1898,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 					{
 						saveGameRules();
 
-						levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));	
+						levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));
 					}
 					app.LeaveSaveNotificationSection();
 					break;
@@ -1923,19 +1923,19 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 				case eXuiServerAction_PauseServer:
 					m_isServerPaused = ( (size_t) param == TRUE );
 					if( m_isServerPaused )
-					{						
+					{
 						m_serverPausedEvent->Set();
 					}
 					break;
 				case eXuiServerAction_ToggleRain:
-					{						
+					{
 						bool isRaining = levels[0]->getLevelData()->isRaining();
 						levels[0]->getLevelData()->setRaining(!isRaining);
 						levels[0]->getLevelData()->setRainTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
 					}
 					break;
 				case eXuiServerAction_ToggleThunder:
-					{						
+					{
 						bool isThundering = levels[0]->getLevelData()->isThundering();
 						levels[0]->getLevelData()->setThundering(!isThundering);
 						levels[0]->getLevelData()->setThunderTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
@@ -1973,7 +1973,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 						File dataFile = File( targetFileDir, wstring(filename) );
 						if(dataFile.exists()) dataFile._delete();
 						FileOutputStream fos = FileOutputStream(dataFile);
-						DataOutputStream dos = DataOutputStream(&fos);				
+						DataOutputStream dos = DataOutputStream(&fos);
 						ConsoleSchematicFile::generateSchematicFile(&dos, levels[0], initData->startX, initData->startY, initData->startZ, initData->endX, initData->endY, initData->endZ, initData->bSaveMobs, initData->compressionType);
 						dos.close();
 
@@ -1990,7 +1990,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 						app.DebugPrintf(	"DEBUG: Player=%i\n", pos->player );
 						app.DebugPrintf(	"DEBUG: Teleporting to pos=(%f.2, %f.2, %f.2), looking at=(%f.2,%f.2)\n",
 							pos->m_camX, pos->m_camY, pos->m_camZ,
-							pos->m_yRot, pos->m_elev 
+							pos->m_yRot, pos->m_elev
 							);
 
 						shared_ptr<ServerPlayer> player = players->players.at(pos->player);
@@ -2064,21 +2064,21 @@ void MinecraftServer::broadcastStopSavingPacket()
 void MinecraftServer::tick()
 {
 	vector<wstring> toRemove;
-	for (AUTO_VAR(it, ironTimers.begin()); it != ironTimers.end(); it++ )
-	{
-		int t = it->second;
+    for ( auto& it : ironTimers )
+    {
+		int t = it.second;
 		if (t > 0)
 		{
-			ironTimers[it->first] = t - 1;
+			ironTimers[it.first] = t - 1;
 		}
 		else
 		{
-			toRemove.push_back(it->first);
+			toRemove.push_back(it.first);
 		}
 	}
-	for (unsigned int i = 0; i < toRemove.size(); i++)
+	for (const auto& i : toRemove)
 	{
-		ironTimers.erase(toRemove[i]);
+		ironTimers.erase(i);
 	}
 
 	AABB::resetPool();
@@ -2316,8 +2316,8 @@ void MinecraftServer::chunkPacketManagement_PreTick()
 		do
 		{
 			int longestTime = 0;
-			AUTO_VAR(playerConnectionBest,playersOrig.begin());
-			for( AUTO_VAR(it, playersOrig.begin()); it != playersOrig.end(); it++)
+			auto playerConnectionBest = playersOrig.begin();
+			for( auto it = playersOrig.begin(); it != playersOrig.end(); it++)
 			{
 				int thisTime = 0;
 				INetworkPlayer *np = (*it)->getNetworkPlayer();
@@ -2326,7 +2326,7 @@ void MinecraftServer::chunkPacketManagement_PreTick()
 					thisTime = np->GetTimeSinceLastChunkPacket_ms();
 				}
 
-				if( thisTime > longestTime ) 
+				if( thisTime > longestTime )
 				{
 					playerConnectionBest = it;
 					longestTime = thisTime;