From 575f72d978c700e4bedb46f4083bf1c24726640e Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 5 Jul 2010 20:57:07 +0200 Subject: fixed some compiler errors and warnings with clang --- src/game/client/components/menus.cpp | 2 -- src/game/client/components/nameplates.h | 6 +++--- src/game/client/components/players.h | 8 ++++---- src/game/client/render.h | 3 ++- src/game/mapitems.h | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) (limited to 'src/game') diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 76943620..f3dddac7 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -1198,8 +1198,6 @@ void CMenus::RenderBackground() float sh = 300; Graphics()->MapScreen(0, 0, sw, sh); - CUIRect s = *UI()->Screen(); - // render background color Graphics()->TextureSet(-1); Graphics()->QuadsBegin(); diff --git a/src/game/client/components/nameplates.h b/src/game/client/components/nameplates.h index 279b6582..2c4ae6a7 100644 --- a/src/game/client/components/nameplates.h +++ b/src/game/client/components/nameplates.h @@ -5,9 +5,9 @@ class CNamePlates : public CComponent { void RenderNameplate( - const class CNetObj_Character *pPrevChar, - const class CNetObj_Character *pPlayerChar, - const class CNetObj_PlayerInfo *pPlayerInfo + const CNetObj_Character *pPrevChar, + const CNetObj_Character *pPlayerChar, + const CNetObj_PlayerInfo *pPlayerInfo ); public: diff --git a/src/game/client/components/players.h b/src/game/client/components/players.h index 57501380..8d24ea91 100644 --- a/src/game/client/components/players.h +++ b/src/game/client/components/players.h @@ -6,10 +6,10 @@ class CPlayers : public CComponent { void RenderHand(class CTeeRenderInfo *pInfo, vec2 CenterPos, vec2 Dir, float AngleOffset, vec2 PostRotOffset); void RenderPlayer( - const class CNetObj_Character *pPrevChar, - const class CNetObj_Character *pPlayerChar, - const class CNetObj_PlayerInfo *pPrevInfo, - const class CNetObj_PlayerInfo *pPlayerInfo + const CNetObj_Character *pPrevChar, + const CNetObj_Character *pPlayerChar, + const CNetObj_PlayerInfo *pPrevInfo, + const CNetObj_PlayerInfo *pPlayerInfo ); void RenderHook( const CNetObj_Character *pPrevChar, diff --git a/src/game/client/render.h b/src/game/client/render.h index a546b3eb..6d7c46a3 100644 --- a/src/game/client/render.h +++ b/src/game/client/render.h @@ -6,8 +6,9 @@ #include "ui.h" -struct CTeeRenderInfo +class CTeeRenderInfo { +public: CTeeRenderInfo() { m_Texture = -1; diff --git a/src/game/mapitems.h b/src/game/mapitems.h index efbd96f2..bb74cf4d 100644 --- a/src/game/mapitems.h +++ b/src/game/mapitems.h @@ -77,7 +77,7 @@ struct CQuad int m_ColorEnvOffset; }; -struct CTile +class CTile { unsigned char m_Index; unsigned char m_Flags; -- cgit 1.4.1 From a8acf8c6ff3af78369a0194b7f3ee34b5ab9df5c Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 5 Jul 2010 21:04:19 +0200 Subject: fixed missing public --- src/game/mapitems.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/game') diff --git a/src/game/mapitems.h b/src/game/mapitems.h index bb74cf4d..4fe4c159 100644 --- a/src/game/mapitems.h +++ b/src/game/mapitems.h @@ -79,6 +79,7 @@ struct CQuad class CTile { +public: unsigned char m_Index; unsigned char m_Flags; unsigned char m_Skip; -- cgit 1.4.1