diff options
| author | Choupom <andycootlapin@hotmail.fr> | 2011-09-06 15:27:56 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-12-04 14:21:20 +0100 |
| commit | 873c5a77bcf5331b07ae91510492fdd07c89509c (patch) | |
| tree | 51d0974c6ed6994a17730b893014313e24ce8f6c /src/game | |
| parent | 0fdc9c1b8e3e08623c3359a2d3bd863b95f9e0a6 (diff) | |
| download | zcatch-873c5a77bcf5331b07ae91510492fdd07c89509c.tar.gz zcatch-873c5a77bcf5331b07ae91510492fdd07c89509c.zip | |
some trivial fixes
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/client/components/items.cpp | 18 | ||||
| -rw-r--r-- | src/game/client/components/items.h | 4 | ||||
| -rw-r--r-- | src/game/client/render.cpp | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/game/client/components/items.cpp b/src/game/client/components/items.cpp index 827b28a7..1c338994 100644 --- a/src/game/client/components/items.cpp +++ b/src/game/client/components/items.cpp @@ -17,7 +17,7 @@ void CItems::OnReset() { - ExtraProjectilesNum = 0; + m_NumExtraProjectiles = 0; } void CItems::RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemID) @@ -310,23 +310,23 @@ void CItems::OnRender() } // render extra projectiles - for(int i = 0; i < ExtraProjectilesNum; i++) + for(int i = 0; i < m_NumExtraProjectiles; i++) { - if(aExtraProjectiles[i].m_StartTick < Client()->GameTick()) + if(m_aExtraProjectiles[i].m_StartTick < Client()->GameTick()) { - aExtraProjectiles[i] = aExtraProjectiles[ExtraProjectilesNum-1]; - ExtraProjectilesNum--; + m_aExtraProjectiles[i] = m_aExtraProjectiles[m_NumExtraProjectiles-1]; + m_NumExtraProjectiles--; } else - RenderProjectile(&aExtraProjectiles[i], 0); + RenderProjectile(&m_aExtraProjectiles[i], 0); } } void CItems::AddExtraProjectile(CNetObj_Projectile *pProj) { - if(ExtraProjectilesNum != MAX_EXTRA_PROJECTILES) + if(m_NumExtraProjectiles != MAX_EXTRA_PROJECTILES) { - aExtraProjectiles[ExtraProjectilesNum] = *pProj; - ExtraProjectilesNum++; + m_aExtraProjectiles[m_NumExtraProjectiles] = *pProj; + m_NumExtraProjectiles++; } } diff --git a/src/game/client/components/items.h b/src/game/client/components/items.h index 604c1b1c..caf6176b 100644 --- a/src/game/client/components/items.h +++ b/src/game/client/components/items.h @@ -11,8 +11,8 @@ class CItems : public CComponent MAX_EXTRA_PROJECTILES=32, }; - CNetObj_Projectile aExtraProjectiles[MAX_EXTRA_PROJECTILES]; - int ExtraProjectilesNum; + CNetObj_Projectile m_aExtraProjectiles[MAX_EXTRA_PROJECTILES]; + int m_NumExtraProjectiles; void RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemID); void RenderPickup(const CNetObj_Pickup *pPrev, const CNetObj_Pickup *pCurrent); diff --git a/src/game/client/render.cpp b/src/game/client/render.cpp index 93909d0c..278ed51a 100644 --- a/src/game/client/render.cpp +++ b/src/game/client/render.cpp @@ -75,7 +75,7 @@ void CRenderTools::SelectSprite(CDataSprite *pSpr, int Flags, int sx, int sy) void CRenderTools::SelectSprite(int Id, int Flags, int sx, int sy) { - if(Id < 0 || Id > g_pData->m_NumSprites) + if(Id < 0 || Id >= g_pData->m_NumSprites) return; SelectSprite(&g_pData->m_aSprites[Id], Flags, sx, sy); } |