summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-26 20:09:10 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-26 20:09:10 +0200
commit05252babc6395fd6ac9348025d16a48a64f9a509 (patch)
tree343508ed893e8801e5cc077477571f2722fb6319
parentA globally-accessible OS-independent GetDirectoryContents() function for listing all objects in a folder as an AStringList (diff)
downloadcuberite-05252babc6395fd6ac9348025d16a48a64f9a509.tar
cuberite-05252babc6395fd6ac9348025d16a48a64f9a509.tar.gz
cuberite-05252babc6395fd6ac9348025d16a48a64f9a509.tar.bz2
cuberite-05252babc6395fd6ac9348025d16a48a64f9a509.tar.lz
cuberite-05252babc6395fd6ac9348025d16a48a64f9a509.tar.xz
cuberite-05252babc6395fd6ac9348025d16a48a64f9a509.tar.zst
cuberite-05252babc6395fd6ac9348025d16a48a64f9a509.zip
-rw-r--r--source/cClientHandle.cpp2
-rw-r--r--source/cClientHandle.h7
-rw-r--r--source/cServer.cpp8
3 files changed, 13 insertions, 4 deletions
diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp
index e8f874489..567a705c6 100644
--- a/source/cClientHandle.cpp
+++ b/source/cClientHandle.cpp
@@ -91,7 +91,7 @@ int cClientHandle::s_ClientCount = 0;
cClientHandle::cClientHandle(const cSocket & a_Socket, int a_ViewDistance)
: m_ViewDistance(a_ViewDistance)
- , m_ProtocolVersion(29)
+ , m_ProtocolVersion(MCS_PROTOCOL_VERSION)
, m_Socket(a_Socket)
, m_bDestroyed(false)
, m_Player(NULL)
diff --git a/source/cClientHandle.h b/source/cClientHandle.h
index d0ac81db8..69c3f3ae3 100644
--- a/source/cClientHandle.h
+++ b/source/cClientHandle.h
@@ -44,6 +44,13 @@
+#define MCS_PROTOCOL_VERSION 29 // Synchronize this with MCS_CLIENT_VERSION below!
+#define MCS_CLIENT_VERSION "1.2.4"
+
+
+
+
+
class cPlayer;
class cRedstone;
diff --git a/source/cServer.cpp b/source/cServer.cpp
index ceee46fa0..23fcbdda0 100644
--- a/source/cServer.cpp
+++ b/source/cServer.cpp
@@ -154,10 +154,11 @@ bool cServer::InitServer( int a_Port )
printf("/============================\\\n");
printf("| Custom Minecraft Server |\n");
printf("| Created by Kevin Bansberg |\n");
- printf("| A.K.A. |\n");
- printf("| FakeTruth |\n");
+ printf("| A.K.A. FakeTruth |\n");
printf("| Monsters by Alex Sonek |\n");
- printf("| A.K.A. Duralex |\n");
+ printf("| A.K.A. Duralex |\n");
+ printf("| Stuff by Mattes D |\n");
+ printf("| A.K.A. _Xoft(o) |\n");
printf("\\============================/\n");
printf("More info: WWW.MC-SERVER.ORG\n");
printf(" WWW.AE-C.NET\n");
@@ -165,6 +166,7 @@ bool cServer::InitServer( int a_Port )
printf("email: faketruth@gmail.com\n\n");
LOG("Starting up server.");
+ LOGINFO("Compatible clients: %s, protocol version %d", MCS_CLIENT_VERSION, MCS_PROTOCOL_VERSION);
if( cSocket::WSAStartup() != 0 ) // Only does anything on Windows, but whatever
{