LegacyConsole/4jcraft
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-12 15:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unglob std::wstring

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:50:22 -06:00
parent 41db813a6d
commit cdc08700e4
581 changed files with 2156 additions and 2154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
View File

@@ -6,7 +6,7 @@
#include "StitchedTexture.h"
#include "../TextureManager.h"
StitchedTexture *StitchedTexture::create(const wstring &name)
StitchedTexture *StitchedTexture::create(const std::wstring &name)
{
// TODO: Generalize?
if (name.compare(L"clock") == 0)
@@ -23,7 +23,7 @@ StitchedTexture *StitchedTexture::create(const wstring &name)
}
}
StitchedTexture::StitchedTexture(const wstring &name) : name(name)
StitchedTexture::StitchedTexture(const std::wstring &name) : name(name)
{
// 4J Initialisers
source = NULL;
@@ -170,7 +170,7 @@ float StitchedTexture::getV(double offset, bool adjust/*=false*/) const
return getV0(adjust) + (diff * ((float) offset / SharedConstants::WORLD_RESOLUTION));
}
wstring StitchedTexture::getName() const
std::wstring StitchedTexture::getName() const
{
return name;
}
@@ -256,7 +256,7 @@ void StitchedTexture::loadAnimationFrames(BufferedReader *bufferedReader)
intPairVector *results = new intPairVector();
//try {
wstring line = bufferedReader->readLine();
std::wstring line = bufferedReader->readLine();
while (!line.empty())
{
line = trimString(line);
@@ -266,7 +266,7 @@ void StitchedTexture::loadAnimationFrames(BufferedReader *bufferedReader)
//for (String token : tokens)
for(AUTO_VAR(it, tokens.begin()); it != tokens.end(); ++it)
{
wstring token = *it;
std::wstring token = *it;
int multiPos = token.find_first_of('*');
if (multiPos > 0)
{
@@ -297,7 +297,7 @@ void StitchedTexture::loadAnimationFrames(BufferedReader *bufferedReader)
}
}
void StitchedTexture::loadAnimationFrames(const wstring &string)
void StitchedTexture::loadAnimationFrames(const std::wstring &string)
{
if(frameOverride != NULL)
{
@@ -313,7 +313,7 @@ void StitchedTexture::loadAnimationFrames(const wstring &string)
//for (String token : tokens)
for(AUTO_VAR(it, tokens.begin()); it != tokens.end(); ++it)
{
wstring token = trimString(*it);
std::wstring token = trimString(*it);
int multiPos = token.find_first_of('*');
if (multiPos > 0)
{