backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-19 13:02:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: unglob everything else and make it build

Browse source
This commit is contained in:
Tropical 2026-03-06 21:06:31 -06:00
parent 04ff82ba70
commit e0479e90b4
114 changed files with 237 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Build/Common/Audio/SoundEngine.cpp
View file

@ -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

4
Minecraft.Client/Build/Common/Consoles_App.cpp
View file

@ -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)
{

2
Minecraft.Client/Build/Common/Consoles_App.h
View file

@ -856,7 +856,7 @@ private:
bool m_bResetNether;
DWORD m_dwRequiredTexturePackID;
#ifdef _XBOX_ONE
vector <PBYTE> m_vTMSPPData;
std::vector <PBYTE> m_vTMSPPData;
#endif
#if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)

8
Minecraft.Client/Build/Common/DLC/DLCGameRulesHeader.cpp
View file

@ -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.

14
Minecraft.Client/Build/Common/DLC/DLCManager.cpp
View file

@ -10,14 +10,14 @@
#ifdef __linux__
#include <stdint.h>
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)

2
Minecraft.Client/Build/Common/GameRules/AddEnchantmentRuleDefinition.cpp
View file

@ -60,7 +60,7 @@ bool AddEnchantmentRuleDefinition::enchantItem(std::shared_ptr<ItemInstance> 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;
}

6
Minecraft.Client/Build/Common/GameRules/AddItemRuleDefinition.cpp
View file

@ -99,7 +99,7 @@ bool AddItemRuleDefinition::addItemToContainer(std::shared_ptr<Container> 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<ItemInstance> newItem = std::shared_ptr<ItemInstance>(new ItemInstance(m_itemId,quantity,m_auxValue) );
newItem->set4JData(m_dataTag);
@ -118,9 +118,9 @@ bool AddItemRuleDefinition::addItemToContainer(std::shared_ptr<Container> contai
container->setItem( slotId, newItem );
added = true;
}
else if(dynamic_pointer_cast<Inventory>(container) != NULL)
else if(std::dynamic_pointer_cast<Inventory>(container) != NULL)
{
added = dynamic_pointer_cast<Inventory>(container)->add(newItem);
added = std::dynamic_pointer_cast<Inventory>(container)->add(newItem);
}
}
return added;

4
Minecraft.Client/Build/Common/GameRules/ApplySchematicRuleDefinition.cpp
View file

@ -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);

6
Minecraft.Client/Build/Common/GameRules/ConsoleGenerateStructure.cpp
View file

@ -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);

26
Minecraft.Client/Build/Common/GameRules/ConsoleSchematicFile.cpp
View file

@ -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 *, CompoundTag *>(Vec3::newPermanent(x,y,z),(CompoundTag *)eTag->copy()));
m_entities.push_back( std::pair<Vec3 *, CompoundTag *>(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;
}

2
Minecraft.Client/Build/Common/GameRules/GameRuleDefinition.cpp
View file

@ -122,7 +122,7 @@ std::unordered_map<GameRuleDefinition *, int> *GameRuleDefinition::enumerateMap(
int i = 0;
std::vector<GameRuleDefinition *> *gRules = enumerate();
for (AUTO_VAR(it, gRules->begin()); it != gRules->end(); it++)
out->insert( pair<GameRuleDefinition *, int>( *it, i++ ) );
out->insert( std::pair<GameRuleDefinition *, int>( *it, i++ ) );
return out;
}

4
Minecraft.Client/Build/Common/GameRules/LevelGenerationOptions.cpp
View file

@ -432,7 +432,7 @@ bool LevelGenerationOptions::isFeatureChunk(int chunkX, int chunkZ, StructureFea
std::unordered_map<std::wstring, ConsoleSchematicFile *> *LevelGenerationOptions::getUnfinishedSchematicFiles()
{
// Clean schematic rules.
unordered_set<std::wstring> usedFiles = unordered_set<std::wstring>();
std::unordered_set<std::wstring> usedFiles = std::unordered_set<std::wstring>();
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<std::wstring, ConsoleSchematicFile *> *LevelGenerationOptions
std::unordered_map<std::wstring, ConsoleSchematicFile *> *out
= new std::unordered_map<std::wstring, ConsoleSchematicFile *>();
for (AUTO_VAR(it, usedFiles.begin()); it!=usedFiles.end(); it++)
out->insert( pair<std::wstring, ConsoleSchematicFile *>(*it, getSchematicFile(*it)) );
out->insert( std::pair<std::wstring, ConsoleSchematicFile *>(*it, getSchematicFile(*it)) );
return out;
}

2
Minecraft.Client/Build/Common/Leaderboards/LeaderboardManager.cpp
View file

@ -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=[" );

2
Minecraft.Client/Build/Common/Network/PlatformNetworkManagerStub.cpp
View file

@ -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

4
Minecraft.Client/Build/Common/Tutorial/Tutorial.cpp
View file

@ -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<TutorialConstraint *, unsigned char>(itCon->first, itCon->second) );
constraintsToRemove[e_Tutorial_State_Gameplay].push_back( std::pair<TutorialConstraint *, unsigned char>(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<TutorialConstraint *, unsigned char>(c, 0) );
constraintsToRemove[m_CurrentState].push_back( std::pair<TutorialConstraint *, unsigned char>(c, 0) );
}
else
{

2
Minecraft.Client/Build/Common/Tutorial/Tutorial.h
View file

@ -81,7 +81,7 @@ protected:
std::unordered_map<int, TutorialMessage *> messages;
std::vector<TutorialConstraint *> m_globalConstraints;
std::vector<TutorialConstraint *> constraints[e_Tutorial_State_Max];
std::vector< pair<TutorialConstraint *, unsigned char> > constraintsToRemove[e_Tutorial_State_Max];
std::vector< std::pair<TutorialConstraint *, unsigned char> > constraintsToRemove[e_Tutorial_State_Max];
std::vector<TutorialTask *> tasks; // We store a copy of the tasks for the main gameplay tutorial so that we could display an overview menu
std::vector<TutorialTask *> activeTasks[e_Tutorial_State_Max];
std::vector<TutorialHint *> hints[e_Tutorial_State_Max];

2
Minecraft.Client/Build/Common/UI/IUIScene_AbstractContainerMenu.cpp
View file

@ -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;

2
Minecraft.Client/Build/Common/UI/IUIScene_PauseMenu.cpp
View file

@ -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);

4
Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.cpp
View file

@ -188,8 +188,8 @@ void IUIScene_TradingMenu::updateDisplay()
MerchantRecipe *recipe = *it;
if(!recipe->isDeprecated())
{
m_activeOffers.push_back( pair<MerchantRecipe *,int>(recipe,unfilteredIndex));
firstValidTrade = min(firstValidTrade,unfilteredIndex);
m_activeOffers.push_back( std::pair<MerchantRecipe *,int>(recipe,unfilteredIndex));
firstValidTrade = std::min(firstValidTrade,unfilteredIndex);
}
++unfilteredIndex;
}

2
Minecraft.Client/Build/Common/UI/IUIScene_TradingMenu.h
View file

@ -8,7 +8,7 @@ class IUIScene_TradingMenu
protected:
MerchantMenu *m_menu;
std::shared_ptr<Merchant> m_merchant;
std::vector< pair<MerchantRecipe *,int> > m_activeOffers;
std::vector< std::pair<MerchantRecipe *,int> > m_activeOffers;
int m_validOffersCount;
int m_selectedSlot;

4
Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp
View file

@ -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;

4
Minecraft.Client/Build/Common/UI/UIBitmapFont.h
View file

@ -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();

2
Minecraft.Client/Build/Common/UI/UIComponent_Chat.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.cpp
View file

@ -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)
{

4
Minecraft.Client/Build/Common/UI/UIComponent_DebugUIConsole.h
View file

@ -20,7 +20,7 @@ private:
UI_MAP_ELEMENT( m_labels[9], "consoleLine10")
UI_END_MAP_ELEMENTS_AND_NAMES()
deque<string> m_textList;
std::deque<std::string> 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);
};

2
Minecraft.Client/Build/Common/UI/UIControl.cpp
View file

@ -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;

6
Minecraft.Client/Build/Common/UI/UIControl.h
View file

@ -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();

4
Minecraft.Client/Build/Common/UI/UIControl_Base.cpp
View file

@ -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);

4
Minecraft.Client/Build/Common/UI/UIControl_Base.h
View file

@ -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; }

2
Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_BitmapIcon.h
View file

@ -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);
};

2
Minecraft.Client/Build/Common/UI/UIControl_Button.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_Button.h
View file

@ -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();

6
Minecraft.Client/Build/Common/UI/UIControl_ButtonList.cpp
View file

@ -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];

6
Minecraft.Client/Build/Common/UI/UIControl_ButtonList.h
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_CheckBox.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_CheckBox.h
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_Cursor.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_Cursor.h
View file

@ -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);
};

4
Minecraft.Client/Build/Common/UI/UIControl_DLCList.cpp
View file

@ -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];

4
Minecraft.Client/Build/Common/UI/UIControl_DLCList.h
View file

@ -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);
};

2
Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_DynamicLabel.h
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_EnchantmentButton.h
View file

@ -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();

4
Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.cpp
View file

@ -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];

4
Minecraft.Client/Build/Common/UI/UIControl_HTMLLabel.h
View file

@ -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();

4
Minecraft.Client/Build/Common/UI/UIControl_Label.cpp
View file

@ -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;

4
Minecraft.Client/Build/Common/UI/UIControl_Label.h
View file

@ -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();
};

2
Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_LeaderboardList.h
View file

@ -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();

2
Minecraft.Client/Build/Common/UI/UIControl_PlayerList.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_PlayerList.h
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_Progress.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_Progress.h
View file

@ -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();

10
Minecraft.Client/Build/Common/UI/UIControl_SaveList.cpp
View file

@ -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];

10
Minecraft.Client/Build/Common/UI/UIControl_SaveList.h
View file

@ -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);
};

2
Minecraft.Client/Build/Common/UI/UIControl_Slider.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_Slider.h
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_SlotList.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_SlotList.h
View file

@ -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);

6
Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.cpp
View file

@ -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);
}

4
Minecraft.Client/Build/Common/UI/UIControl_SpaceIndicatorBar.h
View file

@ -11,12 +11,12 @@ private:
__int64 m_currentSave, m_currentTotal;
float m_currentOffset;
std::vector<pair<__int64,float> > m_sizeAndOffsets;
std::vector<std::pair<__int64,float> > 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();

2
Minecraft.Client/Build/Common/UI/UIControl_TextInput.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_TextInput.h
View file

@ -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();

2
Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_TexturePackList.h
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_Touch.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIControl_Touch.h
View file

@ -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();

10
Minecraft.Client/Build/Common/UI/UIController.cpp
View file

@ -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);
}

2
Minecraft.Client/Build/Common/UI/UIController.h
View file

@ -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:

4
Minecraft.Client/Build/Common/UI/UIFontData.cpp
View file

@ -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;
}

4
Minecraft.Client/Build/Common/UI/UIFontData.h
View file

@ -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();

20
Minecraft.Client/Build/Common/UI/UILayer.cpp
View file

@ -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<int,bool>(1,true);
m_componentRefCount[scene] = std::pair<int,bool>(1,true);
break;
case eUIComponent_DebugUIConsole:
newScene = new UIComponent_DebugUIConsole(iPad, initData, this);
m_componentRefCount[scene] = pair<int,bool>(1,true);
m_componentRefCount[scene] = std::pair<int,bool>(1,true);
break;
case eUIComponent_DebugUIMarketingGuide:
newScene = new UIComponent_DebugUIMarketingGuide(iPad, initData, this);
m_componentRefCount[scene] = pair<int,bool>(1,true);
m_componentRefCount[scene] = std::pair<int,bool>(1,true);
break;
case eUIComponent_Logo:
newScene = new UIComponent_Logo(iPad, initData, this);
m_componentRefCount[scene] = pair<int,bool>(1,true);
m_componentRefCount[scene] = std::pair<int,bool>(1,true);
break;
case eUIComponent_Tooltips:
newScene = new UIComponent_Tooltips(iPad, initData, this);
m_componentRefCount[scene] = pair<int,bool>(1,true);
m_componentRefCount[scene] = std::pair<int,bool>(1,true);
break;
case eUIComponent_TutorialPopup:
newScene = new UIComponent_TutorialPopup(iPad, initData, this);
// Start hidden
m_componentRefCount[scene] = pair<int,bool>(1,false);
m_componentRefCount[scene] = std::pair<int,bool>(1,false);
break;
case eUIScene_HUD:
newScene = new UIScene_HUD(iPad, initData, this);
// Start hidden
m_componentRefCount[scene] = pair<int,bool>(1,false);
m_componentRefCount[scene] = std::pair<int,bool>(1,false);
break;
case eUIComponent_Chat:
newScene = new UIComponent_Chat(iPad, initData, this);
m_componentRefCount[scene] = pair<int,bool>(1,true);
m_componentRefCount[scene] = std::pair<int,bool>(1,true);
break;
case eUIComponent_PressStartToPlay:
newScene = new UIComponent_PressStartToPlay(iPad, initData, this);
m_componentRefCount[scene] = pair<int,bool>(1,true);
m_componentRefCount[scene] = std::pair<int,bool>(1,true);
break;
case eUIComponent_MenuBackground:
newScene = new UIComponent_MenuBackground(iPad, initData, this);
m_componentRefCount[scene] = pair<int,bool>(1,true);
m_componentRefCount[scene] = std::pair<int,bool>(1,true);
break;
};

2
Minecraft.Client/Build/Common/UI/UILayer.h
View file

@ -16,7 +16,7 @@ private:
#ifdef __ORBIS__
std::unordered_map<EUIScene,std::pair<int,bool>,std::hash<int>> m_componentRefCount;
#else
std::unordered_map<EUIScene,pair<int,bool> > m_componentRefCount;
std::unordered_map<EUIScene,std::pair<int,bool> > m_componentRefCount;
#endif
public:

2
Minecraft.Client/Build/Common/UI/UIScene.cpp
View file

@ -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();

2
Minecraft.Client/Build/Common/UI/UIScene_DLCMainMenu.cpp
View file

@ -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++;

8
Minecraft.Client/Build/Common/UI/UIScene_DLCOffersMenu.cpp
View file

@ -227,7 +227,7 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId)
// buy the DLC
std::vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin();
string teststring;
std::string teststring;
for(int i=0;i<childId;i++)
{
it++;
@ -310,7 +310,7 @@ void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId)
{
m_bIsSelected = true;
std::vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin();
string teststring;
std::string teststring;
for(int i=0;i<childId;i++)
{
it++;
@ -361,7 +361,7 @@ void UIScene_DLCOffersMenu::tick()
}
std::vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin();
string teststring;
std::string teststring;
bool bFirstItemSet=false;
for(int i=0;i<m_iTotalDLC;i++)
{
@ -539,7 +539,7 @@ void UIScene_DLCOffersMenu::tick()
std::vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin();
string teststring;
std::string teststring;
for(int i=0;i<m_iCurrentDLC;i++)
{
it++;

2
Minecraft.Client/Build/Common/UI/UIScene_DLCOffersMenu.h
View file

@ -80,7 +80,7 @@ private:
}
SORTINDEXSTRUCT;
vector <std::wstring>m_vIconRetrieval;
std::vector <std::wstring>m_vIconRetrieval;
bool m_bSelectionChanged;
#endif

2
Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.cpp
View file

@ -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<int,int>(ench->id,level));
m_enchantmentIdAndLevels.push_back(std::pair<int,int>(ench->id,level));
m_buttonListEnchantments.addItem(app.GetString( ench->getDescriptionId() ) + _toString<int>(level) );
}
}

2
Minecraft.Client/Build/Common/UI/UIScene_DebugOverlay.h
View file

@ -24,7 +24,7 @@ private:
std::vector<int> m_itemIds;
std::vector<eINSTANCEOF> m_mobFactories;
std::vector< pair<int,int> > m_enchantmentIdAndLevels;
std::vector< std::pair<int,int> > m_enchantmentIdAndLevels;
public:
UIScene_DebugOverlay(int iPad, void *initData, UILayer *parentLayer);

4
Minecraft.Client/Build/Common/UI/UIScene_EndPoem.cpp
View file

@ -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;

4
Minecraft.Client/Build/Common/UI/UIScene_HUD.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIScene_JoinMenu.cpp
View file

@ -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)

2
Minecraft.Client/Build/Common/UI/UIScene_LeaderboardsMenu.cpp
View file

@ -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);

4
Minecraft.Client/Build/Common/UI/UIScene_PauseMenu.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/UI/UIScene_SkinSelectMenu.cpp
View file

@ -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)

2
Minecraft.Client/Build/Common/UI/UITTFFont.cpp
View file

@ -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());

2
Minecraft.Client/Build/Common/UI/UITTFFont.h
View file

@ -7,6 +7,6 @@ private:
//DWORD dwDataSize;
public:
UITTFFont(const string &path, S32 fallbackCharacter);
UITTFFont(const std::string &path, S32 fallbackCharacter);
~UITTFFont();
};

2
Minecraft.Client/Build/Common/XUI/XUI_Chat.cpp
View file

@ -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);

4
Minecraft.Client/Build/Common/XUI/XUI_Ctrl_4JEdit.cpp
View file

@ -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))
{

2
Minecraft.Client/Build/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
View file

@ -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;

4
Minecraft.Client/Build/Common/XUI/XUI_Leaderboards.cpp
View file

@ -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 )

2
Minecraft.Client/Build/Common/XUI/XUI_MainMenu.cpp
View file

@ -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);

2
Minecraft.Client/Build/Common/XUI/XUI_MultiGameJoinLoad.cpp
View file

@ -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;

58
Minecraft.Client/GameState/StatsCounter.cpp
View file

@ -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
}

2
Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp
View file

@ -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);

2
Minecraft.Client/Platform/Durango/Network/DQRNetworkManager.h
View file

@ -404,7 +404,7 @@ private:
unsigned int m_hostSessionAddress; // For client
CRITICAL_SECTION m_csHostGamertagResolveResults;
queue<HostGamertagResolveDetails *> m_hostGamertagResolveResults;
std::queue<HostGamertagResolveDetails *> m_hostGamertagResolveResults;
void AddPlayerFailed(Platform::String ^xuid);
Platform::String^ RemoveBracesFromGuidString(__in Platform::String^ guid );

2
Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h
View file

@ -38,7 +38,7 @@ private:
bool getScoreByRange();
bool setScore();
queue<RegisterScore> m_views;
std::queue<RegisterScore> m_views;
CRITICAL_SECTION m_csViewsLock;

2
Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h
View file

@ -43,7 +43,7 @@ private:
bool getScoreByRange();
bool setScore();
queue<RegisterScore> m_views;
std::queue<RegisterScore> m_views;
CRITICAL_SECTION m_csViewsLock;

Some files were not shown because too many files have changed in this diff Show more