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

.gitignore

@@ -0,0 +1,8 @@
+.bam
+src/game/generated
+objs
+datasrc/*.pyc
+config.lua
+
+teeworlds_d
+teeworlds_srv_d

src/base/tl/array.h

@@ -283,7 +283,7 @@ public:
 	*/
 	int memusage()
 	{
-		return sizeof(array) + sizeof(T)*size;
+		return sizeof(array) + sizeof(T)*list_size;
 	}
 
 	/*

src/base/vmath.h

@@ -2,6 +2,8 @@
 #ifndef BASE_VMATH_H
 #define BASE_VMATH_H
 
+#include <math.h>
+
 // ------------------------------------
 
 template<typename T>

src/engine/client/text.cpp

@@ -67,8 +67,9 @@ struct CFontSizeData
 	int m_CurrentCharacter;	
 };
 
-struct CFont
+class CFont
 {
+public:
 	char m_aFilename[128];
 	FT_Face m_FtFace;
 	CFontSizeData m_aSizes[NUM_FONT_SIZES];
@@ -101,7 +102,7 @@ class CTextRender : public IEngineTextRender
 	
 	int m_FontTextureFormat;
 
-	struct CFont *m_pDefaultFont;
+	CFont *m_pDefaultFont;
 
 	FT_Library m_FTLibrary;
 	
@@ -470,7 +471,7 @@ public:
 		mem_free(pFont);
 	}
 
-	virtual void SetDefaultFont(struct CFont *pFont)
+	virtual void SetDefaultFont(CFont *pFont)
 	{
 		dbg_msg("textrender", "default pFont set %p", pFont);
 		m_pDefaultFont = pFont;

src/engine/textrender.h

@@ -23,7 +23,7 @@ public:
 	float m_LineWidth;
 	float m_X, m_Y;
 	
-	struct CFont *m_pFont;
+	CFont *m_pFont;
 	float m_FontSize;
 };
 
@@ -36,7 +36,7 @@ public:
 	virtual CFont *LoadFont(const char *pFilename) = 0;
 	virtual void DestroyFont(CFont *pFont) = 0;
 	
-	virtual void SetDefaultFont(struct CFont *pFont) = 0;
+	virtual void SetDefaultFont(CFont *pFont) = 0;
 
 	//
 	virtual void TextEx(CTextCursor *pCursor, const char *pText, int Length) = 0;

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();

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:

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,

src/game/client/render.h

@@ -6,8 +6,9 @@
 #include "ui.h"
 
 
-struct CTeeRenderInfo
+class CTeeRenderInfo
 {
+public:
 	CTeeRenderInfo()
 	{
 		m_Texture = -1;

src/game/mapitems.h

@@ -77,8 +77,9 @@ struct CQuad
 	int m_ColorEnvOffset;
 };
 
-struct CTile
+class CTile
 {
+public:
 	unsigned char m_Index;
 	unsigned char m_Flags;
 	unsigned char m_Skip;