From 143af11a25bc4a944c3605b9a165ffd2f1970641 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Thu, 17 Jun 2010 10:34:51 +0200 Subject: [PATCH 1/3] added a .gitignore file --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..91c00b3a0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +.bam +src/game/generated +objs +datasrc/*.pyc +config.lua + +teeworlds_d +teeworlds_srv_d From 575f72d978c700e4bedb46f4083bf1c24726640e Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 5 Jul 2010 20:57:07 +0200 Subject: [PATCH 2/3] fixed some compiler errors and warnings with clang --- src/base/tl/array.h | 2 +- src/base/vmath.h | 2 ++ src/engine/client/text.cpp | 7 ++++--- src/engine/textrender.h | 4 ++-- 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 +- 9 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/base/tl/array.h b/src/base/tl/array.h index 580f46827..14c83295e 100644 --- a/src/base/tl/array.h +++ b/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; } /* diff --git a/src/base/vmath.h b/src/base/vmath.h index 49dd26d1d..2be3e6ebf 100644 --- a/src/base/vmath.h +++ b/src/base/vmath.h @@ -2,6 +2,8 @@ #ifndef BASE_VMATH_H #define BASE_VMATH_H +#include + // ------------------------------------ template diff --git a/src/engine/client/text.cpp b/src/engine/client/text.cpp index 8fa8efeeb..672fde60d 100644 --- a/src/engine/client/text.cpp +++ b/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; diff --git a/src/engine/textrender.h b/src/engine/textrender.h index 7c7e036b5..38dd5d864 100644 --- a/src/engine/textrender.h +++ b/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; diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 76943620b..f3dddac7a 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 279b6582d..2c4ae6a7c 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 575013804..8d24ea918 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 a546b3eb3..6d7c46a3c 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 efbd96f25..bb74cf4d4 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; From a8acf8c6ff3af78369a0194b7f3ee34b5ab9df5c Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 5 Jul 2010 21:04:19 +0200 Subject: [PATCH 3/3] fixed missing public --- src/game/mapitems.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/game/mapitems.h b/src/game/mapitems.h index bb74cf4d4..4fe4c1599 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;