From e1ef489e08a91cce377617b99f4c3ed3df5e9d92 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 24 Mar 2012 11:40:29 +0000 Subject: Removed the split between 1.2.3 and 1.1, left only 1.2.3 code git-svn-id: http://mc-server.googlecode.com/svn/trunk@429 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_Login.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'source/packets/cPacket_Login.h') diff --git a/source/packets/cPacket_Login.h b/source/packets/cPacket_Login.h index 7cab1141b..86666090c 100644 --- a/source/packets/cPacket_Login.h +++ b/source/packets/cPacket_Login.h @@ -12,9 +12,6 @@ class cPacket_Login : public cPacket //tolua_export public: cPacket_Login() : m_ProtocolVersion( 0 ) -#if (MINECRAFT_1_2_2 != 1) - , m_MapSeed( 0 ) -#endif , m_ServerMode( 0 ) , m_Dimension( 0 ) , m_Difficulty( 0 ) @@ -27,29 +24,15 @@ public: virtual int Parse(const char * a_Data, int a_Size) override; virtual void Serialize(AString & a_Data) const override; - // 1.2.2 http://wiki.vg/Pre-release_protocol#Login_Request_.280x01.29 int m_ProtocolVersion; //tolua_export AString m_Username; //tolua_export -#if (MINECRAFT_1_2_2 != 1) - long long m_MapSeed; -#endif AString m_LevelType; //tolua_export int m_ServerMode; //tolua_export -#if (MINECRAFT_1_2_2 == 1 ) int m_Dimension; -#else - char m_Dimension; -#endif char m_Difficulty; //tolua_export unsigned char m_WorldHeight; //tolua_export unsigned char m_MaxPlayers; //tolua_export -#if (MINECRAFT_1_2_2 == 1 ) - static const unsigned int c_Size = 1 + 4 + 2 + 2 + 4 + 4 + 1 + 1 + 1; -#else - static const unsigned int c_Size = 1 + 4 + 2 + 8 + 2 + 4 + 1 + 1 + 1 + 1; // Minimal size -#endif - static const AString LEVEL_TYPE_DEFAULT; static const AString LEVEL_TYPE_SUPERFLAT; }; //tolua_export -- cgit v1.2.3