diff --git a/Minecraft.Client/UI/Screens/ChatScreen.cpp b/Minecraft.Client/UI/Screens/ChatScreen.cpp index 481e4758a..d7c944fbe 100644 --- a/Minecraft.Client/UI/Screens/ChatScreen.cpp +++ b/Minecraft.Client/UI/Screens/ChatScreen.cpp @@ -4,7 +4,7 @@ #include "../../../Minecraft.World/Util/SharedConstants.h" #include "../../../Minecraft.World/Util/StringHelpers.h" -const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; +const wstring ChatScreen::allowedChars = SharedConstants::readAcceptableChars(); ChatScreen::ChatScreen() { diff --git a/Minecraft.Client/UI/Screens/TextEditScreen.cpp b/Minecraft.Client/UI/Screens/TextEditScreen.cpp index 235f56df4..917ec9678 100644 --- a/Minecraft.Client/UI/Screens/TextEditScreen.cpp +++ b/Minecraft.Client/UI/Screens/TextEditScreen.cpp @@ -11,7 +11,7 @@ #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" -const wstring TextEditScreen::allowedChars = SharedConstants::acceptableLetters;; +const wstring TextEditScreen::allowedChars = SharedConstants::readAcceptableChars(); TextEditScreen::TextEditScreen(shared_ptr sign) { diff --git a/Minecraft.World/Network/Packets/RemoveEntitiesPacket.cpp b/Minecraft.World/Network/Packets/RemoveEntitiesPacket.cpp index a338490dd..56ab5ba05 100644 --- a/Minecraft.World/Network/Packets/RemoveEntitiesPacket.cpp +++ b/Minecraft.World/Network/Packets/RemoveEntitiesPacket.cpp @@ -51,6 +51,6 @@ int RemoveEntitiesPacket::getEstimatedSize() 4J: These are necesary on the PS3. (and 4). */ -#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__) +#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined __linux__) const int RemoveEntitiesPacket::MAX_PER_PACKET; #endif diff --git a/Minecraft.World/Util/SharedConstants.cpp b/Minecraft.World/Util/SharedConstants.cpp index 1d26932a2..66cbfec2b 100644 --- a/Minecraft.World/Util/SharedConstants.cpp +++ b/Minecraft.World/Util/SharedConstants.cpp @@ -37,7 +37,7 @@ bool SharedConstants::isAllowedChatCharacter(char ch) return true; } -wstring SharedConstants::acceptableLetters; +wstring SharedConstants::acceptableLetters = SharedConstants::readAcceptableChars(); void SharedConstants::staticCtor() { diff --git a/Minecraft.World/Util/SharedConstants.h b/Minecraft.World/Util/SharedConstants.h index bd6dae895..80751d6d8 100644 --- a/Minecraft.World/Util/SharedConstants.h +++ b/Minecraft.World/Util/SharedConstants.h @@ -14,8 +14,7 @@ class SharedConstants static const int WORLD_RESOLUTION = 16; static bool isAllowedChatCharacter(char ch); - - private: + // why private?????????? static wstring readAcceptableChars(); public: