edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark some return values as const

Browse source
This commit is contained in:
BeaR 2015-01-21 13:03:51 +01:00 committed by oy
parent a929a99fd9
commit a2cb7d339a
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
datasrc/compile.py
View file

@ -140,7 +140,7 @@ class CNetObjHandler
public: public:
CNetObjHandler(); CNetObjHandler();
int ValidateObj(int Type, void *pData, int Size); int ValidateObj(int Type, const void *pData, int Size);
const char *GetObjName(int Type) const; const char *GetObjName(int Type) const;
int GetObjSize(int Type) const; int GetObjSize(int Type) const;
int NumObjCorrections() const; int NumObjCorrections() const;
@ -265,7 +265,7 @@ if gen_network_source:
lines += ["};", ""] lines += ["};", ""]
lines = [] lines = []
lines += ['int CNetObjHandler::ValidateObj(int Type, void *pData, int Size)'] lines += ['int CNetObjHandler::ValidateObj(int Type, const void *pData, int Size)']
lines += ['{'] lines += ['{']
lines += ['\tswitch(Type)'] lines += ['\tswitch(Type)']
lines += ['\t{'] lines += ['\t{']

6
src/engine/client.h
View file

@ -96,7 +96,7 @@ public:
virtual int MapDownloadTotalsize() const = 0; virtual int MapDownloadTotalsize() const = 0;
// input // input
virtual int *GetInput(int Tick) const = 0; virtual const int *GetInput(int Tick) const = 0;
// remote console // remote console
virtual void RconAuth(const char *pUsername, const char *pPassword) = 0; virtual void RconAuth(const char *pUsername, const char *pPassword) = 0;
@ -117,8 +117,8 @@ public:
// TODO: Refactor: should redo this a bit i think, too many virtual calls // TODO: Refactor: should redo this a bit i think, too many virtual calls
virtual int SnapNumItems(int SnapID) const = 0; virtual int SnapNumItems(int SnapID) const = 0;
virtual void *SnapFindItem(int SnapID, int Type, int ID) const = 0; virtual const void *SnapFindItem(int SnapID, int Type, int ID) const = 0;
virtual void *SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const = 0; virtual const void *SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const = 0;
virtual void SnapInvalidateItem(int SnapID, int Index) = 0; virtual void SnapInvalidateItem(int SnapID, int Index) = 0;
virtual void *SnapNewItem(int Type, int ID, int Size) = 0; virtual void *SnapNewItem(int Type, int ID, int Size) = 0;

8
src/engine/client/client.cpp
View file

@ -429,7 +429,7 @@ const char *CClient::LatestVersion() const
} }
// TODO: OPT: do this alot smarter! // TODO: OPT: do this alot smarter!
int *CClient::GetInput(int Tick) const const int *CClient::GetInput(int Tick) const
{ {
int Best = -1; int Best = -1;
for(int i = 0; i < 200; i++) for(int i = 0; i < 200; i++)
@ -439,7 +439,7 @@ int *CClient::GetInput(int Tick) const
} }
if(Best != -1) if(Best != -1)
return (int *)m_aInputs[Best].m_aData; return (const int *)m_aInputs[Best].m_aData;
return 0; return 0;
} }
@ -591,7 +591,7 @@ int CClient::LoadData()
// --- // ---
void *CClient::SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const const void *CClient::SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const
{ {
CSnapshotItem *i; CSnapshotItem *i;
dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID"); dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
@ -617,7 +617,7 @@ void CClient::SnapInvalidateItem(int SnapID, int Index)
} }
} }
void *CClient::SnapFindItem(int SnapID, int Type, int ID) const const void *CClient::SnapFindItem(int SnapID, int Type, int ID) const
{ {
// TODO: linear search. should be fixed. // TODO: linear search. should be fixed.
int i; int i;

6
src/engine/client/client.h
View file

@ -212,7 +212,7 @@ public:
void SendInput(); void SendInput();
// TODO: OPT: do this alot smarter! // TODO: OPT: do this alot smarter!
virtual int *GetInput(int Tick) const; virtual const int *GetInput(int Tick) const;
const char *LatestVersion() const; const char *LatestVersion() const;
void VersionUpdate(); void VersionUpdate();
@ -236,9 +236,9 @@ public:
// --- // ---
void *SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const; const void *SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const;
void SnapInvalidateItem(int SnapID, int Index); void SnapInvalidateItem(int SnapID, int Index);
void *SnapFindItem(int SnapID, int Type, int ID) const; const void *SnapFindItem(int SnapID, int Type, int ID) const;
int SnapNumItems(int SnapID) const; int SnapNumItems(int SnapID) const;
void *SnapNewItem(int Type, int ID, int Size); void *SnapNewItem(int Type, int ID, int Size);
void SnapSetStaticsize(int ItemType, int Size); void SnapSetStaticsize(int ItemType, int Size);

6
src/game/client/gameclient.cpp
View file

@ -900,7 +900,7 @@ void CGameClient::OnNewSnapshot()
for(int Index = 0; Index < Num; Index++) for(int Index = 0; Index < Num; Index++)
{ {
IClient::CSnapItem Item; IClient::CSnapItem Item;
void *pData = Client()->SnapGetItem(IClient::SNAP_CURRENT, Index, &Item); const void *pData = Client()->SnapGetItem(IClient::SNAP_CURRENT, Index, &Item);
if(m_NetObjHandler.ValidateObj(Item.m_Type, pData, Item.m_DataSize) != 0) if(m_NetObjHandler.ValidateObj(Item.m_Type, pData, Item.m_DataSize) != 0)
{ {
if(g_Config.m_Debug) if(g_Config.m_Debug)
@ -1252,9 +1252,9 @@ void CGameClient::OnPredict()
if(m_LocalClientID == c) if(m_LocalClientID == c)
{ {
// apply player input // apply player input
int *pInput = Client()->GetInput(Tick); const int *pInput = Client()->GetInput(Tick);
if(pInput) if(pInput)
World.m_apCharacters[c]->m_Input = *((CNetObj_PlayerInput*)pInput); World.m_apCharacters[c]->m_Input = *((const CNetObj_PlayerInput*)pInput);
World.m_apCharacters[c]->Tick(true); World.m_apCharacters[c]->Tick(true);
} }
else else