LegacyConsole/4jcraft
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-24 21:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: begin unglobbing std::vector

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:58:11 -06:00
committed by JuiceyDev
parent d2e8a0f9f5
commit 5fad08b9fd
286 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Minecraft.Client/Textures/Packs/TexturePackRepository.cpp
View File

@@ -18,7 +18,7 @@ TexturePackRepository::TexturePackRepository(File workingDirectory, Minecraft *m
// 4J - added
usingWeb = false;
selected = NULL;
texturePacks = new vector<TexturePack *>;
texturePacks = new std::vector<TexturePack *>;
this->minecraft = minecraft;
@@ -157,7 +157,7 @@ void TexturePackRepository::updateList()
{
// 4J Stu - We don't ever want to completely refresh the lists, we keep them up-to-date as we go
#if 0
vector<TexturePack *> *currentPacks = new vector<TexturePack *>;
std::vector<TexturePack *> *currentPacks = new std::vector<TexturePack *>;
currentPacks->push_back(DEFAULT_TEXTURE_PACK);
cacheById[DEFAULT_TEXTURE_PACK->getId()] = DEFAULT_TEXTURE_PACK;
#ifndef _CONTENT_PACKAGE
@@ -195,9 +195,9 @@ void TexturePackRepository::updateList()
// 4J - was texturePacks.removeAll(currentPacks);
AUTO_VAR(itEnd, currentPacks->end());
for( vector<TexturePack *>::iterator it1 = currentPacks->begin(); it1 != itEnd; it1++ )
for( std::vector<TexturePack *>::iterator it1 = currentPacks->begin(); it1 != itEnd; it1++ )
{
for( vector<TexturePack *>::iterator it2 = texturePacks->begin(); it2 != texturePacks->end(); it2++ )
for( std::vector<TexturePack *>::iterator it2 = texturePacks->begin(); it2 != texturePacks->end(); it2++ )
{
if( *it1 == *it2 )
{
@@ -207,7 +207,7 @@ void TexturePackRepository::updateList()
}
itEnd = texturePacks->end();
for( vector<TexturePack *>::iterator it = texturePacks->begin(); it != itEnd; it++ )
for( std::vector<TexturePack *>::iterator it = texturePacks->begin(); it != itEnd; it++ )
{
TexturePack *pack = *it;
pack->unload(minecraft->textures);
@@ -234,7 +234,7 @@ std::wstring TexturePackRepository::getIdOrNull(File file)
return L"";
}
vector<File> TexturePackRepository::getWorkDirContents()
std::vector<File> TexturePackRepository::getWorkDirContents()
{
app.DebugPrintf("TexturePackRepository::getWorkDirContents is not implemented\n");
#if 0
@@ -244,10 +244,10 @@ vector<File> TexturePackRepository::getWorkDirContents()
return Collections.emptyList();
#endif
return vector<File>();
return std::vector<File>();
}
vector<TexturePack *> *TexturePackRepository::getAll()
std::vector<TexturePack *> *TexturePackRepository::getAll()
{
// 4J - note that original constucted a copy of texturePacks here
return texturePacks;
@@ -291,9 +291,9 @@ bool TexturePackRepository::canUseWebSkin()
return false;
}
vector< pair<DWORD,std::wstring> > *TexturePackRepository::getTexturePackIdNames()
std::vector< pair<DWORD,std::wstring> > *TexturePackRepository::getTexturePackIdNames()
{
vector< pair<DWORD,std::wstring> > *packList = new vector< pair<DWORD,std::wstring> >();
std::vector< pair<DWORD,std::wstring> > *packList = new std::vector< pair<DWORD,std::wstring> >();
for(AUTO_VAR(it,texturePacks->begin()); it != texturePacks->end(); ++it)
{