diff --git a/Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp b/Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp index b27268452..3c3ccf249 100644 --- a/Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp +++ b/Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp @@ -758,19 +758,19 @@ int PotionBrewing::valueOf(int brew, int p1, int p2, int p3, int p4, int p5) { } std::wstring PotionBrewing::toString(int brew) { - std::wstring std::string; + std::wstring string; int bit = NUM_BITS - 1; while (bit >= 0) { if ((brew & (1 << bit)) != 0) { - std::string.append(L"O"); + string.append(L"O"); } else { - std::string.append(L"x"); + string.append(L"x"); } bit--; } - return std::string; + return string; } // void main(String[] args) diff --git a/Minecraft.World/IO/NBT/CompoundTag.h b/Minecraft.World/IO/NBT/CompoundTag.h index f30adf82d..c80a52c94 100644 --- a/Minecraft.World/IO/NBT/CompoundTag.h +++ b/Minecraft.World/IO/NBT/CompoundTag.h @@ -173,8 +173,8 @@ public: return (ListTag*)tags[name]; } - bool getBoolean(const std::wstring& std::string) { - return getByte(std::string) != 0; + bool getBoolean(const std::wstring& string) { + return getByte(string) != 0; } void remove(const std::wstring& name) { diff --git a/Minecraft.World/Level/Level.cpp b/Minecraft.World/Level/Level.cpp index f9e0245e8..a4b36f98e 100644 --- a/Minecraft.World/Level/Level.cpp +++ b/Minecraft.World/Level/Level.cpp @@ -1604,7 +1604,7 @@ void Level::playStreamingMusic(const std::wstring& name, int x, int y, int z) { } void Level::playMusic(double x, double y, double z, - const std::wstring& std::string, float volume) {} + const std::wstring& string, float volume) {} // 4J removed - /* diff --git a/Minecraft.World/Level/Level.h b/Minecraft.World/Level/Level.h index ea06e2468..2819d09f2 100644 --- a/Minecraft.World/Level/Level.h +++ b/Minecraft.World/Level/Level.h @@ -341,7 +341,7 @@ public: void playStreamingMusic(const std::wstring& name, int x, int y, int z); void playMusic(double x, double y, double z, - const std::wstring& std::string, float volume); + const std::wstring& string, float volume); // 4J removed - void addParticle(const std::wstring& id, double x, double y, // double z, double xd, double yd, double zd); void addParticle(ePARTICLE_TYPE id, double x, double y, double z, double xd,