From 1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sat, 12 Feb 2011 12:40:36 +0200 Subject: Refactoring & fixed WEAPONSPEC_GUN in content.py --- src/game/client/components/items.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/game/client/components/items.cpp') diff --git a/src/game/client/components/items.cpp b/src/game/client/components/items.cpp index 3379378b..fe14a339 100644 --- a/src/game/client/components/items.cpp +++ b/src/game/client/components/items.cpp @@ -15,7 +15,7 @@ #include "items.h" -void CItems::RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemId) +void CItems::RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemID) { // get positions @@ -70,12 +70,12 @@ void CItems::RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemId) if(!pInfo->m_Paused) Time += (Client()->LocalTime()-LastLocalTime)*pInfo->m_Speed; - Graphics()->QuadsSetRotation(Time*pi*2*2 + ItemId); + Graphics()->QuadsSetRotation(Time*pi*2*2 + ItemID); LastLocalTime = Client()->LocalTime(); } else - Graphics()->QuadsSetRotation(Client()->LocalTime()*pi*2*2 + ItemId); + Graphics()->QuadsSetRotation(Client()->LocalTime()*pi*2*2 + ItemID); } else { @@ -175,7 +175,7 @@ void CItems::RenderFlag(const CNetObj_Flag *pPrev, const CNetObj_Flag *pCurrent) Pos = vec2(pCurrent->m_X, pCurrent->m_Y); // make sure to use predicted position if we are the carrier - if(m_pClient->m_Snap.m_pLocalInfo && pCurrent->m_CarriedBy == m_pClient->m_Snap.m_pLocalInfo->m_ClientId) + if(m_pClient->m_Snap.m_pLocalInfo && pCurrent->m_CarriedBy == m_pClient->m_Snap.m_pLocalInfo->m_ClientID) Pos = m_pClient->m_LocalCharacterPos; IGraphics::CQuadItem QuadItem(Pos.x, Pos.y-Size*0.75f, Size, Size*2); @@ -262,11 +262,11 @@ void CItems::OnRender() if(Item.m_Type == NETOBJTYPE_PROJECTILE) { - RenderProjectile((const CNetObj_Projectile *)pData, Item.m_Id); + RenderProjectile((const CNetObj_Projectile *)pData, Item.m_ID); } else if(Item.m_Type == NETOBJTYPE_PICKUP) { - const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_Id); + const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_ID); if(pPrev) RenderPickup((const CNetObj_Pickup *)pPrev, (const CNetObj_Pickup *)pData); } @@ -284,7 +284,7 @@ void CItems::OnRender() if(Item.m_Type == NETOBJTYPE_FLAG) { - const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_Id); + const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_ID); if (pPrev) RenderFlag((const CNetObj_Flag *)pPrev, (const CNetObj_Flag *)pData); } -- cgit 1.4.1