mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-09-27 11:40:46 +00:00
refactor: unglob std::wstring
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
class HugeMushroomTile_SPU : public Tile_SPU
|
||||
{
|
||||
public:
|
||||
// static const wstring TEXTURE_STEM;
|
||||
// static const wstring TEXTURE_INSIDE;
|
||||
// static const std::wstring TEXTURE_STEM;
|
||||
// static const std::wstring TEXTURE_INSIDE;
|
||||
|
||||
private:
|
||||
static const int HUGE_MUSHROOM_TEXTURE_COUNT = 2;
|
||||
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
return getV0() + (diff * ((float) offset / 16)); //SharedConstants::WORLD_RESOLUTION));
|
||||
}
|
||||
|
||||
// virtual wstring getName() const = 0;
|
||||
// virtual std::wstring getName() const = 0;
|
||||
// virtual int getSourceWidth() const = 0;
|
||||
// virtual int getSourceHeight() const = 0;
|
||||
};
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
// IDS_TILE_LEAVES_BIRCH,
|
||||
// };
|
||||
//
|
||||
// const wstring LeafTile::TEXTURES[2][4] = { {L"leaves", L"leaves_spruce", L"leaves", L"leaves_jungle"}, {L"leaves_opaque", L"leaves_spruce_opaque", L"leaves_opaque", L"leaves_jungle_opaque"},};
|
||||
// const std::wstring LeafTile::TEXTURES[2][4] = { {L"leaves", L"leaves_spruce", L"leaves", L"leaves_jungle"}, {L"leaves_opaque", L"leaves_spruce_opaque", L"leaves_opaque", L"leaves_jungle_opaque"},};
|
||||
|
||||
|
||||
// from TransparentTile, since we're no longer inheriting
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
#include "../Common/spu_assert.h"
|
||||
#endif
|
||||
|
||||
// const wstring LiquidTile::TEXTURE_LAVA_STILL = L"lava";
|
||||
// const wstring LiquidTile::TEXTURE_WATER_STILL = L"water";
|
||||
// const wstring LiquidTile::TEXTURE_WATER_FLOW = L"water_flow";
|
||||
// const wstring LiquidTile::TEXTURE_LAVA_FLOW = L"lava_flow";
|
||||
// const std::wstring LiquidTile::TEXTURE_LAVA_STILL = L"lava";
|
||||
// const std::wstring LiquidTile::TEXTURE_WATER_STILL = L"water";
|
||||
// const std::wstring LiquidTile::TEXTURE_WATER_FLOW = L"water_flow";
|
||||
// const std::wstring LiquidTile::TEXTURE_LAVA_FLOW = L"lava_flow";
|
||||
|
||||
#define MATH_PI (3.141592654f)
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ const int TallGrass_SPU::DEAD_SHRUB = 0;
|
||||
const int TallGrass_SPU::TALL_GRASS = 1;
|
||||
const int TallGrass_SPU::FERN = 2;
|
||||
|
||||
// const wstring TallGrass::TEXTURE_NAMES[] = {L"deadbush", L"tallgrass", L"fern"};
|
||||
// const std::wstring TallGrass::TEXTURE_NAMES[] = {L"deadbush", L"tallgrass", L"fern"};
|
||||
|
||||
|
||||
Icon_SPU *TallGrass_SPU::getTexture(int face, int data)
|
||||
|
||||
@@ -575,7 +575,7 @@ void Tile_SPU::updateDefaultShape()
|
||||
// return this;
|
||||
// }
|
||||
//
|
||||
// wstring Tile_SPU::getName()
|
||||
// std::wstring Tile_SPU::getName()
|
||||
// {
|
||||
// return I18n::get(getDescriptionId() + L".name");
|
||||
// }
|
||||
@@ -655,12 +655,12 @@ Material_SPU* Tile_SPU::getMaterial()
|
||||
// icon = iconRegister->registerIcon(m_textureName);
|
||||
// }
|
||||
//
|
||||
// wstring Tile_SPU::getTileItemIconName()
|
||||
// std::wstring Tile_SPU::getTileItemIconName()
|
||||
// {
|
||||
// return L"";
|
||||
// }
|
||||
//
|
||||
// Tile *Tile_SPU::setTextureName(const wstring &name)
|
||||
// Tile *Tile_SPU::setTextureName(const std::wstring &name)
|
||||
// {
|
||||
// m_textureName = name;
|
||||
// return this;
|
||||
|
||||
@@ -223,7 +223,7 @@ private:
|
||||
// unsigned int descriptionId;
|
||||
// unsigned int useDescriptionId; // 4J Added
|
||||
//
|
||||
// wstring m_textureName;
|
||||
// std::wstring m_textureName;
|
||||
|
||||
protected:
|
||||
// Icon *icon;
|
||||
|
||||
@@ -173,7 +173,7 @@ public:
|
||||
// public:
|
||||
// ZipFile(File *file) {}
|
||||
// InputStream *getInputStream(ZipEntry *entry) { return NULL; }
|
||||
// ZipEntry *getEntry(const wstring& name) {return NULL;}
|
||||
// ZipEntry *getEntry(const std::wstring& name) {return NULL;}
|
||||
// void close() {}
|
||||
// };
|
||||
//
|
||||
@@ -189,7 +189,7 @@ public:
|
||||
// static void create() {}
|
||||
// static void destroy() {}
|
||||
// static bool isKeyDown(int) {return false;}
|
||||
// static wstring getKeyName(int) { return L"KEYNAME"; }
|
||||
// static std::wstring getKeyName(int) { return L"KEYNAME"; }
|
||||
// static void enableRepeatEvents(bool) {}
|
||||
// static const int KEY_A = 0;
|
||||
// static const int KEY_B = 1;
|
||||
|
||||
Reference in New Issue
Block a user