Merge branch 'master' of http://github.com/matricks/teeworlds

4 files changed, 9 insertions, 10 deletions

diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index d4513393..42f68978 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -1200,8 +1200,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;