summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-11-15 15:33:42 +0100
committerHowaner <franzi.moos@googlemail.com>2014-11-15 15:33:42 +0100
commit927d8d7702b71baa64dc70593ea71e1081c33a9c (patch)
tree50f23a7771aa8093df6fbfff93caad4207b6d647
parentRenamed GetSettedViewDistance() to GetRequestedViewDistance() (diff)
downloadcuberite-927d8d7702b71baa64dc70593ea71e1081c33a9c.tar
cuberite-927d8d7702b71baa64dc70593ea71e1081c33a9c.tar.gz
cuberite-927d8d7702b71baa64dc70593ea71e1081c33a9c.tar.bz2
cuberite-927d8d7702b71baa64dc70593ea71e1081c33a9c.tar.lz
cuberite-927d8d7702b71baa64dc70593ea71e1081c33a9c.tar.xz
cuberite-927d8d7702b71baa64dc70593ea71e1081c33a9c.tar.zst
cuberite-927d8d7702b71baa64dc70593ea71e1081c33a9c.zip
-rw-r--r--src/ClientHandle.cpp8
-rw-r--r--src/ClientHandle.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index d5882da06..3feb4c596 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -66,7 +66,7 @@ int cClientHandle::s_ClientCount = 0;
cClientHandle::cClientHandle(const cSocket * a_Socket, int a_ViewDistance) :
m_UsedViewDistance(a_ViewDistance),
- m_SetViewDistance(a_ViewDistance),
+ m_RequestedViewDistance(a_ViewDistance),
m_IPString(a_Socket->GetIPString()),
m_OutgoingData(64 KiB),
m_Player(nullptr),
@@ -2850,9 +2850,9 @@ void cClientHandle::SetViewDistance(int a_ViewDistance)
{
ASSERT(m_Player->GetWorld() == NULL);
- m_SetViewDistance = a_ViewDistance;
- m_UsedViewDistance = Clamp(m_SetViewDistance, cClientHandle::MIN_VIEW_DISTANCE, m_Player->GetWorld()->GetMaxViewDistance());
- LOGD("Setted view distance from %s to %i!", GetUsername().c_str(), m_UsedViewDistance);
+ m_RequestedViewDistance = a_ViewDistance;
+ m_UsedViewDistance = Clamp(a_ViewDistance, cClientHandle::MIN_VIEW_DISTANCE, m_Player->GetWorld()->GetMaxViewDistance());
+ LOGD("Setted view distance from %s to %d!", GetUsername().c_str(), m_UsedViewDistance);
}
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index db386d8a3..c0826d7c4 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -224,7 +224,7 @@ public:
int GetViewDistance(void) const { return m_UsedViewDistance; }
/** Returns the view distance that the player request, not the used view distance. */
- int GetRequestedViewDistance(void) const { return m_SetViewDistance; }
+ int GetRequestedViewDistance(void) const { return m_RequestedViewDistance; }
void SetLocale(AString & a_Locale) { m_Locale = a_Locale; }
AString GetLocale(void) const { return m_Locale; }
@@ -342,8 +342,8 @@ private:
/** Number of chunks the player can see in each direction */
int m_UsedViewDistance;
- /** The original view distance from the player. It isn't clamped with 1 and the max view distance of the world. */
- int m_SetViewDistance;
+ /** The requested view distance from the player. It isn't clamped with 1 and the max view distance of the world. */
+ int m_RequestedViewDistance;
AString m_IPString;