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

Make more variables private

Browse source
This commit is contained in:
trml 2019-04-14 00:54:29 +02:00
parent c5c837e0e3
commit e88459acec
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/client/gameclient.h
View file

@ -382,22 +382,23 @@ public:
bool Predict() { return g_Config.m_ClPredict && !(m_Snap.m_pGameInfoObj && m_Snap.m_pGameInfoObj->m_GameStateFlags&GAMESTATEFLAG_GAMEOVER) && !m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK && m_Snap.m_pLocalCharacter; } bool Predict() { return g_Config.m_ClPredict && !(m_Snap.m_pGameInfoObj && m_Snap.m_pGameInfoObj->m_GameStateFlags&GAMESTATEFLAG_GAMEOVER) && !m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK && m_Snap.m_pLocalCharacter; }
bool PredictDummy() { return AntiPingPlayers() && Client()->DummyConnected() && m_Snap.m_LocalClientID >= 0 && m_PredictedDummyID >= 0; } bool PredictDummy() { return AntiPingPlayers() && Client()->DummyConnected() && m_Snap.m_LocalClientID >= 0 && m_PredictedDummyID >= 0; }
CGameWorld m_GameWorld;
CGameWorld m_PredictedWorld;
CGameWorld m_PrevPredictedWorld;
private:
bool m_DDRaceMsgSent[2];
int m_ShowOthers[2];
void UpdatePrediction(); void UpdatePrediction();
void UpdateRenderedCharacters(); void UpdateRenderedCharacters();
void DetectStrongHook(); void DetectStrongHook();
vec2 GetSmoothPos(int ClientID); vec2 GetSmoothPos(int ClientID);
CGameWorld m_GameWorld;
CGameWorld m_PredictedWorld;
CGameWorld m_PrevPredictedWorld;
int m_PredictedDummyID; int m_PredictedDummyID;
int m_IsDummySwapping; int m_IsDummySwapping;
CCharOrder m_CharOrder; CCharOrder m_CharOrder;
class CCharacter m_aLastWorldCharacters[MAX_CLIENTS]; class CCharacter m_aLastWorldCharacters[MAX_CLIENTS];
private:
bool m_DDRaceMsgSent[2];
int m_ShowOthers[2];
}; };

3
src/game/client/prediction/entities/projectile.h
View file

@ -10,6 +10,7 @@
class CProjectile : public CEntity class CProjectile : public CEntity
{ {
friend class CGameWorld; friend class CGameWorld;
friend class CItems;
public: public:
CProjectile CProjectile
( (
@ -33,7 +34,7 @@ public:
virtual void Tick(); virtual void Tick();
//private: private:
vec2 m_Direction; vec2 m_Direction;
int m_LifeSpan; int m_LifeSpan;
int m_Owner; int m_Owner;