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

Use OnReset function to reset damage indicators

Browse source 
The additional indirection with the `CEffects::ResetDamageIndicator` and `CDamageInd::Reset` functions to reset damage indicators is confusing and unnecessary. Always reset the damage indicators when disconnecting (in `OnReset`) instead of when entering the next game.
This commit is contained in:
Robert Müller 2024-07-26 18:13:35 +02:00
parent dac12c7afd
commit cd2a20f1f4
5 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/components/damageind.cpp
View file

@ -105,7 +105,7 @@ void CDamageInd::OnInit()
Graphics()->QuadContainerUpload(m_DmgIndQuadContainerIndex); Graphics()->QuadContainerUpload(m_DmgIndQuadContainerIndex);
} }
void CDamageInd::Reset() void CDamageInd::OnReset()
{ {
for(int i = 0; i < m_NumItems;) for(int i = 0; i < m_NumItems;)
{ {

2
src/game/client/components/damageind.h
View file

@ -37,7 +37,7 @@ public:
virtual int Sizeof() const override { return sizeof(*this); } virtual int Sizeof() const override { return sizeof(*this); }
void Create(vec2 Pos, vec2 Dir, float Alpha); void Create(vec2 Pos, vec2 Dir, float Alpha);
void Reset(); virtual void OnReset() override;
virtual void OnRender() override; virtual void OnRender() override;
virtual void OnInit() override; virtual void OnInit() override;
}; };

5
src/game/client/components/effects.cpp
View file

@ -53,11 +53,6 @@ void CEffects::DamageIndicator(vec2 Pos, vec2 Dir, float Alpha)
m_pClient->m_DamageInd.Create(Pos, Dir, Alpha); m_pClient->m_DamageInd.Create(Pos, Dir, Alpha);
} }
void CEffects::ResetDamageIndicator()
{
m_pClient->m_DamageInd.Reset();
}
void CEffects::PowerupShine(vec2 Pos, vec2 Size, float Alpha) void CEffects::PowerupShine(vec2 Pos, vec2 Size, float Alpha)
{ {
if(!m_Add50hz) if(!m_Add50hz)

1
src/game/client/components/effects.h
View file

@ -26,7 +26,6 @@ public:
void HammerHit(vec2 Pos, float Alpha = 1.0f); void HammerHit(vec2 Pos, float Alpha = 1.0f);
void AirJump(vec2 Pos, float Alpha = 1.0f); void AirJump(vec2 Pos, float Alpha = 1.0f);
void DamageIndicator(vec2 Pos, vec2 Dir, float Alpha = 1.0f); void DamageIndicator(vec2 Pos, vec2 Dir, float Alpha = 1.0f);
void ResetDamageIndicator();
void PlayerSpawn(vec2 Pos, float Alpha = 1.0f); void PlayerSpawn(vec2 Pos, float Alpha = 1.0f);
void PlayerDeath(vec2 Pos, int ClientId, float Alpha = 1.0f); void PlayerDeath(vec2 Pos, int ClientId, float Alpha = 1.0f);
void PowerupShine(vec2 Pos, vec2 Size, float Alpha = 1.0f); void PowerupShine(vec2 Pos, vec2 Size, float Alpha = 1.0f);

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

@ -1010,7 +1010,6 @@ void CGameClient::OnShutdown()
void CGameClient::OnEnterGame() void CGameClient::OnEnterGame()
{ {
m_Effects.ResetDamageIndicator();
} }
void CGameClient::OnGameOver() void CGameClient::OnGameOver()