summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-02-16 13:26:07 +0100
committerHowaner <franzi.moos@googlemail.com>2014-02-16 13:26:07 +0100
commit48d28a0f94ab168b7cb022107f6a62e3250043bc (patch)
tree5df314617f7be4ac9946820d163300ec8433ce1d /src
parentReplace random Float Generation and broadcast the Exp Pickup Sound (diff)
downloadcuberite-48d28a0f94ab168b7cb022107f6a62e3250043bc.tar
cuberite-48d28a0f94ab168b7cb022107f6a62e3250043bc.tar.gz
cuberite-48d28a0f94ab168b7cb022107f6a62e3250043bc.tar.bz2
cuberite-48d28a0f94ab168b7cb022107f6a62e3250043bc.tar.lz
cuberite-48d28a0f94ab168b7cb022107f6a62e3250043bc.tar.xz
cuberite-48d28a0f94ab168b7cb022107f6a62e3250043bc.tar.zst
cuberite-48d28a0f94ab168b7cb022107f6a62e3250043bc.zip
Diffstat (limited to 'src')
-rw-r--r--src/ClientHandle.cpp1
-rw-r--r--src/ClientHandle.h7
-rw-r--r--src/Protocol/Protocol132.cpp2
-rw-r--r--src/Protocol/Protocol14x.cpp2
-rw-r--r--src/Protocol/Protocol17x.cpp2
5 files changed, 11 insertions, 3 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index f8a707324..b46bcfd47 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -95,6 +95,7 @@ cClientHandle::cClientHandle(const cSocket * a_Socket, int a_ViewDistance) :
m_ShouldCheckDownloaded(false),
m_NumExplosionsThisTick(0),
m_UniqueID(0),
+ m_Locale("en_GB"),
m_HasSentPlayerChunk(false)
{
m_Protocol = new cProtocolRecognizer(this);
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index 034fe07c2..5faa94004 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -155,6 +155,9 @@ public:
void SetViewDistance(int a_ViewDistance); // tolua_export
int GetViewDistance(void) const { return m_ViewDistance; } // tolua_export
+
+ void SetLocale(AString & a_Locale) { m_Locale = a_Locale; } // tolua_export
+ AString GetLocale(void) const { return m_Locale; } // tolua_export
int GetUniqueID() const { return m_UniqueID; } // tolua_export
@@ -308,7 +311,9 @@ private:
/// Set to true when the chunk where the player is is sent to the client. Used for spawning the player
bool m_HasSentPlayerChunk;
-
+
+ /// Client Settings
+ AString m_Locale;
/// Returns true if the rate block interactions is within a reasonable limit (bot protection)
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index 648e70151..1f9222a69 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -560,7 +560,7 @@ int cProtocol132::ParseLocaleViewDistance(void)
HANDLE_PACKET_READ(ReadChar, char, ViewDistance);
HANDLE_PACKET_READ(ReadChar, char, ChatFlags);
HANDLE_PACKET_READ(ReadChar, char, ClientDifficulty);
- // TODO: m_Client->HandleLocale(Locale);
+ m_Client->SetLocale(Locale);
// TODO: m_Client->HandleViewDistance(ViewDistance);
// TODO: m_Client->HandleChatFlags(ChatFlags);
// Ignoring client difficulty
diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp
index f82e6de45..232b2718e 100644
--- a/src/Protocol/Protocol14x.cpp
+++ b/src/Protocol/Protocol14x.cpp
@@ -85,7 +85,7 @@ int cProtocol142::ParseLocaleViewDistance(void)
HANDLE_PACKET_READ(ReadChar, char, ChatFlags);
HANDLE_PACKET_READ(ReadChar, char, ClientDifficulty);
HANDLE_PACKET_READ(ReadChar, char, ShouldShowCape); // <-- new in 1.4.2
- // TODO: m_Client->HandleLocale(Locale);
+ m_Client->SetLocale(Locale);
// TODO: m_Client->HandleViewDistance(ViewDistance);
// TODO: m_Client->HandleChatFlags(ChatFlags);
// Ignoring client difficulty
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 1dfa5ec90..f7d13774d 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -1598,6 +1598,8 @@ void cProtocol172::HandlePacketClientSettings(cByteBuffer & a_ByteBuffer)
HANDLE_READ(a_ByteBuffer, ReadByte, Byte, ChatColors);
HANDLE_READ(a_ByteBuffer, ReadByte, Byte, Difficulty);
HANDLE_READ(a_ByteBuffer, ReadByte, Byte, ShowCape);
+
+ m_Client->SetLocale(Locale);
// TODO: handle in m_Client
}