fixed some compiler errors and warnings with clang

This commit is contained in:
Magnus Auvinen 2010-07-05 20:57:07 +02:00
parent d302ba921e
commit 575f72d978
9 changed files with 19 additions and 17 deletions

View file

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

View file

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

View file

@ -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;

View file

@ -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;

View file

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

View file

@ -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:

View file

@ -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,

View file

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

View file

@ -77,7 +77,7 @@ struct CQuad
int m_ColorEnvOffset;
};
struct CTile
class CTile
{
unsigned char m_Index;
unsigned char m_Flags;