From e0479e90b4725f5e8eada48294c112c9b545bf9d Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Fri, 6 Mar 2026 21:06:31 -0600 Subject: [PATCH] fix: unglob everything else and make it build --- .../Build/Common/Audio/SoundEngine.cpp | 2 +- .../Build/Common/Consoles_App.cpp | 4 +- Minecraft.Client/Build/Common/Consoles_App.h | 2 +- .../Build/Common/DLC/DLCGameRulesHeader.cpp | 8 +-- .../Build/Common/DLC/DLCManager.cpp | 14 ++--- .../AddEnchantmentRuleDefinition.cpp | 2 +- .../GameRules/AddItemRuleDefinition.cpp | 6 +- .../ApplySchematicRuleDefinition.cpp | 4 +- .../GameRules/ConsoleGenerateStructure.cpp | 6 +- .../Common/GameRules/ConsoleSchematicFile.cpp | 26 ++++----- .../Common/GameRules/GameRuleDefinition.cpp | 2 +- .../GameRules/LevelGenerationOptions.cpp | 4 +- .../Leaderboards/LeaderboardManager.cpp | 2 +- .../Network/PlatformNetworkManagerStub.cpp | 2 +- .../Build/Common/Tutorial/Tutorial.cpp | 4 +- .../Build/Common/Tutorial/Tutorial.h | 2 +- .../UI/IUIScene_AbstractContainerMenu.cpp | 2 +- .../Build/Common/UI/IUIScene_PauseMenu.cpp | 2 +- .../Build/Common/UI/IUIScene_TradingMenu.cpp | 4 +- .../Build/Common/UI/IUIScene_TradingMenu.h | 2 +- .../Build/Common/UI/UIBitmapFont.cpp | 4 +- .../Build/Common/UI/UIBitmapFont.h | 4 +- .../Build/Common/UI/UIComponent_Chat.cpp | 2 +- .../Common/UI/UIComponent_DebugUIConsole.cpp | 2 +- .../Common/UI/UIComponent_DebugUIConsole.h | 4 +- .../Build/Common/UI/UIControl.cpp | 2 +- Minecraft.Client/Build/Common/UI/UIControl.h | 6 +- .../Build/Common/UI/UIControl_Base.cpp | 4 +- .../Build/Common/UI/UIControl_Base.h | 4 +- .../Build/Common/UI/UIControl_BitmapIcon.cpp | 2 +- .../Build/Common/UI/UIControl_BitmapIcon.h | 2 +- .../Build/Common/UI/UIControl_Button.cpp | 2 +- .../Build/Common/UI/UIControl_Button.h | 2 +- .../Build/Common/UI/UIControl_ButtonList.cpp | 6 +- .../Build/Common/UI/UIControl_ButtonList.h | 6 +- .../Build/Common/UI/UIControl_CheckBox.cpp | 2 +- .../Build/Common/UI/UIControl_CheckBox.h | 2 +- .../Build/Common/UI/UIControl_Cursor.cpp | 2 +- .../Build/Common/UI/UIControl_Cursor.h | 2 +- .../Build/Common/UI/UIControl_DLCList.cpp | 4 +- .../Build/Common/UI/UIControl_DLCList.h | 4 +- .../Common/UI/UIControl_DynamicLabel.cpp | 2 +- .../Build/Common/UI/UIControl_DynamicLabel.h | 2 +- .../Common/UI/UIControl_EnchantmentButton.cpp | 2 +- .../Common/UI/UIControl_EnchantmentButton.h | 2 +- .../Build/Common/UI/UIControl_HTMLLabel.cpp | 4 +- .../Build/Common/UI/UIControl_HTMLLabel.h | 4 +- .../Build/Common/UI/UIControl_Label.cpp | 4 +- .../Build/Common/UI/UIControl_Label.h | 4 +- .../Common/UI/UIControl_LeaderboardList.cpp | 2 +- .../Common/UI/UIControl_LeaderboardList.h | 2 +- .../Build/Common/UI/UIControl_PlayerList.cpp | 2 +- .../Build/Common/UI/UIControl_PlayerList.h | 2 +- .../Build/Common/UI/UIControl_Progress.cpp | 2 +- .../Build/Common/UI/UIControl_Progress.h | 2 +- .../Build/Common/UI/UIControl_SaveList.cpp | 10 ++-- .../Build/Common/UI/UIControl_SaveList.h | 10 ++-- .../Build/Common/UI/UIControl_Slider.cpp | 2 +- .../Build/Common/UI/UIControl_Slider.h | 2 +- .../Build/Common/UI/UIControl_SlotList.cpp | 2 +- .../Build/Common/UI/UIControl_SlotList.h | 2 +- .../Common/UI/UIControl_SpaceIndicatorBar.cpp | 6 +- .../Common/UI/UIControl_SpaceIndicatorBar.h | 4 +- .../Build/Common/UI/UIControl_TextInput.cpp | 2 +- .../Build/Common/UI/UIControl_TextInput.h | 2 +- .../Common/UI/UIControl_TexturePackList.cpp | 2 +- .../Common/UI/UIControl_TexturePackList.h | 2 +- .../Build/Common/UI/UIControl_Touch.cpp | 2 +- .../Build/Common/UI/UIControl_Touch.h | 2 +- .../Build/Common/UI/UIController.cpp | 10 ++-- .../Build/Common/UI/UIController.h | 2 +- .../Build/Common/UI/UIFontData.cpp | 4 +- Minecraft.Client/Build/Common/UI/UIFontData.h | 4 +- Minecraft.Client/Build/Common/UI/UILayer.cpp | 20 +++---- Minecraft.Client/Build/Common/UI/UILayer.h | 2 +- Minecraft.Client/Build/Common/UI/UIScene.cpp | 2 +- .../Build/Common/UI/UIScene_DLCMainMenu.cpp | 2 +- .../Build/Common/UI/UIScene_DLCOffersMenu.cpp | 8 +-- .../Build/Common/UI/UIScene_DLCOffersMenu.h | 2 +- .../Build/Common/UI/UIScene_DebugOverlay.cpp | 2 +- .../Build/Common/UI/UIScene_DebugOverlay.h | 2 +- .../Build/Common/UI/UIScene_EndPoem.cpp | 4 +- .../Build/Common/UI/UIScene_HUD.cpp | 4 +- .../Build/Common/UI/UIScene_JoinMenu.cpp | 2 +- .../Common/UI/UIScene_LeaderboardsMenu.cpp | 2 +- .../Build/Common/UI/UIScene_PauseMenu.cpp | 4 +- .../Common/UI/UIScene_SkinSelectMenu.cpp | 2 +- .../Build/Common/UI/UITTFFont.cpp | 2 +- Minecraft.Client/Build/Common/UI/UITTFFont.h | 2 +- .../Build/Common/XUI/XUI_Chat.cpp | 2 +- .../Build/Common/XUI/XUI_Ctrl_4JEdit.cpp | 4 +- .../Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp | 2 +- .../Build/Common/XUI/XUI_Leaderboards.cpp | 4 +- .../Build/Common/XUI/XUI_MainMenu.cpp | 2 +- .../Common/XUI/XUI_MultiGameJoinLoad.cpp | 2 +- Minecraft.Client/GameState/StatsCounter.cpp | 58 +++++++++---------- .../Leaderboards/DurangoStatsDebugger.cpp | 2 +- .../Durango/Network/DQRNetworkManager.h | 2 +- .../Leaderboards/OrbisLeaderboardManager.h | 2 +- .../PS3/Leaderboards/PS3LeaderboardManager.h | 2 +- .../Leaderboards/PSVitaLeaderboardManager.h | 2 +- Minecraft.Client/Player/LocalPlayer.cpp | 14 ++--- Minecraft.Client/Rendering/Models/ModelPart.h | 4 +- .../Textures/Stitching/Stitcher.h | 2 +- Minecraft.World/IO/Files/File.cpp | 4 +- Minecraft.World/Level/CustomLevelSource.cpp | 8 +-- Minecraft.World/Network/Connection.h | 6 +- Minecraft.World/Recipes/ArmorRecipes.cpp | 2 +- Minecraft.World/Recipes/OreRecipes.cpp | 2 +- Minecraft.World/Recipes/Recipes.cpp | 2 +- Minecraft.World/Recipes/ToolRecipes.cpp | 2 +- Minecraft.World/Recipes/WeaponRecipes.cpp | 2 +- Minecraft.World/Util/StringHelpers.cpp | 2 +- .../WorldGen/Layers/BiomeOverrideLayer.cpp | 4 +- 114 files changed, 237 insertions(+), 237 deletions(-) diff --git a/Minecraft.Client/Build/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Build/Common/Audio/SoundEngine.cpp index 177abd100..b4cd9f7a9 100644 --- a/Minecraft.Client/Build/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Build/Common/Audio/SoundEngine.cpp @@ -1234,7 +1234,7 @@ void SoundEngine::playMusicUpdate() char szName[255]; wcstombs(szName,wstrSoundName.c_str(),255); - string strFile="TPACK:\\Data\\" + string(szName) + ".binka"; + std::string strFile="TPACK:\\Data\\" + string(szName) + ".binka"; std::string mountedPath = StorageManager.GetMountedPath(strFile); strcpy(m_szStreamName,mountedPath.c_str()); #endif diff --git a/Minecraft.Client/Build/Common/Consoles_App.cpp b/Minecraft.Client/Build/Common/Consoles_App.cpp index 40c4f6d19..c59324a3f 100644 --- a/Minecraft.Client/Build/Common/Consoles_App.cpp +++ b/Minecraft.Client/Build/Common/Consoles_App.cpp @@ -4053,7 +4053,7 @@ void CMinecraftApp::loadMediaArchive() m_mediaArchive = new ArchiveFile( File(mediapath) ); } #if 0 - string path = "Common\\media.arc"; + std::string path = "Common\\media.arc"; HANDLE hFile = CreateFile( path.c_str(), GENERIC_READ, FILE_SHARE_READ, @@ -6691,7 +6691,7 @@ bool CMinecraftApp::GetDLCNameForPackID(const int iPackID,char **ppchKeyID) } DLC_INFO *CMinecraftApp::GetDLCInfo(char *pchDLCName) { - string tempString=pchDLCName; + std::string tempString=pchDLCName; if(DLCInfo.size()>0) { diff --git a/Minecraft.Client/Build/Common/Consoles_App.h b/Minecraft.Client/Build/Common/Consoles_App.h index 6541253b6..7adfd5448 100644 --- a/Minecraft.Client/Build/Common/Consoles_App.h +++ b/Minecraft.Client/Build/Common/Consoles_App.h @@ -856,7 +856,7 @@ private: bool m_bResetNether; DWORD m_dwRequiredTexturePackID; #ifdef _XBOX_ONE - vector m_vTMSPPData; + std::vector m_vTMSPPData; #endif #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__) diff --git a/Minecraft.Client/Build/Common/DLC/DLCGameRulesHeader.cpp b/Minecraft.Client/Build/Common/DLC/DLCGameRulesHeader.cpp index 418c2c301..ef644da56 100644 --- a/Minecraft.Client/Build/Common/DLC/DLCGameRulesHeader.cpp +++ b/Minecraft.Client/Build/Common/DLC/DLCGameRulesHeader.cpp @@ -57,10 +57,10 @@ void DLCGameRulesHeader::addData(PBYTE pbData, DWORD dwBytes) version_number, compression_type, - std::wstringtofilename(m_defaultSaveName), - std::wstringtofilename(m_displayName), - std::wstringtofilename(texturepackid), - std::wstringtofilename(m_grfPath) + wstringtofilename(m_defaultSaveName), + wstringtofilename(m_displayName), + wstringtofilename(texturepackid), + wstringtofilename(m_grfPath) ); // Texture Pack. diff --git a/Minecraft.Client/Build/Common/DLC/DLCManager.cpp b/Minecraft.Client/Build/Common/DLC/DLCManager.cpp index 5f1deea2f..929853f66 100644 --- a/Minecraft.Client/Build/Common/DLC/DLCManager.cpp +++ b/Minecraft.Client/Build/Common/DLC/DLCManager.cpp @@ -10,14 +10,14 @@ #ifdef __linux__ #include static const size_t DLC_WCHAR_BINARY = 2; -static std::wstring dlc_read_std::wstring(const void *data) +static std::wstring dlc_read_wstring(const void *data) { const uint16_t *p = (const uint16_t *)data; std::wstring s; while (*p) s += (wchar_t)*p++; return s; } -#define DLC_WSTRING(ptr) dlc_read_std::wstring(ptr) +#define DLC_WSTRING(ptr) dlc_read_wstring(ptr) #define DLC_PARAM_ADV(n) (sizeof(C4JStorage::DLC_FILE_PARAM) + (n) * DLC_WCHAR_BINARY) #define DLC_DETAIL_ADV(n) (sizeof(C4JStorage::DLC_FILE_DETAILS) + (n) * DLC_WCHAR_BINARY) #else @@ -328,11 +328,11 @@ DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/) bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const std::wstring &path, DLCPack *pack, bool fromArchive) { - return readDLCDataFile( dwFilesProcessed, std::wstringtofilename(path), pack, fromArchive); + return readDLCDataFile( dwFilesProcessed, wstringtofilename(path), pack, fromArchive); } -bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const string &path, DLCPack *pack, bool fromArchive) +bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const std::string &path, DLCPack *pack, bool fromArchive) { std::wstring wPath = convStringToWstring(path); if (fromArchive && app.getArchiveFileSize(wPath) >= 0) @@ -343,7 +343,7 @@ bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const string &path, DL else if (fromArchive) return false; #ifdef _WINDOWS64 - string finalPath = StorageManager.GetMountedPath(path.c_str()); + std::string finalPath = StorageManager.GetMountedPath(path.c_str()); if(finalPath.size() == 0) finalPath = path; HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); #elif defined(_DURANGO) @@ -544,13 +544,13 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD return true; } -DWORD DLCManager::retrievePackIDFromDLCDataFile(const string &path, DLCPack *pack) +DWORD DLCManager::retrievePackIDFromDLCDataFile(const std::string &path, DLCPack *pack) { DWORD packId = 0; std::wstring wPath = convStringToWstring(path); #ifdef _WINDOWS64 - string finalPath = StorageManager.GetMountedPath(path.c_str()); + std::string finalPath = StorageManager.GetMountedPath(path.c_str()); if(finalPath.size() == 0) finalPath = path; HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); #elif defined(_DURANGO) diff --git a/Minecraft.Client/Build/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Minecraft.Client/Build/Common/GameRules/AddEnchantmentRuleDefinition.cpp index facb15b36..d4b581598 100644 --- a/Minecraft.Client/Build/Common/GameRules/AddEnchantmentRuleDefinition.cpp +++ b/Minecraft.Client/Build/Common/GameRules/AddEnchantmentRuleDefinition.cpp @@ -60,7 +60,7 @@ bool AddEnchantmentRuleDefinition::enchantItem(std::shared_ptr ite if(e != NULL && e->category->canEnchant(item->getItem())) { - int level = min(e->getMaxLevel(), m_enchantmentLevel); + int level = std::min(e->getMaxLevel(), m_enchantmentLevel); item->enchant(e, m_enchantmentLevel); enchanted = true; } diff --git a/Minecraft.Client/Build/Common/GameRules/AddItemRuleDefinition.cpp b/Minecraft.Client/Build/Common/GameRules/AddItemRuleDefinition.cpp index 17c7d8f57..cda647351 100644 --- a/Minecraft.Client/Build/Common/GameRules/AddItemRuleDefinition.cpp +++ b/Minecraft.Client/Build/Common/GameRules/AddItemRuleDefinition.cpp @@ -99,7 +99,7 @@ bool AddItemRuleDefinition::addItemToContainer(std::shared_ptr contai bool added = false; if(Item::items[m_itemId] != NULL) { - int quantity = min(m_quantity, Item::items[m_itemId]->getMaxStackSize()); + int quantity = std::min(m_quantity, Item::items[m_itemId]->getMaxStackSize()); std::shared_ptr newItem = std::shared_ptr(new ItemInstance(m_itemId,quantity,m_auxValue) ); newItem->set4JData(m_dataTag); @@ -118,9 +118,9 @@ bool AddItemRuleDefinition::addItemToContainer(std::shared_ptr contai container->setItem( slotId, newItem ); added = true; } - else if(dynamic_pointer_cast(container) != NULL) + else if(std::dynamic_pointer_cast(container) != NULL) { - added = dynamic_pointer_cast(container)->add(newItem); + added = std::dynamic_pointer_cast(container)->add(newItem); } } return added; diff --git a/Minecraft.Client/Build/Common/GameRules/ApplySchematicRuleDefinition.cpp b/Minecraft.Client/Build/Common/GameRules/ApplySchematicRuleDefinition.cpp index 0bbd18dca..1e88b0d51 100644 --- a/Minecraft.Client/Build/Common/GameRules/ApplySchematicRuleDefinition.cpp +++ b/Minecraft.Client/Build/Common/GameRules/ApplySchematicRuleDefinition.cpp @@ -167,7 +167,7 @@ void ApplySchematicRuleDefinition::processSchematic(AABB *chunkBox, LevelChunk * if(m_locationBox == NULL) updateLocationBox(); if(chunkBox->intersects( m_locationBox )) { - m_locationBox->y1 = min((double)Level::maxBuildHeight, m_locationBox->y1 ); + m_locationBox->y1 = std::min((double)Level::maxBuildHeight, m_locationBox->y1 ); #ifdef _DEBUG app.DebugPrintf("Applying schematic %ls to chunk (%d,%d)\n",m_schematicName.c_str(),chunk->x, chunk->z); @@ -206,7 +206,7 @@ void ApplySchematicRuleDefinition::processSchematicLighting(AABB *chunkBox, Leve if(m_locationBox == NULL) updateLocationBox(); if(chunkBox->intersects( m_locationBox )) { - m_locationBox->y1 = min((double)Level::maxBuildHeight, m_locationBox->y1 ); + m_locationBox->y1 = std::min((double)Level::maxBuildHeight, m_locationBox->y1 ); #ifdef _DEBUG app.DebugPrintf("Applying schematic %ls to chunk (%d,%d)\n",m_schematicName.c_str(),chunk->x, chunk->z); diff --git a/Minecraft.Client/Build/Common/GameRules/ConsoleGenerateStructure.cpp b/Minecraft.Client/Build/Common/GameRules/ConsoleGenerateStructure.cpp index 8c2f27a2d..a1ebd5873 100644 --- a/Minecraft.Client/Build/Common/GameRules/ConsoleGenerateStructure.cpp +++ b/Minecraft.Client/Build/Common/GameRules/ConsoleGenerateStructure.cpp @@ -120,9 +120,9 @@ BoundingBox* ConsoleGenerateStructure::getBoundingBox() for(AUTO_VAR(it, m_actions.begin()); it != m_actions.end(); ++it) { ConsoleGenerateStructureAction *action = *it; - maxX = max(maxX,action->getEndX()); - maxY = max(maxY,action->getEndY()); - maxZ = max(maxZ,action->getEndZ()); + maxX = std::max(maxX,action->getEndX()); + maxY = std::max(maxY,action->getEndY()); + maxZ = std::max(maxZ,action->getEndZ()); } boundingBox = new BoundingBox(m_x, m_y, m_z, m_x + maxX, m_y + maxY, m_z + maxZ); diff --git a/Minecraft.Client/Build/Common/GameRules/ConsoleSchematicFile.cpp b/Minecraft.Client/Build/Common/GameRules/ConsoleSchematicFile.cpp index b305bfc2a..fa0ff7fe4 100644 --- a/Minecraft.Client/Build/Common/GameRules/ConsoleSchematicFile.cpp +++ b/Minecraft.Client/Build/Common/GameRules/ConsoleSchematicFile.cpp @@ -153,7 +153,7 @@ void ConsoleSchematicFile::load(DataInputStream *dis) #ifdef _DEBUG //app.DebugPrintf(1,"Loaded entity type %d at (%f,%f,%f)\n",(int)type,x,y,z); #endif - m_entities.push_back( pair(Vec3::newPermanent(x,y,z),(CompoundTag *)eTag->copy())); + m_entities.push_back( std::pair(Vec3::newPermanent(x,y,z),(CompoundTag *)eTag->copy())); } } delete tag; @@ -186,15 +186,15 @@ void ConsoleSchematicFile::save_tags(DataOutputStream *dos) __int64 ConsoleSchematicFile::applyBlocksAndData(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot) { - int xStart = max(destinationBox->x0, (double)chunk->x*16); - int xEnd = min(destinationBox->x1, (double)((xStart>>4)<<4) + 16); + int xStart = std::max(destinationBox->x0, (double)chunk->x*16); + int xEnd = std::min(destinationBox->x1, (double)((xStart>>4)<<4) + 16); int yStart = destinationBox->y0; int yEnd = destinationBox->y1; if(yEnd > Level::maxBuildHeight) yEnd = Level::maxBuildHeight; - int zStart = max(destinationBox->z0, (double)chunk->z*16); - int zEnd = min(destinationBox->z1, (double)((zStart>>4)<<4) + 16); + int zStart = std::max(destinationBox->z0, (double)chunk->z*16); + int zEnd = std::min(destinationBox->z1, (double)((zStart>>4)<<4) + 16); #ifdef _DEBUG app.DebugPrintf("Range is (%d,%d,%d) to (%d,%d,%d)\n",xStart,yStart,zStart,xEnd-1,yEnd-1,zEnd-1); @@ -325,15 +325,15 @@ __int64 ConsoleSchematicFile::applyBlocksAndData(LevelChunk *chunk, AABB *chunkB // we can do the sort of lighting that might propagate out of the chunk. __int64 ConsoleSchematicFile::applyLighting(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot) { - int xStart = max(destinationBox->x0, (double)chunk->x*16); - int xEnd = min(destinationBox->x1, (double)((xStart>>4)<<4) + 16); + int xStart = std::max(destinationBox->x0, (double)chunk->x*16); + int xEnd = std::min(destinationBox->x1, (double)((xStart>>4)<<4) + 16); int yStart = destinationBox->y0; int yEnd = destinationBox->y1; if(yEnd > Level::maxBuildHeight) yEnd = Level::maxBuildHeight; - int zStart = max(destinationBox->z0, (double)chunk->z*16); - int zEnd = min(destinationBox->z1, (double)((zStart>>4)<<4) + 16); + int zStart = std::max(destinationBox->z0, (double)chunk->z*16); + int zEnd = std::min(destinationBox->z1, (double)((zStart>>4)<<4) + 16); int rowBlocksIncluded = (yEnd-yStart)*(zEnd-zStart); int blocksIncluded = (xEnd-xStart)*rowBlocksIncluded; @@ -778,12 +778,12 @@ void ConsoleSchematicFile::getBlocksAndData(LevelChunk *chunk, byteArray *data, if(y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) { lowerY0 = y0; - lowerY1 = min(y1, compressedHeight); + lowerY1 = std::min(y1, compressedHeight); bHasLower = true; } if(y1 >= Level::COMPRESSED_CHUNK_SECTION_HEIGHT) { - upperY0 = max(y0, compressedHeight) - Level::COMPRESSED_CHUNK_SECTION_HEIGHT; + upperY0 = std::max(y0, compressedHeight) - Level::COMPRESSED_CHUNK_SECTION_HEIGHT; upperY1 = y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT; bHasUpper = true; } @@ -900,12 +900,12 @@ void ConsoleSchematicFile::setBlocksAndData(LevelChunk *chunk, byteArray blockDa if(y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) { lowerY0 = y0; - lowerY1 = min(y1, compressedHeight); + lowerY1 = std::min(y1, compressedHeight); bHasLower = true; } if(y1 >= Level::COMPRESSED_CHUNK_SECTION_HEIGHT) { - upperY0 = max(y0, compressedHeight) - Level::COMPRESSED_CHUNK_SECTION_HEIGHT; + upperY0 = std::max(y0, compressedHeight) - Level::COMPRESSED_CHUNK_SECTION_HEIGHT; upperY1 = y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT; bHasUpper = true; } diff --git a/Minecraft.Client/Build/Common/GameRules/GameRuleDefinition.cpp b/Minecraft.Client/Build/Common/GameRules/GameRuleDefinition.cpp index 4a0a52360..9288fdacf 100644 --- a/Minecraft.Client/Build/Common/GameRules/GameRuleDefinition.cpp +++ b/Minecraft.Client/Build/Common/GameRules/GameRuleDefinition.cpp @@ -122,7 +122,7 @@ std::unordered_map *GameRuleDefinition::enumerateMap( int i = 0; std::vector *gRules = enumerate(); for (AUTO_VAR(it, gRules->begin()); it != gRules->end(); it++) - out->insert( pair( *it, i++ ) ); + out->insert( std::pair( *it, i++ ) ); return out; } diff --git a/Minecraft.Client/Build/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Build/Common/GameRules/LevelGenerationOptions.cpp index 376ca9676..31ceed6b7 100644 --- a/Minecraft.Client/Build/Common/GameRules/LevelGenerationOptions.cpp +++ b/Minecraft.Client/Build/Common/GameRules/LevelGenerationOptions.cpp @@ -432,7 +432,7 @@ bool LevelGenerationOptions::isFeatureChunk(int chunkX, int chunkZ, StructureFea std::unordered_map *LevelGenerationOptions::getUnfinishedSchematicFiles() { // Clean schematic rules. - unordered_set usedFiles = unordered_set(); + std::unordered_set usedFiles = std::unordered_set(); for (AUTO_VAR(it, m_schematicRules.begin()); it!=m_schematicRules.end(); it++) if ( !(*it)->isComplete() ) usedFiles.insert( (*it)->getSchematicName() ); @@ -441,7 +441,7 @@ std::unordered_map *LevelGenerationOptions std::unordered_map *out = new std::unordered_map(); for (AUTO_VAR(it, usedFiles.begin()); it!=usedFiles.end(); it++) - out->insert( pair(*it, getSchematicFile(*it)) ); + out->insert( std::pair(*it, getSchematicFile(*it)) ); return out; } diff --git a/Minecraft.Client/Build/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Build/Common/Leaderboards/LeaderboardManager.cpp index 5422d8e90..e500ad156 100644 --- a/Minecraft.Client/Build/Common/Leaderboards/LeaderboardManager.cpp +++ b/Minecraft.Client/Build/Common/Leaderboards/LeaderboardManager.cpp @@ -85,7 +85,7 @@ void LeaderboardManager::printStats(ReadView &view) { ReadScore score = view.m_queries[i]; - app.DebugPrintf( "\tname='%s'\n", std::wstringtofilename(std::wstring(score.m_name)) ); + app.DebugPrintf( "\tname='%s'\n", wstringtofilename(std::wstring(score.m_name)) ); app.DebugPrintf( "\trank='%i'\n", score.m_rank ); app.DebugPrintf( "\tstatsData=[" ); diff --git a/Minecraft.Client/Build/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Build/Common/Network/PlatformNetworkManagerStub.cpp index 3082fd774..df7f32531 100644 --- a/Minecraft.Client/Build/Common/Network/PlatformNetworkManagerStub.cpp +++ b/Minecraft.Client/Build/Common/Network/PlatformNetworkManagerStub.cpp @@ -340,7 +340,7 @@ void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData(INetworkPlayer *pN // m_hostGameSessionData.players[i] = ((NetworkPlayerXbox *)pNetworkPlayer)->GetUID(); // // char *temp; -// temp = (char *)std::wstringtofilename( pNetworkPlayer->GetOnlineName() ); +// temp = (char *)wstringtofilename( pNetworkPlayer->GetOnlineName() ); // memcpy(m_hostGameSessionData.szPlayers[i],temp,XUSER_NAME_SIZE); // } // else diff --git a/Minecraft.Client/Build/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Build/Common/Tutorial/Tutorial.cpp index 5eb53da7d..d6e529a95 100644 --- a/Minecraft.Client/Build/Common/Tutorial/Tutorial.cpp +++ b/Minecraft.Client/Build/Common/Tutorial/Tutorial.cpp @@ -1380,7 +1380,7 @@ void Tutorial::tick() while(itCon != constraintsToRemove[m_CurrentState].end() ) { constraints[e_Tutorial_State_Gameplay].push_back(itCon->first); - constraintsToRemove[e_Tutorial_State_Gameplay].push_back( pair(itCon->first, itCon->second) ); + constraintsToRemove[e_Tutorial_State_Gameplay].push_back( std::pair(itCon->first, itCon->second) ); constraints[m_CurrentState].erase( find( constraints[m_CurrentState].begin(), constraints[m_CurrentState].end(), itCon->first) ); itCon = constraintsToRemove[m_CurrentState].erase(itCon); @@ -2024,7 +2024,7 @@ void Tutorial::RemoveConstraint(TutorialConstraint *c, bool delayedRemove /*= fa else if(delayedRemove) { c->setQueuedForRemoval(true); - constraintsToRemove[m_CurrentState].push_back( pair(c, 0) ); + constraintsToRemove[m_CurrentState].push_back( std::pair(c, 0) ); } else { diff --git a/Minecraft.Client/Build/Common/Tutorial/Tutorial.h b/Minecraft.Client/Build/Common/Tutorial/Tutorial.h index 539d7c116..3f06df12f 100644 --- a/Minecraft.Client/Build/Common/Tutorial/Tutorial.h +++ b/Minecraft.Client/Build/Common/Tutorial/Tutorial.h @@ -81,7 +81,7 @@ protected: std::unordered_map messages; std::vector m_globalConstraints; std::vector constraints[e_Tutorial_State_Max]; - std::vector< pair > constraintsToRemove[e_Tutorial_State_Max]; + std::vector< std::pair > constraintsToRemove[e_Tutorial_State_Max]; std::vector tasks; // We store a copy of the tasks for the main gameplay tutorial so that we could display an overview menu std::vector activeTasks[e_Tutorial_State_Max]; std::vector hints[e_Tutorial_State_Max]; diff --git a/Minecraft.Client/Build/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Build/Common/UI/IUIScene_AbstractContainerMenu.cpp index 990fad03e..1faba8d2c 100644 --- a/Minecraft.Client/Build/Common/UI/IUIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Build/Common/UI/IUIScene_AbstractContainerMenu.cpp @@ -1586,7 +1586,7 @@ int IUIScene_AbstractContainerMenu::GetEmptyStackSpace(Slot *slot) if ( item->isStackable() ) { int iCount = item->GetCount(); - int iMaxStackSize = min(item->getMaxStackSize(), slot->getMaxStackSize() ); + int iMaxStackSize = std::min(item->getMaxStackSize(), slot->getMaxStackSize() ); iResult = iMaxStackSize - iCount; diff --git a/Minecraft.Client/Build/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Build/Common/UI/IUIScene_PauseMenu.cpp index 5d9607469..ff4c53e45 100644 --- a/Minecraft.Client/Build/Common/UI/IUIScene_PauseMenu.cpp +++ b/Minecraft.Client/Build/Common/UI/IUIScene_PauseMenu.cpp @@ -224,7 +224,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4 // retrieve the store name for the skin pack DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack(); - const char *pchPackName=std::wstringtofilename(pDLCPack->getName()); + const char *pchPackName=wstringtofilename(pDLCPack->getName()); app.DebugPrintf("Texture Pack - %s\n",pchPackName); SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName); diff --git a/Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.cpp index 69a0e2960..6db5cb6ea 100644 --- a/Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.cpp +++ b/Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.cpp @@ -188,8 +188,8 @@ void IUIScene_TradingMenu::updateDisplay() MerchantRecipe *recipe = *it; if(!recipe->isDeprecated()) { - m_activeOffers.push_back( pair(recipe,unfilteredIndex)); - firstValidTrade = min(firstValidTrade,unfilteredIndex); + m_activeOffers.push_back( std::pair(recipe,unfilteredIndex)); + firstValidTrade = std::min(firstValidTrade,unfilteredIndex); } ++unfilteredIndex; } diff --git a/Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.h b/Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.h index 509faced2..db342b071 100644 --- a/Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.h +++ b/Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.h @@ -8,7 +8,7 @@ class IUIScene_TradingMenu protected: MerchantMenu *m_menu; std::shared_ptr m_merchant; - std::vector< pair > m_activeOffers; + std::vector< std::pair > m_activeOffers; int m_validOffersCount; int m_selectedSlot; diff --git a/Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp b/Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp index c6b791b8e..4b29016a0 100644 --- a/Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp +++ b/Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp @@ -19,7 +19,7 @@ UIAbstractBitmapFont::~UIAbstractBitmapFont() } -UIAbstractBitmapFont::UIAbstractBitmapFont(const string &fontname) +UIAbstractBitmapFont::UIAbstractBitmapFont(const std::string &fontname) { m_fontname = fontname; @@ -272,7 +272,7 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte struct DebugData { - string name; + std::string name; long scale; long mul; diff --git a/Minecraft.Client/Build/Common/UI/UIBitmapFont.h b/Minecraft.Client/Build/Common/UI/UIBitmapFont.h index 3eefc962a..5d4e266e9 100644 --- a/Minecraft.Client/Build/Common/UI/UIBitmapFont.h +++ b/Minecraft.Client/Build/Common/UI/UIBitmapFont.h @@ -18,7 +18,7 @@ class CFontData; class UIAbstractBitmapFont { protected: - string m_fontname; + std::string m_fontname; IggyBitmapFontProvider *m_bitmapFontProvider; @@ -27,7 +27,7 @@ protected: unsigned int m_numGlyphs; public: - UIAbstractBitmapFont(const string &fontname); + UIAbstractBitmapFont(const std::string &fontname); ~UIAbstractBitmapFont(); void registerFont(); diff --git a/Minecraft.Client/Build/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Build/Common/UI/UIComponent_Chat.cpp index d84fb3662..e1f1f1a81 100644 --- a/Minecraft.Client/Build/Common/UI/UIComponent_Chat.cpp +++ b/Minecraft.Client/Build/Common/UI/UIComponent_Chat.cpp @@ -49,7 +49,7 @@ void UIComponent_Chat::handleTimerComplete(int id) if(pMinecraft->localplayers[m_iPad]!= NULL) { Gui *pGui = pMinecraft->gui; - //DWORD messagesToDisplay = min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) ); + //DWORD messagesToDisplay = std::min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) ); for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i ) { float opacity = pGui->getOpacity(m_iPad, i); diff --git a/Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.cpp b/Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.cpp index 2227dd82d..35ffb8434 100644 --- a/Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.cpp +++ b/Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.cpp @@ -28,7 +28,7 @@ void UIComponent_DebugUIConsole::tick() } } -void UIComponent_DebugUIConsole::addText(const string &text) +void UIComponent_DebugUIConsole::addText(const std::string &text) { if(!text.empty() && text.compare("\n") != 0) { diff --git a/Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.h b/Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.h index e018c7024..31b21db2c 100644 --- a/Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.h +++ b/Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.h @@ -20,7 +20,7 @@ private: UI_MAP_ELEMENT( m_labels[9], "consoleLine10") UI_END_MAP_ELEMENTS_AND_NAMES() - deque m_textList; + std::deque m_textList; bool m_bTextChanged; @@ -45,5 +45,5 @@ public: // Returns true if lower scenes in this scenes layer, or in any layer below this scenes layers should be hidden virtual bool hidesLowerScenes() { return false; } - void addText(const string &text); + void addText(const std::string &text); }; \ No newline at end of file diff --git a/Minecraft.Client/Build/Common/UI/UIControl.cpp b/Minecraft.Client/Build/Common/UI/UIControl.cpp index 743117842..19d5b011c 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl.cpp @@ -14,7 +14,7 @@ UIControl::UIControl() m_eControlType = eNoControl; } -bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { m_parentScene = scene; m_controlName = controlName; diff --git a/Minecraft.Client/Build/Common/UI/UIControl.h b/Minecraft.Client/Build/Common/UI/UIControl.h index b9e26f0c5..c55521530 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl.h +++ b/Minecraft.Client/Build/Common/UI/UIControl.h @@ -47,7 +47,7 @@ public: protected: IggyValuePath m_iggyPath; UIScene *m_parentScene; - string m_controlName; + std::string m_controlName; IggyName m_nameXPos, m_nameYPos, m_nameWidth, m_nameHeight; IggyName m_funcSetAlpha, m_nameVisible; @@ -59,7 +59,7 @@ protected: public: UIControl(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); #ifdef __PSVITA__ void UpdateControl(); void setHidden(bool bHidden) {m_bHidden=bHidden;} @@ -68,7 +68,7 @@ public: IggyValuePath *getIggyValuePath(); - string getControlName() { return m_controlName; } + std::string getControlName() { return m_controlName; } virtual void tick() {} virtual void ReInit(); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Base.cpp b/Minecraft.Client/Build/Common/UI/UIControl_Base.cpp index 70c8ff440..6bb1d9f41 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Base.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_Base.cpp @@ -11,7 +11,7 @@ UIControl_Base::UIControl_Base() m_id = 0; } -bool UIControl_Base::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_Base::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { bool success = UIControl::setupControl(scene,parent,controlName); @@ -67,7 +67,7 @@ void UIControl_Base::setLabel(const std::wstring &label, bool instant, bool forc } } -void UIControl_Base::setLabel(const string &label) +void UIControl_Base::setLabel(const std::string &label) { std::wstring wlabel = convStringToWstring(label); setLabel(wlabel); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Base.h b/Minecraft.Client/Build/Common/UI/UIControl_Base.h index f71f11b17..0ed506ae7 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Base.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_Base.h @@ -16,12 +16,12 @@ protected: public: UIControl_Base(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); virtual void tick(); virtual void setLabel(const std::wstring &label, bool instant = false, bool force = false); - virtual void setLabel(const string &label); + virtual void setLabel(const std::string &label); const wchar_t* getLabel(); virtual void setAllPossibleLabels(int labelCount, wchar_t labels[][256]); int getId() { return m_id; } diff --git a/Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.cpp b/Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.cpp index 04ca4207d..ae3c3a189 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIControl_BitmapIcon.h" -bool UIControl_BitmapIcon::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_BitmapIcon::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eBitmapIcon); bool success = UIControl::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.h b/Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.h index a06b51e06..6de7d6c30 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.h @@ -8,7 +8,7 @@ private: IggyName m_funcSetTextureName; public: - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void setTextureName(const std::wstring &iconName); }; \ No newline at end of file diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Button.cpp b/Minecraft.Client/Build/Common/UI/UIControl_Button.cpp index 0fbf1dcd5..7ba833abb 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Button.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_Button.cpp @@ -6,7 +6,7 @@ UIControl_Button::UIControl_Button() { } -bool UIControl_Button::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_Button::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eButton); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Button.h b/Minecraft.Client/Build/Common/UI/UIControl_Button.h index 49d2f41d3..4dde5983a 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Button.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_Button.h @@ -10,7 +10,7 @@ private: public: UIControl_Button(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(const std::wstring &label, int id); virtual void ReInit(); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_ButtonList.cpp b/Minecraft.Client/Build/Common/UI/UIControl_ButtonList.cpp index 5148e27a6..875d12365 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_ButtonList.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_ButtonList.cpp @@ -8,7 +8,7 @@ UIControl_ButtonList::UIControl_ButtonList() m_iCurrentSelection = 0; } -bool UIControl_ButtonList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_ButtonList::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eButtonList); bool success = UIControl_Base::setupControl(scene,parent,controlName); @@ -65,7 +65,7 @@ void UIControl_ButtonList::clearList() m_itemCount = 0; } -void UIControl_ButtonList::addItem(const string &label) +void UIControl_ButtonList::addItem(const std::string &label) { addItem(label, m_itemCount); } @@ -75,7 +75,7 @@ void UIControl_ButtonList::addItem(const std::wstring &label) addItem(label, m_itemCount); } -void UIControl_ButtonList::addItem(const string &label, int data) +void UIControl_ButtonList::addItem(const std::string &label, int data) { IggyDataValue result; IggyDataValue value[2]; diff --git a/Minecraft.Client/Build/Common/UI/UIControl_ButtonList.h b/Minecraft.Client/Build/Common/UI/UIControl_ButtonList.h index 19e1cbd72..cee0199f3 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_ButtonList.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_ButtonList.h @@ -13,7 +13,7 @@ protected: public: UIControl_ButtonList(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(int id); virtual void ReInit(); @@ -21,10 +21,10 @@ public: void clearList(); void addItem(const std::wstring &label); - void addItem(const string &label); + void addItem(const std::string &label); void addItem(const std::wstring &label, int data); - void addItem(const string &label, int data); + void addItem(const std::string &label, int data); void removeItem(int index); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_CheckBox.cpp b/Minecraft.Client/Build/Common/UI/UIControl_CheckBox.cpp index ec1a32404..8fd0398ed 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_CheckBox.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_CheckBox.cpp @@ -6,7 +6,7 @@ UIControl_CheckBox::UIControl_CheckBox() { } -bool UIControl_CheckBox::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_CheckBox::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eCheckBox); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_CheckBox.h b/Minecraft.Client/Build/Common/UI/UIControl_CheckBox.h index 91d0ffd58..83f0d9db6 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_CheckBox.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_CheckBox.h @@ -12,7 +12,7 @@ private: public: UIControl_CheckBox(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(const std::wstring &label, int id, bool checked); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Cursor.cpp b/Minecraft.Client/Build/Common/UI/UIControl_Cursor.cpp index b824fd4b9..2c8bb1af8 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Cursor.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_Cursor.cpp @@ -6,7 +6,7 @@ UIControl_Cursor::UIControl_Cursor() { } -bool UIControl_Cursor::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_Cursor::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eCursor); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Cursor.h b/Minecraft.Client/Build/Common/UI/UIControl_Cursor.h index cc7705d47..e165c919d 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Cursor.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_Cursor.h @@ -7,5 +7,5 @@ class UIControl_Cursor : public UIControl_Base public: UIControl_Cursor(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); }; \ No newline at end of file diff --git a/Minecraft.Client/Build/Common/UI/UIControl_DLCList.cpp b/Minecraft.Client/Build/Common/UI/UIControl_DLCList.cpp index 1c33d5b1e..253f18e27 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_DLCList.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_DLCList.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIControl_DLCList.h" -bool UIControl_DLCList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_DLCList::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eDLCList); bool success = UIControl_ButtonList::setupControl(scene,parent,controlName); @@ -13,7 +13,7 @@ bool UIControl_DLCList::setupControl(UIScene *scene, IggyValuePath *parent, cons return success; } -void UIControl_DLCList::addItem(const string &label, bool showTick, int iId) +void UIControl_DLCList::addItem(const std::string &label, bool showTick, int iId) { IggyDataValue result; IggyDataValue value[3]; diff --git a/Minecraft.Client/Build/Common/UI/UIControl_DLCList.h b/Minecraft.Client/Build/Common/UI/UIControl_DLCList.h index 6bb0d41aa..e0afaec2d 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_DLCList.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_DLCList.h @@ -8,10 +8,10 @@ private: IggyName m_funcShowTick; public: - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); using UIControl_ButtonList::addItem; - void addItem(const string &label, bool showTick, int iId); + void addItem(const std::string &label, bool showTick, int iId); void addItem(const std::wstring &label, bool showTick, int iId); void showTick(int iId, bool showTick); }; diff --git a/Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.cpp b/Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.cpp index 858247a86..023f776f9 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.cpp @@ -6,7 +6,7 @@ UIControl_DynamicLabel::UIControl_DynamicLabel() { } -bool UIControl_DynamicLabel::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_DynamicLabel::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eDynamicLabel); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.h b/Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.h index 3434ea957..dc34e945a 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.h @@ -10,7 +10,7 @@ private: public: UIControl_DynamicLabel(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); virtual void addText(const std::wstring &text, bool bLastEntry); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.cpp index a9d07af66..021fa59c6 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.cpp @@ -23,7 +23,7 @@ UIControl_EnchantmentButton::UIControl_EnchantmentButton() m_textDisabledColour = app.GetHTMLColour(eTextColor_EnchantDisabled); } -bool UIControl_EnchantmentButton::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_EnchantmentButton::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eEnchantmentButton); bool success = UIControl_Button::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.h b/Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.h index 8ccff4526..9e6f40167 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.h @@ -41,7 +41,7 @@ private: public: UIControl_EnchantmentButton(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); virtual void tick(); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.cpp b/Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.cpp index 78081462b..fb2dda142 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.cpp @@ -6,7 +6,7 @@ UIControl_HTMLLabel::UIControl_HTMLLabel() { } -bool UIControl_HTMLLabel::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_HTMLLabel::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eHTMLLabel); bool success = UIControl_Base::setupControl(scene,parent,controlName); @@ -33,7 +33,7 @@ void UIControl_HTMLLabel::ReInit() init(L""); } -void UIControl_HTMLLabel::setLabel(const string &label) +void UIControl_HTMLLabel::setLabel(const std::string &label) { IggyDataValue result; IggyDataValue value[1]; diff --git a/Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.h b/Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.h index 17e7cfb40..61e59e95f 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.h @@ -10,13 +10,13 @@ private: public: UIControl_HTMLLabel(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void startAutoScroll(); virtual void ReInit(); using UIControl_Base::setLabel; - void setLabel(const string &label); + void setLabel(const std::string &label); virtual void SetupTouch(); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Label.cpp b/Minecraft.Client/Build/Common/UI/UIControl_Label.cpp index 472918b6e..3dbaa041f 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Label.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_Label.cpp @@ -7,7 +7,7 @@ UIControl_Label::UIControl_Label() { } -bool UIControl_Label::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_Label::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eLabel); bool success = UIControl_Base::setupControl(scene,parent,controlName); @@ -32,7 +32,7 @@ void UIControl_Label::init(const std::wstring &label) IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_initFunc , 1 , value ); } -void UIControl_Label::init(const string &label) +void UIControl_Label::init(const std::string &label) { m_label = convStringToWstring(label); IggyDataValue result; diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Label.h b/Minecraft.Client/Build/Common/UI/UIControl_Label.h index 34e28c182..d95b3c48d 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Label.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_Label.h @@ -7,9 +7,9 @@ class UIControl_Label : public UIControl_Base public: UIControl_Label(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(const std::wstring &label); - void init(const string &label); + void init(const std::string &label); virtual void ReInit(); }; \ No newline at end of file diff --git a/Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.cpp b/Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.cpp index fd0c33963..4ca314f95 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.cpp @@ -6,7 +6,7 @@ UIControl_LeaderboardList::UIControl_LeaderboardList() { } -bool UIControl_LeaderboardList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_LeaderboardList::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eLeaderboardList); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.h b/Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.h index f74378451..63597d28f 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.h @@ -32,7 +32,7 @@ public: }; UIControl_LeaderboardList(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(int id); virtual void ReInit(); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_PlayerList.cpp b/Minecraft.Client/Build/Common/UI/UIControl_PlayerList.cpp index 4af008729..bf92af647 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_PlayerList.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_PlayerList.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIControl_PlayerList.h" -bool UIControl_PlayerList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_PlayerList::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::ePlayerList); bool success = UIControl_ButtonList::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_PlayerList.h b/Minecraft.Client/Build/Common/UI/UIControl_PlayerList.h index ce31ef21d..2da9433c1 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_PlayerList.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_PlayerList.h @@ -8,7 +8,7 @@ private: IggyName m_funcSetPlayerIcon, m_funcSetVOIPIcon; public: - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); using UIControl_ButtonList::addItem; void addItem(const std::wstring &label, int iPlayerIcon, int iVOIPIcon); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Progress.cpp b/Minecraft.Client/Build/Common/UI/UIControl_Progress.cpp index 1c9aa640e..074ef381b 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Progress.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_Progress.cpp @@ -11,7 +11,7 @@ UIControl_Progress::UIControl_Progress() m_showingBar = true; } -bool UIControl_Progress::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_Progress::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eProgress); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Progress.h b/Minecraft.Client/Build/Common/UI/UIControl_Progress.h index 9ef40b55a..48c681454 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Progress.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_Progress.h @@ -15,7 +15,7 @@ private: public: UIControl_Progress(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(const std::wstring &label, int id, int min, int max, int current); virtual void ReInit(); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_SaveList.cpp b/Minecraft.Client/Build/Common/UI/UIControl_SaveList.cpp index 0a7394f7d..7e9ff5e39 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_SaveList.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_SaveList.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIControl_SaveList.h" -bool UIControl_SaveList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_SaveList::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eSaveList); bool success = UIControl_ButtonList::setupControl(scene,parent,controlName); @@ -18,7 +18,7 @@ void UIControl_SaveList::addItem(const std::wstring &label) addItem(label, L""); } -void UIControl_SaveList::addItem(const string &label) +void UIControl_SaveList::addItem(const std::string &label) { addItem(label, L""); } @@ -28,12 +28,12 @@ void UIControl_SaveList::addItem(const std::wstring &label, int data) addItem(label, L"", data); } -void UIControl_SaveList::addItem(const string &label, int data) +void UIControl_SaveList::addItem(const std::string &label, int data) { addItem(label, L"", data); } -void UIControl_SaveList::addItem(const string &label, const std::wstring &iconName) +void UIControl_SaveList::addItem(const std::string &label, const std::wstring &iconName) { addItem(label, iconName, m_itemCount); ++m_itemCount; @@ -45,7 +45,7 @@ void UIControl_SaveList::addItem(const std::wstring &label, const std::wstring & ++m_itemCount; } -void UIControl_SaveList::addItem(const string &label, const std::wstring &iconName, int data) +void UIControl_SaveList::addItem(const std::string &label, const std::wstring &iconName, int data) { IggyDataValue result; IggyDataValue value[3]; diff --git a/Minecraft.Client/Build/Common/UI/UIControl_SaveList.h b/Minecraft.Client/Build/Common/UI/UIControl_SaveList.h index 4eab1a303..53bfbc6ff 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_SaveList.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_SaveList.h @@ -8,22 +8,22 @@ private: IggyName m_funcSetTextureName; public: - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); using UIControl_ButtonList::addItem; void addItem(const std::wstring &label); - void addItem(const string &label); + void addItem(const std::string &label); void addItem(const std::wstring &label, int data); - void addItem(const string &label, int data); + void addItem(const std::string &label, int data); - void addItem(const string &label, const std::wstring &iconName); + void addItem(const std::string &label, const std::wstring &iconName); void addItem(const std::wstring &label, const std::wstring &iconName); void setTextureName(int iId, const std::wstring &iconName); private: - void addItem(const string &label, const std::wstring &iconName, int data); + void addItem(const std::string &label, const std::wstring &iconName, int data); void addItem(const std::wstring &label, const std::wstring &iconName, int data); }; \ No newline at end of file diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Slider.cpp b/Minecraft.Client/Build/Common/UI/UIControl_Slider.cpp index 5d09a452d..6624987f0 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Slider.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_Slider.cpp @@ -10,7 +10,7 @@ UIControl_Slider::UIControl_Slider() m_current = 0; } -bool UIControl_Slider::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_Slider::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eSlider); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Slider.h b/Minecraft.Client/Build/Common/UI/UIControl_Slider.h index 57f426fff..5429b65e2 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Slider.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_Slider.h @@ -19,7 +19,7 @@ private: public: UIControl_Slider(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(const std::wstring &label, int id, int min, int max, int current); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_SlotList.cpp b/Minecraft.Client/Build/Common/UI/UIControl_SlotList.cpp index f3cab73a2..268dbd511 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_SlotList.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_SlotList.cpp @@ -7,7 +7,7 @@ UIControl_SlotList::UIControl_SlotList() m_lastHighlighted = -1; } -bool UIControl_SlotList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_SlotList::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eSlotList); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_SlotList.h b/Minecraft.Client/Build/Common/UI/UIControl_SlotList.h index ee741c4de..82b5b4acd 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_SlotList.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_SlotList.h @@ -13,7 +13,7 @@ private: public: UIControl_SlotList(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void addSlot(int id); void addSlots(int iStartValue, int iCount); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.cpp b/Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.cpp index 709197669..ae629157f 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.cpp @@ -11,7 +11,7 @@ UIControl_SpaceIndicatorBar::UIControl_SpaceIndicatorBar() m_currentOffset = 0.0f; } -bool UIControl_SpaceIndicatorBar::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_SpaceIndicatorBar::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eProgress); bool success = UIControl_Base::setupControl(scene,parent,controlName); @@ -65,7 +65,7 @@ void UIControl_SpaceIndicatorBar::addSave(__int64 size) { float startPercent = (float)((m_currentTotal-m_min))/(m_max-m_min); - m_sizeAndOffsets.push_back( pair<__int64, float>(size, startPercent) ); + m_sizeAndOffsets.push_back( std::pair<__int64, float>(size, startPercent) ); m_currentTotal += size; setTotalSize(m_currentTotal); @@ -75,7 +75,7 @@ void UIControl_SpaceIndicatorBar::selectSave(int index) { if(index >= 0 && index < m_sizeAndOffsets.size()) { - pair<__int64,float> values = m_sizeAndOffsets[index]; + std::pair<__int64,float> values = m_sizeAndOffsets[index]; setSaveSize(values.first); setSaveGameOffset(values.second); } diff --git a/Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.h b/Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.h index d3a3edbd9..ac0da22d7 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.h @@ -11,12 +11,12 @@ private: __int64 m_currentSave, m_currentTotal; float m_currentOffset; - std::vector > m_sizeAndOffsets; + std::vector > m_sizeAndOffsets; public: UIControl_SpaceIndicatorBar(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(const std::wstring &label, int id, __int64 min, __int64 max); virtual void ReInit(); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_TextInput.cpp b/Minecraft.Client/Build/Common/UI/UIControl_TextInput.cpp index b61f2fe7e..c635a588c 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_TextInput.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_TextInput.cpp @@ -7,7 +7,7 @@ UIControl_TextInput::UIControl_TextInput() m_bHasFocus = false; } -bool UIControl_TextInput::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_TextInput::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eTextInput); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_TextInput.h b/Minecraft.Client/Build/Common/UI/UIControl_TextInput.h index b33c120f9..642841f01 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_TextInput.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_TextInput.h @@ -11,7 +11,7 @@ private: public: UIControl_TextInput(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(const std::wstring &label, int id); void ReInit(); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.cpp b/Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.cpp index 794c29291..0944c850f 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.cpp @@ -6,7 +6,7 @@ UIControl_TexturePackList::UIControl_TexturePackList() { } -bool UIControl_TexturePackList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_TexturePackList::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eTexturePackList); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.h b/Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.h index e6281e353..69b4b826a 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.h @@ -11,7 +11,7 @@ private: public: UIControl_TexturePackList(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(const std::wstring &label, int id); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Touch.cpp b/Minecraft.Client/Build/Common/UI/UIControl_Touch.cpp index 3abdea101..a3336364f 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Touch.cpp +++ b/Minecraft.Client/Build/Common/UI/UIControl_Touch.cpp @@ -6,7 +6,7 @@ UIControl_Touch::UIControl_Touch() { } -bool UIControl_Touch::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName) +bool UIControl_Touch::setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName) { UIControl::setControlType(UIControl::eTouchControl); bool success = UIControl_Base::setupControl(scene,parent,controlName); diff --git a/Minecraft.Client/Build/Common/UI/UIControl_Touch.h b/Minecraft.Client/Build/Common/UI/UIControl_Touch.h index 8ae799a02..3e77c6cad 100644 --- a/Minecraft.Client/Build/Common/UI/UIControl_Touch.h +++ b/Minecraft.Client/Build/Common/UI/UIControl_Touch.h @@ -9,7 +9,7 @@ private: public: UIControl_Touch(); - virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName); + virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const std::string &controlName); void init(int id); virtual void ReInit(); diff --git a/Minecraft.Client/Build/Common/UI/UIController.cpp b/Minecraft.Client/Build/Common/UI/UIController.cpp index ecd54ccf7..9d2a1f872 100644 --- a/Minecraft.Client/Build/Common/UI/UIController.cpp +++ b/Minecraft.Client/Build/Common/UI/UIController.cpp @@ -1252,10 +1252,10 @@ void UIController::setupCustomDrawMatrices(UIScene *scene, CustomDrawData *custo top = m_tileOriginY + (sceneHeight - customDrawRegion->mat[(1*4)+3]*sceneHeight)/2; bottom = top + (sceneHeight * -customDrawRegion->mat[(1*4) + 1])/2 * customDrawRegion->y1; - m_customRenderingClearRect.left = min(m_customRenderingClearRect.left, left); - m_customRenderingClearRect.right = max(m_customRenderingClearRect.right, right);; - m_customRenderingClearRect.top = min(m_customRenderingClearRect.top, top); - m_customRenderingClearRect.bottom = max(m_customRenderingClearRect.bottom, bottom); + m_customRenderingClearRect.left = std::min(m_customRenderingClearRect.left, left); + m_customRenderingClearRect.right = std::max(m_customRenderingClearRect.right, right);; + m_customRenderingClearRect.top = std::min(m_customRenderingClearRect.top, top); + m_customRenderingClearRect.bottom = std::max(m_customRenderingClearRect.bottom, bottom); if(!m_bScreenWidthSetup) { @@ -2385,7 +2385,7 @@ void UIController::ShowUIDebugMarketingGuide(bool show) #endif } -void UIController::logDebugString(const string &text) +void UIController::logDebugString(const std::string &text) { if(m_uiDebugConsole) m_uiDebugConsole->addText(text); } diff --git a/Minecraft.Client/Build/Common/UI/UIController.h b/Minecraft.Client/Build/Common/UI/UIController.h index 8b9128cf4..4ba7eaefd 100644 --- a/Minecraft.Client/Build/Common/UI/UIController.h +++ b/Minecraft.Client/Build/Common/UI/UIController.h @@ -358,7 +358,7 @@ public: virtual void ShowUIDebugConsole(bool show); virtual void ShowUIDebugMarketingGuide(bool show); - void logDebugString(const string &text); + void logDebugString(const std::string &text); UIScene* FindScene(EUIScene sceneType); public: diff --git a/Minecraft.Client/Build/Common/UI/UIFontData.cpp b/Minecraft.Client/Build/Common/UI/UIFontData.cpp index 24fc7c4f0..b3fb63bdb 100644 --- a/Minecraft.Client/Build/Common/UI/UIFontData.cpp +++ b/Minecraft.Client/Build/Common/UI/UIFontData.cpp @@ -260,7 +260,7 @@ CFontData::CFontData(SFontData &sFontData, int *pbRawImage) getPos(i, row, col); - string state = "ok"; + std::string state = "ok"; if (i != getGlyphId(unicode)) { state = "MISSMATCHED!"; @@ -279,7 +279,7 @@ void CFontData::release() delete [] m_pbRawImage; } -const string CFontData::getFontName() +const std::string CFontData::getFontName() { return m_sFontData->m_strFontName; } diff --git a/Minecraft.Client/Build/Common/UI/UIFontData.h b/Minecraft.Client/Build/Common/UI/UIFontData.h index 16194e66e..312750e59 100644 --- a/Minecraft.Client/Build/Common/UI/UIFontData.h +++ b/Minecraft.Client/Build/Common/UI/UIFontData.h @@ -17,7 +17,7 @@ public: public: // Font name. - string m_strFontName; + std::string m_strFontName; // Filename of the glyph archive. std::wstring m_wstrFilename; @@ -96,7 +96,7 @@ protected: public: // Accessor for the font name in the internal SFontData. - const string getFontName(); + const std::string getFontName(); // Accessor for the hardcoded internal font data. SFontData *getFontData(); diff --git a/Minecraft.Client/Build/Common/UI/UILayer.cpp b/Minecraft.Client/Build/Common/UI/UILayer.cpp index a56932dcf..71735c73b 100644 --- a/Minecraft.Client/Build/Common/UI/UILayer.cpp +++ b/Minecraft.Client/Build/Common/UI/UILayer.cpp @@ -513,45 +513,45 @@ UIScene *UILayer::addComponent(int iPad, EUIScene scene, void *initData) { case eUIComponent_Panorama: newScene = new UIComponent_Panorama(iPad, initData, this); - m_componentRefCount[scene] = pair(1,true); + m_componentRefCount[scene] = std::pair(1,true); break; case eUIComponent_DebugUIConsole: newScene = new UIComponent_DebugUIConsole(iPad, initData, this); - m_componentRefCount[scene] = pair(1,true); + m_componentRefCount[scene] = std::pair(1,true); break; case eUIComponent_DebugUIMarketingGuide: newScene = new UIComponent_DebugUIMarketingGuide(iPad, initData, this); - m_componentRefCount[scene] = pair(1,true); + m_componentRefCount[scene] = std::pair(1,true); break; case eUIComponent_Logo: newScene = new UIComponent_Logo(iPad, initData, this); - m_componentRefCount[scene] = pair(1,true); + m_componentRefCount[scene] = std::pair(1,true); break; case eUIComponent_Tooltips: newScene = new UIComponent_Tooltips(iPad, initData, this); - m_componentRefCount[scene] = pair(1,true); + m_componentRefCount[scene] = std::pair(1,true); break; case eUIComponent_TutorialPopup: newScene = new UIComponent_TutorialPopup(iPad, initData, this); // Start hidden - m_componentRefCount[scene] = pair(1,false); + m_componentRefCount[scene] = std::pair(1,false); break; case eUIScene_HUD: newScene = new UIScene_HUD(iPad, initData, this); // Start hidden - m_componentRefCount[scene] = pair(1,false); + m_componentRefCount[scene] = std::pair(1,false); break; case eUIComponent_Chat: newScene = new UIComponent_Chat(iPad, initData, this); - m_componentRefCount[scene] = pair(1,true); + m_componentRefCount[scene] = std::pair(1,true); break; case eUIComponent_PressStartToPlay: newScene = new UIComponent_PressStartToPlay(iPad, initData, this); - m_componentRefCount[scene] = pair(1,true); + m_componentRefCount[scene] = std::pair(1,true); break; case eUIComponent_MenuBackground: newScene = new UIComponent_MenuBackground(iPad, initData, this); - m_componentRefCount[scene] = pair(1,true); + m_componentRefCount[scene] = std::pair(1,true); break; }; diff --git a/Minecraft.Client/Build/Common/UI/UILayer.h b/Minecraft.Client/Build/Common/UI/UILayer.h index 13b3b9890..dbe77e093 100644 --- a/Minecraft.Client/Build/Common/UI/UILayer.h +++ b/Minecraft.Client/Build/Common/UI/UILayer.h @@ -16,7 +16,7 @@ private: #ifdef __ORBIS__ std::unordered_map,std::hash> m_componentRefCount; #else - std::unordered_map > m_componentRefCount; + std::unordered_map > m_componentRefCount; #endif public: diff --git a/Minecraft.Client/Build/Common/UI/UIScene.cpp b/Minecraft.Client/Build/Common/UI/UIScene.cpp index 0bf88b93f..c6ffe8a51 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene.cpp @@ -518,7 +518,7 @@ void UIScene::removeControl( UIControl_Base *control, bool centreScene) IggyDataValue result; IggyDataValue value[2]; - string name = control->getControlName(); + std::string name = control->getControlName(); IggyStringUTF8 stringVal; stringVal.string = (char*)name.c_str(); stringVal.length = name.length(); diff --git a/Minecraft.Client/Build/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Build/Common/UI/UIScene_DLCMainMenu.cpp index cee003b53..b7fbe8543 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_DLCMainMenu.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene_DLCMainMenu.cpp @@ -212,7 +212,7 @@ void UIScene_DLCMainMenu::tick() // add a button in with the subcategory category = (SonyCommerce::CategoryInfoSub)(*iter); - string teststring=category.categoryName; + std::string teststring=category.categoryName; m_buttonListOffers.addItem(teststring,i); iter++; diff --git a/Minecraft.Client/Build/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Build/Common/UI/UIScene_DLCOffersMenu.cpp index e65100d46..5a96a7428 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_DLCOffersMenu.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene_DLCOffersMenu.cpp @@ -227,7 +227,7 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId) // buy the DLC std::vector::iterator it = m_pvProductInfo->begin(); - string teststring; + std::string teststring; for(int i=0;i::iterator it = m_pvProductInfo->begin(); - string teststring; + std::string teststring; for(int i=0;i::iterator it = m_pvProductInfo->begin(); - string teststring; + std::string teststring; bool bFirstItemSet=false; for(int i=0;i::iterator it = m_pvProductInfo->begin(); - string teststring; + std::string teststring; for(int i=0;im_vIconRetrieval; + std::vector m_vIconRetrieval; bool m_bSelectionChanged; #endif diff --git a/Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.cpp b/Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.cpp index c89816a0e..bf12ba485 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.cpp @@ -59,7 +59,7 @@ UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *pa for(unsigned int level = ench->getMinLevel(); level <= ench->getMaxLevel(); ++level) { - m_enchantmentIdAndLevels.push_back(pair(ench->id,level)); + m_enchantmentIdAndLevels.push_back(std::pair(ench->id,level)); m_buttonListEnchantments.addItem(app.GetString( ench->getDescriptionId() ) + _toString(level) ); } } diff --git a/Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.h b/Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.h index 3fcacaac0..76fff24b2 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.h +++ b/Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.h @@ -24,7 +24,7 @@ private: std::vector m_itemIds; std::vector m_mobFactories; - std::vector< pair > m_enchantmentIdAndLevels; + std::vector< std::pair > m_enchantmentIdAndLevels; public: UIScene_DebugOverlay(int iPad, void *initData, UILayer *parentLayer); diff --git a/Minecraft.Client/Build/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Build/Common/UI/UIScene_EndPoem.cpp index 2f6d23704..973c83acc 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_EndPoem.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene_EndPoem.cpp @@ -63,7 +63,7 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) Random random(8124371); int found=(int)noNoiseString.find(L"{*NOISE*}"); int length; - while (found!=string::npos) + while (found!=std::string::npos) { length = random.nextInt(4) + 3; m_noiseLengths.push_back(length); @@ -211,7 +211,7 @@ void UIScene_EndPoem::updateNoise() AUTO_VAR(it, m_noiseLengths.begin()); int found=(int)noiseString.find(tag); - while (found!=string::npos && it != m_noiseLengths.end() ) + while (found!=std::string::npos && it != m_noiseLengths.end() ) { length = *it; ++it; diff --git a/Minecraft.Client/Build/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Build/Common/UI/UIScene_HUD.cpp index 613dca534..4191fdf2e 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_HUD.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene_HUD.cpp @@ -342,7 +342,7 @@ void UIScene_HUD::SetActiveSlot(int slot) void UIScene_HUD::SetHealth(int iHealth, int iLastHealth, bool bBlink, bool bPoison) { - int maxHealth = max(iHealth, iLastHealth); + int maxHealth = std::max(iHealth, iLastHealth); if(maxHealth != m_lastMaxHealth || bBlink != m_lastHealthBlink || bPoison != m_lastHealthPoison) { m_lastMaxHealth = maxHealth; @@ -656,7 +656,7 @@ void UIScene_HUD::handleTimerComplete(int id) if(pMinecraft->localplayers[m_iPad]!= NULL) { Gui *pGui = pMinecraft->gui; - //DWORD messagesToDisplay = min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) ); + //DWORD messagesToDisplay = std::min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) ); for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i ) { float opacity = pGui->getOpacity(m_iPad, i); diff --git a/Minecraft.Client/Build/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Build/Common/UI/UIScene_JoinMenu.cpp index 4deab9944..b6331cccf 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_JoinMenu.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene_JoinMenu.cpp @@ -72,7 +72,7 @@ void UIScene_JoinMenu::tick() else #endif { - string playerName(m_selectedSession->data.players[i].getOnlineID()); + std::string playerName(m_selectedSession->data.players[i].getOnlineID()); #ifndef __PSVITA__ // Append guest number (any players in an online game not signed into PSN are guests) diff --git a/Minecraft.Client/Build/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Build/Common/UI/UIScene_LeaderboardsMenu.cpp index d831e3668..5180eb95c 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_LeaderboardsMenu.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene_LeaderboardsMenu.cpp @@ -437,7 +437,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex) else { m_newEntryIndex = (unsigned int)startIndex; - // m_newReadSize = min((int)READ_SIZE, (int)m_leaderboard.m_totalEntryCount-(startIndex-1)); + // m_newReadSize = std::min((int)READ_SIZE, (int)m_leaderboard.m_totalEntryCount-(startIndex-1)); } //app.DebugPrintf("Requesting stats read %d - %d - %d\n", m_currentLeaderboard, startIndex == -1 ? m_currentFilter : LeaderboardManager::eFM_TopRank, m_currentDifficulty); diff --git a/Minecraft.Client/Build/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Build/Common/UI/UIScene_PauseMenu.cpp index eb97a43fc..ddd17416a 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_PauseMenu.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene_PauseMenu.cpp @@ -1198,7 +1198,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J // retrieve the store name for the skin pack DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack(); - const char *pchPackName=std::wstringtofilename(pDLCPack->getName()); + const char *pchPackName=wstringtofilename(pDLCPack->getName()); app.DebugPrintf("Texture Pack - %s\n",pchPackName); SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName); @@ -1277,7 +1277,7 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void *pParam,bool bContinue // retrieve the store name for the skin pack DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack(); - const char *pchPackName=std::wstringtofilename(pDLCPack->getName()); + const char *pchPackName=wstringtofilename(pDLCPack->getName()); app.DebugPrintf("Texture Pack - %s\n",pchPackName); SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName); diff --git a/Minecraft.Client/Build/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Build/Common/UI/UIScene_SkinSelectMenu.cpp index 7f0692888..626eddde9 100644 --- a/Minecraft.Client/Build/Common/UI/UIScene_SkinSelectMenu.cpp +++ b/Minecraft.Client/Build/Common/UI/UIScene_SkinSelectMenu.cpp @@ -1665,7 +1665,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage: // retrieve the store name for the skin pack std::wstring wStrPackName=pScene->m_currentPack->getName(); - const char *pchPackName=std::wstringtofilename(wStrPackName); + const char *pchPackName=wstringtofilename(wStrPackName); SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName); if (pSONYDLCInfo != NULL) diff --git a/Minecraft.Client/Build/Common/UI/UITTFFont.cpp b/Minecraft.Client/Build/Common/UI/UITTFFont.cpp index f20714aed..b00099117 100644 --- a/Minecraft.Client/Build/Common/UI/UITTFFont.cpp +++ b/Minecraft.Client/Build/Common/UI/UITTFFont.cpp @@ -4,7 +4,7 @@ #include "../../../../Minecraft.World/IO/Files/File.h" #include "UITTFFont.h" -UITTFFont::UITTFFont(const string &path, S32 fallbackCharacter) +UITTFFont::UITTFFont(const std::string &path, S32 fallbackCharacter) { app.DebugPrintf("UITTFFont opening %s\n",path.c_str()); diff --git a/Minecraft.Client/Build/Common/UI/UITTFFont.h b/Minecraft.Client/Build/Common/UI/UITTFFont.h index 0de7c4e05..e489e1e69 100644 --- a/Minecraft.Client/Build/Common/UI/UITTFFont.h +++ b/Minecraft.Client/Build/Common/UI/UITTFFont.h @@ -7,6 +7,6 @@ private: //DWORD dwDataSize; public: - UITTFFont(const string &path, S32 fallbackCharacter); + UITTFFont(const std::string &path, S32 fallbackCharacter); ~UITTFFont(); }; diff --git a/Minecraft.Client/Build/Common/XUI/XUI_Chat.cpp b/Minecraft.Client/Build/Common/XUI/XUI_Chat.cpp index c3651a58f..3360c3c87 100644 --- a/Minecraft.Client/Build/Common/XUI/XUI_Chat.cpp +++ b/Minecraft.Client/Build/Common/XUI/XUI_Chat.cpp @@ -21,7 +21,7 @@ HRESULT CScene_Chat::OnTimer( XUIMessageTimer *pXUIMessageTimer, BOOL &bHandled) Minecraft *pMinecraft = Minecraft::GetInstance(); Gui *pGui = pMinecraft->gui; - //DWORD messagesToDisplay = min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) ); + //DWORD messagesToDisplay = std::min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) ); for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i ) { float opacity = pGui->getOpacity(m_iPad, i); diff --git a/Minecraft.Client/Build/Common/XUI/XUI_Ctrl_4JEdit.cpp b/Minecraft.Client/Build/Common/XUI/XUI_Ctrl_4JEdit.cpp index d4dd3bf06..32ecdfc0c 100644 --- a/Minecraft.Client/Build/Common/XUI/XUI_Ctrl_4JEdit.cpp +++ b/Minecraft.Client/Build/Common/XUI/XUI_Ctrl_4JEdit.cpp @@ -11,7 +11,7 @@ HRESULT CXuiCtrl4JEdit::OnInit(XUIMessageInit* pInitData, BOOL& rfHandled) m_uTextLimit=XUI_4JEDIT_MAX_CHARS-1; XuiEditSetTextLimit(m_hObj,m_uTextLimit); // Find the text limit. (Add one for NULL terminator) - //m_uTextLimit = min( XuiEditGetTextLimit(m_hObj) + 1, XUI_4JEDIT_MAX_CHARS); + //m_uTextLimit = std::min( XuiEditGetTextLimit(m_hObj) + 1, XUI_4JEDIT_MAX_CHARS); ZeroMemory( wchText , sizeof(WCHAR)*(m_uTextLimit+1) ); @@ -146,7 +146,7 @@ HRESULT CXuiCtrl4JEdit::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled) if( pThis->m_bReadOnly ) return hr; // Find the text limit. (Add one for NULL terminator) - //m_uTextLimit = min( XuiEditGetTextLimit(m_hObj) + 1, XUI_4JEDIT_MAX_CHARS); + //m_uTextLimit = std::min( XuiEditGetTextLimit(m_hObj) + 1, XUI_4JEDIT_MAX_CHARS); if((((pInputData->dwKeyCode == VK_PAD_A) && (pInputData->wch == 0)) || (pInputData->dwKeyCode == VK_PAD_START)) && !(pInputData->dwFlags & XUI_INPUT_FLAG_REPEAT)) { diff --git a/Minecraft.Client/Build/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp b/Minecraft.Client/Build/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp index e3e752567..68a12b1c9 100644 --- a/Minecraft.Client/Build/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp +++ b/Minecraft.Client/Build/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp @@ -378,7 +378,7 @@ int CXuiCtrlSlotItemCtrlBase::GetEmptyStackSpace( HXUIOBJ hObj ) if ( bStackable ) { iCount = pUserDataContainer->slot->getItem()->GetCount(); - iMaxStackSize = min(pUserDataContainer->slot->getItem()->getMaxStackSize(), pUserDataContainer->slot->getMaxStackSize() ); + iMaxStackSize = std::min(pUserDataContainer->slot->getItem()->getMaxStackSize(), pUserDataContainer->slot->getMaxStackSize() ); iResult = iMaxStackSize - iCount; diff --git a/Minecraft.Client/Build/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Build/Common/XUI/XUI_Leaderboards.cpp index cf48a57bd..cd402d898 100644 --- a/Minecraft.Client/Build/Common/XUI/XUI_Leaderboards.cpp +++ b/Minecraft.Client/Build/Common/XUI/XUI_Leaderboards.cpp @@ -548,7 +548,7 @@ void CScene_Leaderboards::ReadStats(int startIndex) else { m_newEntryIndex = (unsigned int)startIndex; - m_newReadSize = min((int)READ_SIZE, (int)m_leaderboard.m_totalEntryCount-(startIndex-1)); + m_newReadSize = std::min((int)READ_SIZE, (int)m_leaderboard.m_totalEntryCount-(startIndex-1)); } //Setup the spec structure for the read request @@ -741,7 +741,7 @@ bool CScene_Leaderboards::RetrieveStats() insertPosition = 0; //Entry count is either max possible entries or current entry count + read size, whichever is smaller - m_leaderboard.m_currentEntryCount = min((int)NUM_ENTRIES, (int)(m_leaderboard.m_currentEntryCount+m_newReadSize)); + m_leaderboard.m_currentEntryCount = std::min((int)NUM_ENTRIES, (int)(m_leaderboard.m_currentEntryCount+m_newReadSize)); } //If the last new entry is at a greater position than the last possible entry else if( m_newEntryIndex+m_newReadSize-1 >= m_leaderboard.m_entryStartIndex+NUM_ENTRIES ) diff --git a/Minecraft.Client/Build/Common/XUI/XUI_MainMenu.cpp b/Minecraft.Client/Build/Common/XUI/XUI_MainMenu.cpp index 237ce9945..5982f74cd 100644 --- a/Minecraft.Client/Build/Common/XUI/XUI_MainMenu.cpp +++ b/Minecraft.Client/Build/Common/XUI/XUI_MainMenu.cpp @@ -374,7 +374,7 @@ HRESULT CScene_Main::OnTransitionStart( XUIMessageTransition *pTransition, BOOL& float diff = fWidth / (xuiRect.right+5); - diff = min(diff,MAIN_MENU_MAX_TEXT_SCALE); + diff = std::min(diff,MAIN_MENU_MAX_TEXT_SCALE); // Resize XuiElementGetBounds(m_Subtitle,&fWidth, &fHeight); diff --git a/Minecraft.Client/Build/Common/XUI/XUI_MultiGameJoinLoad.cpp b/Minecraft.Client/Build/Common/XUI/XUI_MultiGameJoinLoad.cpp index 8fe6966e1..db51dbe22 100644 --- a/Minecraft.Client/Build/Common/XUI/XUI_MultiGameJoinLoad.cpp +++ b/Minecraft.Client/Build/Common/XUI/XUI_MultiGameJoinLoad.cpp @@ -2190,7 +2190,7 @@ void CScene_MultiGameJoinLoad::UploadFile(CScene_MultiGameJoinLoad *pClass, char { File targetFileDir(L"GAME:\\FakeTMSPP"); if(!targetFileDir.exists()) targetFileDir.mkdir(); - string path = string( std::wstringtofilename( targetFileDir.getPath() ) ).append("\\").append(filename); + std::string path = string( wstringtofilename( targetFileDir.getPath() ) ).append("\\").append(filename); HANDLE hSaveFile = CreateFile( path.c_str(), GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, NULL); DWORD numberOfBytesWritten = 0; diff --git a/Minecraft.Client/GameState/StatsCounter.cpp b/Minecraft.Client/GameState/StatsCounter.cpp index ac4d5d07a..47eddcbd9 100644 --- a/Minecraft.Client/GameState/StatsCounter.cpp +++ b/Minecraft.Client/GameState/StatsCounter.cpp @@ -43,7 +43,7 @@ void StatsCounter::award(Stat* stat, unsigned int difficulty, unsigned int count { StatContainer newVal; newVal.stats[difficulty] = count; - stats.insert( make_pair(stat, newVal) ); + stats.insert( std::make_pair(stat, newVal) ); } else { @@ -163,7 +163,7 @@ void StatsCounter::parse(void* data) newVal.stats[1] = statData[1]; newVal.stats[2] = statData[2]; newVal.stats[3] = statData[3]; - stats.insert( make_pair(*iter, newVal) ); + stats.insert( std::make_pair(*iter, newVal) ); } statData += 4; } @@ -176,7 +176,7 @@ void StatsCounter::parse(void* data) newVal.stats[1] = largeStatData[1]; newVal.stats[2] = largeStatData[2]; newVal.stats[3] = largeStatData[3]; - stats.insert( make_pair(*iter, newVal) ); + stats.insert( std::make_pair(*iter, newVal) ); } largeStatData += 4; statData = (unsigned short*)largeStatData; @@ -190,7 +190,7 @@ void StatsCounter::parse(void* data) newVal.stats[1] = 0; newVal.stats[2] = 0; newVal.stats[3] = 0; - stats.insert( make_pair(*iter, newVal) ); + stats.insert( std::make_pair(*iter, newVal) ); } ++statData; } @@ -1239,34 +1239,34 @@ void StatsCounter::writeStats() void StatsCounter::setupStatBoards() { #ifndef _DURANGO - statBoards.insert( make_pair(Stats::killsZombie, LEADERBOARD_KILLS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::killsSkeleton, LEADERBOARD_KILLS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::killsCreeper, LEADERBOARD_KILLS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::killsSpider, LEADERBOARD_KILLS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::killsSpiderJockey, LEADERBOARD_KILLS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::killsZombiePigman, LEADERBOARD_KILLS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::killsNetherZombiePigman, LEADERBOARD_KILLS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::killsSlime, LEADERBOARD_KILLS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::killsZombie, LEADERBOARD_KILLS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::killsSkeleton, LEADERBOARD_KILLS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::killsCreeper, LEADERBOARD_KILLS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::killsSpider, LEADERBOARD_KILLS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::killsSpiderJockey, LEADERBOARD_KILLS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::killsZombiePigman, LEADERBOARD_KILLS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::killsNetherZombiePigman, LEADERBOARD_KILLS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::killsSlime, LEADERBOARD_KILLS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::dirt->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::stoneBrick->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::sand->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::rock->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::gravel->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::clay->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::obsidian->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::dirt->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::stoneBrick->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::sand->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::rock->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::gravel->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::clay->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::obsidian->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) ); - statBoards.insert( make_pair(Stats::itemsCollected[Item::egg->id], LEADERBOARD_FARMING_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::crops_Id], LEADERBOARD_FARMING_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::mushroom1_Id], LEADERBOARD_FARMING_PEACEFUL) ); - statBoards.insert( make_pair(Stats::blocksMined[Tile::reeds_Id], LEADERBOARD_FARMING_PEACEFUL) ); - statBoards.insert( make_pair(Stats::cowsMilked, LEADERBOARD_FARMING_PEACEFUL) ); - statBoards.insert( make_pair(Stats::itemsCollected[Tile::pumpkin->id], LEADERBOARD_FARMING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::itemsCollected[Item::egg->id], LEADERBOARD_FARMING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::crops_Id], LEADERBOARD_FARMING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::mushroom1_Id], LEADERBOARD_FARMING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::blocksMined[Tile::reeds_Id], LEADERBOARD_FARMING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::cowsMilked, LEADERBOARD_FARMING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::itemsCollected[Tile::pumpkin->id], LEADERBOARD_FARMING_PEACEFUL) ); - statBoards.insert( make_pair(Stats::walkOneM, LEADERBOARD_TRAVELLING_PEACEFUL) ); - statBoards.insert( make_pair(Stats::fallOneM, LEADERBOARD_TRAVELLING_PEACEFUL) ); - statBoards.insert( make_pair(Stats::minecartOneM, LEADERBOARD_TRAVELLING_PEACEFUL) ); - statBoards.insert( make_pair(Stats::boatOneM, LEADERBOARD_TRAVELLING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::walkOneM, LEADERBOARD_TRAVELLING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::fallOneM, LEADERBOARD_TRAVELLING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::minecartOneM, LEADERBOARD_TRAVELLING_PEACEFUL) ); + statBoards.insert( std::make_pair(Stats::boatOneM, LEADERBOARD_TRAVELLING_PEACEFUL) ); #endif } diff --git a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp index 5e0a8dfbd..c3fc72b63 100644 --- a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp +++ b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp @@ -24,7 +24,7 @@ StatParam::StatParam(const std::wstring &base) unsigned int count=0; std::wstring::size_type pos =base.find(L"*"); - while(pos!=string::npos) + while(pos!=std::string::npos) { count++; pos=base.find(L"*",pos+1); diff --git a/Minecraft.Client/Platform/Durango/Network/DQRNetworkManager.h b/Minecraft.Client/Platform/Durango/Network/DQRNetworkManager.h index 0f9ddc45f..86043d046 100644 --- a/Minecraft.Client/Platform/Durango/Network/DQRNetworkManager.h +++ b/Minecraft.Client/Platform/Durango/Network/DQRNetworkManager.h @@ -404,7 +404,7 @@ private: unsigned int m_hostSessionAddress; // For client CRITICAL_SECTION m_csHostGamertagResolveResults; - queue m_hostGamertagResolveResults; + std::queue m_hostGamertagResolveResults; void AddPlayerFailed(Platform::String ^xuid); Platform::String^ RemoveBracesFromGuidString(__in Platform::String^ guid ); diff --git a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h index 4d682d463..be5b326a4 100644 --- a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h +++ b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h @@ -38,7 +38,7 @@ private: bool getScoreByRange(); bool setScore(); - queue m_views; + std::queue m_views; CRITICAL_SECTION m_csViewsLock; diff --git a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h index 737a9d9c7..61e98ecc7 100644 --- a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h +++ b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h @@ -43,7 +43,7 @@ private: bool getScoreByRange(); bool setScore(); - queue m_views; + std::queue m_views; CRITICAL_SECTION m_csViewsLock; diff --git a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h index 34029b0ec..a5f011027 100644 --- a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h +++ b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h @@ -39,7 +39,7 @@ private: bool getScoreByRange(); bool setScore(); - queue m_views; + std::queue m_views; CRITICAL_SECTION m_csViewsLock; diff --git a/Minecraft.Client/Player/LocalPlayer.cpp b/Minecraft.Client/Player/LocalPlayer.cpp index 2a32923d9..b2cc5e648 100644 --- a/Minecraft.Client/Player/LocalPlayer.cpp +++ b/Minecraft.Client/Player/LocalPlayer.cpp @@ -1159,7 +1159,7 @@ void LocalPlayer::mapPlayerChunk(const unsigned int flagTileType) int pZ = ((int) floor(this->z)) %16; int pX = ((int) floor(this->x)) %16; - cout<<"player in chunk ("<x<<","<y<<","<z<<")\n"; for (int v = -1; v < 2; v++) @@ -1170,19 +1170,19 @@ void LocalPlayer::mapPlayerChunk(const unsigned int flagTileType) { LevelChunk *cc = level->getChunk(cx+u, cz+v); if ( x==pX && z==pZ && u==0 && v==0) - cout << "O"; + std::cout << "O"; else for (unsigned int y = 127; y > 0; y--) { int t = cc->getTile(x,y,z); - if (flagTileType != 0 && t == flagTileType) { cout << "@"; break; } - else if (t != 0 && t < 10) { cout << t; break; } - else if (t > 0) { cout << "#"; break; } + if (flagTileType != 0 && t == flagTileType) { std::cout << "@"; break; } + else if (t != 0 && t < 10) { std::cout << t; break; } + else if (t > 0) { std::cout << "#"; break; } } } - cout << "\n"; + std::cout << "\n"; } - cout << "\n"; + std::cout << "\n"; } diff --git a/Minecraft.Client/Rendering/Models/ModelPart.h b/Minecraft.Client/Rendering/Models/ModelPart.h index fbc90c7cd..822ed1025 100644 --- a/Minecraft.Client/Rendering/Models/ModelPart.h +++ b/Minecraft.Client/Rendering/Models/ModelPart.h @@ -17,8 +17,8 @@ public: bool bMirror; bool visible; bool neverRender; - vector cubes; - vector children; + std::vector cubes; + std::vector children; static const float RAD; private: diff --git a/Minecraft.Client/Textures/Stitching/Stitcher.h b/Minecraft.Client/Textures/Stitching/Stitcher.h index 985bf866c..7ade956a8 100644 --- a/Minecraft.Client/Textures/Stitching/Stitcher.h +++ b/Minecraft.Client/Textures/Stitching/Stitcher.h @@ -16,7 +16,7 @@ public: static const int MIN_TEXEL = 1 << MAX_MIPLEVEL; private: - set texturesToBeStitched; // = new HashSet(256); + std::set texturesToBeStitched; // = new HashSet(256); std::vector storage; // = new ArrayList(256); int storageX; int storageY; diff --git a/Minecraft.World/IO/Files/File.cpp b/Minecraft.World/IO/Files/File.cpp index d5808b86a..48a8d675e 100644 --- a/Minecraft.World/IO/Files/File.cpp +++ b/Minecraft.World/IO/Files/File.cpp @@ -37,8 +37,8 @@ File::File( const std::wstring& pathname ) //: parent( NULL ) m_abstractPathName = pathname; #ifdef _WINDOWS64 - string path = wstringtofilename(m_abstractPathName); - string finalPath = StorageManager.GetMountedPath(path.c_str()); + std::string path = wstringtofilename(m_abstractPathName); + std::string finalPath = StorageManager.GetMountedPath(path.c_str()); if(finalPath.size() == 0) finalPath = path; m_abstractPathName = convStringToWstring(finalPath); #elif defined(_DURANGO) diff --git a/Minecraft.World/Level/CustomLevelSource.cpp b/Minecraft.World/Level/CustomLevelSource.cpp index 2cad14dbe..c742930e9 100644 --- a/Minecraft.World/Level/CustomLevelSource.cpp +++ b/Minecraft.World/Level/CustomLevelSource.cpp @@ -24,9 +24,9 @@ CustomLevelSource::CustomLevelSource(Level *level, __int64 seed, bool generateSt #else #ifdef _WINDOWS64 - string path = "GameRules\\heightmap.bin"; + std::string path = "GameRules\\heightmap.bin"; #else - string path = "GAME:\\GameRules\\heightmap.bin"; + std::string path = "GAME:\\GameRules\\heightmap.bin"; #endif #endif HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -66,9 +66,9 @@ CustomLevelSource::CustomLevelSource(Level *level, __int64 seed, bool generateSt #else #ifdef _WINDOWS64 - string waterHeightPath = "GameRules\\waterheight.bin"; + std::string waterHeightPath = "GameRules\\waterheight.bin"; #else - string waterHeightPath = "GAME:\\GameRules\\waterheight.bin"; + std::string waterHeightPath = "GAME:\\GameRules\\waterheight.bin"; #endif #endif file = CreateFile(waterHeightPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); diff --git a/Minecraft.World/Network/Connection.h b/Minecraft.World/Network/Connection.h index 0ddfa9c95..49d98eaf7 100644 --- a/Minecraft.World/Network/Connection.h +++ b/Minecraft.World/Network/Connection.h @@ -52,10 +52,10 @@ private: bool running; - queue > incoming; // 4J - was using synchronizedList... + std::queue > incoming; // 4J - was using synchronizedList... CRITICAL_SECTION incoming_cs; // ... now has this critical section - queue > outgoing; // 4J - was using synchronizedList - but don't think it is required as usage is wrapped in writeLock critical section - queue > outgoing_slow; // 4J - was using synchronizedList - but don't think it is required as usage is wrapped in writeLock critical section + std::queue > outgoing; // 4J - was using synchronizedList - but don't think it is required as usage is wrapped in writeLock critical section + std::queue > outgoing_slow; // 4J - was using synchronizedList - but don't think it is required as usage is wrapped in writeLock critical section PacketListener *packetListener; diff --git a/Minecraft.World/Recipes/ArmorRecipes.cpp b/Minecraft.World/Recipes/ArmorRecipes.cpp index 6d837a7c0..25610b077 100644 --- a/Minecraft.World/Recipes/ArmorRecipes.cpp +++ b/Minecraft.World/Recipes/ArmorRecipes.cpp @@ -40,7 +40,7 @@ ArmorRecipes::map[5] = void ArmorRecipes::_init() { - map = new vector [MAX_ARMOUR_RECIPES]; + map = new std::vector [MAX_ARMOUR_RECIPES]; // 4J-PB - removing the chain armour, since we show all possible recipes in the xbox game, and it's not one you can make ADD_OBJECT(map[0],Item::leather); diff --git a/Minecraft.World/Recipes/OreRecipes.cpp b/Minecraft.World/Recipes/OreRecipes.cpp index b204e8819..b462a0f86 100644 --- a/Minecraft.World/Recipes/OreRecipes.cpp +++ b/Minecraft.World/Recipes/OreRecipes.cpp @@ -30,7 +30,7 @@ void OreRecipies::_init() { - map = new vector [MAX_ORE_RECIPES]; + map = new std::vector [MAX_ORE_RECIPES]; ADD_OBJECT(map[0],Tile::goldBlock); ADD_OBJECT(map[0],new ItemInstance(Item::goldIngot, 9)); diff --git a/Minecraft.World/Recipes/Recipes.cpp b/Minecraft.World/Recipes/Recipes.cpp index 7c0fef842..0697b5ea4 100644 --- a/Minecraft.World/Recipes/Recipes.cpp +++ b/Minecraft.World/Recipes/Recipes.cpp @@ -1182,7 +1182,7 @@ std::shared_ptr Recipes::getItemFor(std::shared_ptr *Recipes::getRecipies() +std::vector *Recipes::getRecipies() { return recipies; } diff --git a/Minecraft.World/Recipes/ToolRecipes.cpp b/Minecraft.World/Recipes/ToolRecipes.cpp index d9a1b56e3..bf48ff976 100644 --- a/Minecraft.World/Recipes/ToolRecipes.cpp +++ b/Minecraft.World/Recipes/ToolRecipes.cpp @@ -42,7 +42,7 @@ std::wstring ToolRecipies::shapes[][4] = void ToolRecipies::_init() { - map = new vector [MAX_TOOL_RECIPES]; + map = new std::vector [MAX_TOOL_RECIPES]; ADD_OBJECT(map[0],Tile::wood); ADD_OBJECT(map[0],Tile::stoneBrick); diff --git a/Minecraft.World/Recipes/WeaponRecipes.cpp b/Minecraft.World/Recipes/WeaponRecipes.cpp index 32169a352..ac3b89e6b 100644 --- a/Minecraft.World/Recipes/WeaponRecipes.cpp +++ b/Minecraft.World/Recipes/WeaponRecipes.cpp @@ -23,7 +23,7 @@ std::wstring WeaponRecipies::shapes[][4] = void WeaponRecipies::_init() { - map = new vector [MAX_WEAPON_RECIPES]; + map = new std::vector [MAX_WEAPON_RECIPES]; ADD_OBJECT(map[0],Tile::wood); ADD_OBJECT(map[0],Tile::stoneBrick); diff --git a/Minecraft.World/Util/StringHelpers.cpp b/Minecraft.World/Util/StringHelpers.cpp index f91f8dac2..d469f1a5c 100644 --- a/Minecraft.World/Util/StringHelpers.cpp +++ b/Minecraft.World/Util/StringHelpers.cpp @@ -39,7 +39,7 @@ bool equalsIgnoreCase(const std::wstring& a, const std::wstring& b) return out; } -std::wstring convStringToWstring(const string& converting) +std::wstring convStringToWstring(const std::string& converting) { std::wstring converted(converting.length(), L' '); copy(converting.begin(), converting.end(), converted.begin()); diff --git a/Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp b/Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp index acfb4e7f3..f7a1456d2 100644 --- a/Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp +++ b/Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp @@ -14,9 +14,9 @@ BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); #else #ifdef _WINDOWS64 - string path = "GameRules\\biomemap.bin"; + std::string path = "GameRules\\biomemap.bin"; #else - string path = "GAME:\\GameRules\\biomemap.bin"; + std::string path = "GAME:\\GameRules\\biomemap.bin"; #endif HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); #endif