flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Using Super.

Browse Source
This commit is contained in:
Mattes D
2020-04-13 18:38:06 +02:00
committed by Alexander Harkness
parent f931590bf0
commit 9ee47e5999
399 changed files with 1815 additions and 1381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Protocol/Authenticator.cpp
View File

@@ -25,7 +25,7 @@
cAuthenticator::cAuthenticator(void) :
super("cAuthenticator"),
Super("cAuthenticator"),
m_Server(DEFAULT_AUTH_SERVER),
m_Address(DEFAULT_AUTH_ADDRESS),
m_ShouldAuthenticate(true)
@@ -77,7 +77,7 @@ void cAuthenticator::Authenticate(int a_ClientID, const AString & a_UserName, co
void cAuthenticator::Start(cSettingsRepositoryInterface & a_Settings)
{
ReadSettings(a_Settings);
super::Start();
Super::Start();
}
@@ -88,7 +88,7 @@ void cAuthenticator::Stop(void)
{
m_ShouldTerminate = true;
m_QueueNonempty.Set();
super::Stop();
Super::Stop();
}

7
src/Protocol/Authenticator.h
View File

@@ -27,13 +27,14 @@ namespace Json
class cAuthenticator :
class cAuthenticator:
public cIsThread
{
typedef cIsThread super;
using Super = cIsThread;
public:
cAuthenticator(void);
cAuthenticator();
virtual ~cAuthenticator() override;
/** (Re-)read server and address from INI: */

10
src/Protocol/MojangAPI.cpp
View File

@@ -228,13 +228,15 @@ cMojangAPI::sProfile::sProfile(
////////////////////////////////////////////////////////////////////////////////
// cMojangAPI::cUpdateThread:
class cMojangAPI::cUpdateThread :
class cMojangAPI::cUpdateThread:
public cIsThread
{
typedef cIsThread super;
using Super = cIsThread;
public:
cUpdateThread(cMojangAPI & a_MojangAPI) :
super("cMojangAPI::cUpdateThread"),
cUpdateThread(cMojangAPI & a_MojangAPI):
Super("cMojangAPI::cUpdateThread"),
m_MojangAPI(a_MojangAPI)
{
}

2
src/Protocol/ProtocolRecognizer.cpp
View File

@@ -26,7 +26,7 @@
cProtocolRecognizer::cProtocolRecognizer(cClientHandle * a_Client) :
super(a_Client),
Super(a_Client),
m_Buffer(8192), // We need a larger buffer to support BungeeCord - it sends one huge packet at the start
m_InPingForUnrecognizedVersion(false)
{

2
src/Protocol/ProtocolRecognizer.h
View File

@@ -21,7 +21,7 @@ protocol version instance and redirects everything to it. */
class cProtocolRecognizer:
public cProtocol
{
typedef cProtocol super;
using Super = cProtocol;
public:
enum

5
src/Protocol/Protocol_1_10.h
View File

@@ -19,12 +19,13 @@ Declares the 1.10 protocol classes:
class cProtocol_1_10_0 :
class cProtocol_1_10_0:
public cProtocol_1_9_4
{
typedef cProtocol_1_9_4 Super;
using Super = cProtocol_1_9_4;
public:
cProtocol_1_10_0(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
virtual void SendSoundEffect(const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) override;

10
src/Protocol/Protocol_1_11.h
View File

@@ -21,12 +21,13 @@ Declares the 1.11 protocol classes:
class cProtocol_1_11_0 :
class cProtocol_1_11_0:
public cProtocol_1_10_0
{
typedef cProtocol_1_10_0 Super;
using Super = cProtocol_1_10_0;
public:
cProtocol_1_11_0(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
virtual void SendCollectEntity(const cEntity & a_Entity, const cPlayer & a_Player, int a_Count) override;
@@ -52,12 +53,13 @@ protected:
class cProtocol_1_11_1 :
class cProtocol_1_11_1:
public cProtocol_1_11_0
{
typedef cProtocol_1_11_0 Super;
using Super = cProtocol_1_11_0;
public:
cProtocol_1_11_1(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
virtual void HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) override;

13
src/Protocol/Protocol_1_12.h
View File

@@ -24,12 +24,13 @@ Declares the 1.12 protocol classes:
class cProtocol_1_12 :
class cProtocol_1_12:
public cProtocol_1_11_1
{
typedef cProtocol_1_11_1 Super;
using Super = cProtocol_1_11_1;
public:
cProtocol_1_12(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
protected:
@@ -49,12 +50,13 @@ protected:
class cProtocol_1_12_1 :
class cProtocol_1_12_1:
public cProtocol_1_12
{
typedef cProtocol_1_12 Super;
using Super = cProtocol_1_12;
public:
cProtocol_1_12_1(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
protected:
@@ -71,9 +73,10 @@ protected:
class cProtocol_1_12_2:
public cProtocol_1_12_1
{
typedef cProtocol_1_12_1 Super;
using Super = cProtocol_1_12_1;
public:
cProtocol_1_12_2(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State):
Super(a_Client, a_ServerAddress, a_ServerPort, a_State)
{

5
src/Protocol/Protocol_1_13.h
View File

@@ -28,12 +28,13 @@ class BlockTypePalette;
class cProtocol_1_13 :
class cProtocol_1_13:
public cProtocol_1_12_2
{
typedef cProtocol_1_12_2 Super;
using Super = cProtocol_1_12_2;
public:
cProtocol_1_13(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
virtual void Initialize(cClientHandle & a_Client) override;

2
src/Protocol/Protocol_1_8.cpp
View File

@@ -108,7 +108,7 @@ extern bool g_ShouldLogCommIn, g_ShouldLogCommOut;
// cProtocol_1_8_0:
cProtocol_1_8_0::cProtocol_1_8_0(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State) :
super(a_Client),
Super(a_Client),
m_ServerAddress(a_ServerAddress),
m_ServerPort(a_ServerPort),
m_State(a_State),

4
src/Protocol/Protocol_1_8.h
View File

@@ -24,10 +24,10 @@ Declares the 1.8 protocol classes:
class cProtocol_1_8_0 :
class cProtocol_1_8_0:
public cProtocol
{
typedef cProtocol super;
using Super = cProtocol;
public:

19
src/Protocol/Protocol_1_9.h
View File

@@ -30,10 +30,10 @@ Declares the 1.9 protocol classes:
class cProtocol_1_9_0 :
class cProtocol_1_9_0:
public cProtocol
{
typedef cProtocol Super;
using Super = cProtocol;
public:
@@ -292,12 +292,13 @@ protected:
/** The version 108 protocol, used by 1.9.1. Uses an int rather than a byte for dimension in join game. */
class cProtocol_1_9_1 :
class cProtocol_1_9_1:
public cProtocol_1_9_0
{
typedef cProtocol_1_9_0 Super;
using Super = cProtocol_1_9_0;
public:
cProtocol_1_9_1(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
// cProtocol_1_9_0 overrides:
@@ -311,12 +312,13 @@ public:
/** The version 109 protocol, used by 1.9.2. Same as 1.9.1, except the server list ping version number changed with the protocol number. */
class cProtocol_1_9_2 :
class cProtocol_1_9_2:
public cProtocol_1_9_1
{
typedef cProtocol_1_9_1 Super;
using Super = cProtocol_1_9_1;
public:
cProtocol_1_9_2(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
// cProtocol_1_9_1 overrides:
@@ -329,12 +331,13 @@ public:
/** The version 110 protocol, used by 1.9.3 and 1.9.4. */
class cProtocol_1_9_4 :
class cProtocol_1_9_4:
public cProtocol_1_9_2
{
typedef cProtocol_1_9_2 Super;
using Super = cProtocol_1_9_2;
public:
cProtocol_1_9_4(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
// cProtocol_1_9_2 overrides: