From c2f75b0017f7244b40f109926c48a0484b575ae8 Mon Sep 17 00:00:00 2001 From: Choupom Date: Tue, 19 Apr 2011 11:54:44 +0200 Subject: [PATCH] structs are structs, classes are classes --- src/engine/server/register.h | 6 +++--- src/engine/shared/console.h | 2 +- src/engine/shared/datafile.h | 2 +- src/engine/shared/mapchecker.h | 2 +- src/engine/shared/network.h | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/engine/server/register.h b/src/engine/server/register.h index 44e6dd14f..c0392380d 100644 --- a/src/engine/server/register.h +++ b/src/engine/server/register.h @@ -32,20 +32,20 @@ class CRegister int m_RegisterFirst; int m_RegisterCount; - class CMasterserverInfo m_aMasterserverInfo[IMasterServer::MAX_MASTERSERVERS]; + CMasterserverInfo m_aMasterserverInfo[IMasterServer::MAX_MASTERSERVERS]; int m_RegisterRegisteredServer; void RegisterNewState(int State); void RegisterSendFwcheckresponse(NETADDR *pAddr); void RegisterSendHeartbeat(NETADDR Addr); void RegisterSendCountRequest(NETADDR Addr); - void RegisterGotCount(class CNetChunk *pChunk); + void RegisterGotCount(struct CNetChunk *pChunk); public: CRegister(); void Init(class CNetServer *pNetServer, class IEngineMasterServer *pMasterServer, class IConsole *pConsole); void RegisterUpdate(int Nettype); - int RegisterProcessPacket(class CNetChunk *pPacket); + int RegisterProcessPacket(struct CNetChunk *pPacket); }; #endif diff --git a/src/engine/shared/console.h b/src/engine/shared/console.h index 77c46fb0c..0866d8e32 100644 --- a/src/engine/shared/console.h +++ b/src/engine/shared/console.h @@ -36,7 +36,7 @@ class CConsole : public IConsole { public: const char *m_pFilename; - struct CExecFile *m_pPrev; + CExecFile *m_pPrev; }; CExecFile *m_pFirstExec; diff --git a/src/engine/shared/datafile.h b/src/engine/shared/datafile.h index 46e8ada81..9f27f9684 100644 --- a/src/engine/shared/datafile.h +++ b/src/engine/shared/datafile.h @@ -6,7 +6,7 @@ // raw datafile access class CDataFileReader { - class CDatafile *m_pDataFile; + struct CDatafile *m_pDataFile; void *GetDataImpl(int Index, int Swap); public: CDataFileReader() : m_pDataFile(0) {} diff --git a/src/engine/shared/mapchecker.h b/src/engine/shared/mapchecker.h index 6d9568d09..8f6d24e8e 100644 --- a/src/engine/shared/mapchecker.h +++ b/src/engine/shared/mapchecker.h @@ -30,7 +30,7 @@ class CMapChecker public: CMapChecker(); - void AddMaplist(class CMapVersion *pMaplist, int Num); + void AddMaplist(struct CMapVersion *pMaplist, int Num); bool IsMapValid(const char *pMapName, unsigned MapCrc, unsigned MapSize); bool ReadAndValidateMap(class IStorage *pStorage, const char *pFilename, int StorageType); }; diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h index f344049e4..425d970ab 100644 --- a/src/engine/shared/network.h +++ b/src/engine/shared/network.h @@ -192,7 +192,7 @@ public: int AckSequence() const { return m_Ack; } }; -struct CNetRecvUnpacker +class CNetRecvUnpacker { public: bool m_Valid; @@ -222,13 +222,13 @@ public: }; private: - class CSlot + struct CSlot { public: CNetConnection m_Connection; }; - class CBan + struct CBan { public: CBanInfo m_Info;