From dbc83446d5a614d8f42f594b574f2f2e7f759898 Mon Sep 17 00:00:00 2001 From: a1batross Date: Wed, 6 Apr 2016 01:00:48 +0300 Subject: [PATCH] Update client --- cl_dll/draw_util.cpp | 3 ++- cl_dll/hud/hud_spectator.cpp | 2 +- cl_dll/include/cl_util.h | 2 ++ cl_dll/include/hud/hud.h | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cl_dll/draw_util.cpp b/cl_dll/draw_util.cpp index d2d17d8..7cca548 100644 --- a/cl_dll/draw_util.cpp +++ b/cl_dll/draw_util.cpp @@ -336,12 +336,13 @@ int DrawUtils::TextMessageDrawChar( int x, int y, int number, int r, int g, int int ret; if( scale && g_iMobileAPIVersion ) { - ret = gMobileAPI.pfnDrawScaledCharacter( x, y, number, r, g, b, scale ); + ret = gMobileAPI.pfnDrawScaledCharacter( x, y, number, r, g, b, scale ) * scale; } else { ret = gEngfuncs.pfnDrawCharacter( x, y, number, r, g, b ); } + return ret; } void DrawUtils::Draw2DQuad( float x1, float y1, float x2, float y2 ) diff --git a/cl_dll/hud/hud_spectator.cpp b/cl_dll/hud/hud_spectator.cpp index abe7ea5..9b1f03a 100644 --- a/cl_dll/hud/hud_spectator.cpp +++ b/cl_dll/hud/hud_spectator.cpp @@ -883,7 +883,7 @@ void CHudSpectator::SetModes(int iNewMainMode, int iNewInsetMode) return; } - if ( !g_iUser2 && (iNewMainMode !=OBS_ROAMING ) ) // make sure we have a target + if ( !g_iUser2 && (iNewMainMode != OBS_ROAMING ) ) // make sure we have a target { // choose last Director object if still available if ( IsActivePlayer( gEngfuncs.GetEntityByIndex( m_lastPrimaryObject ) ) ) diff --git a/cl_dll/include/cl_util.h b/cl_dll/include/cl_util.h index ab286d8..4b58f12 100644 --- a/cl_dll/include/cl_util.h +++ b/cl_dll/include/cl_util.h @@ -141,4 +141,6 @@ HSPRITE LoadSprite(const char *pszName); float *GetClientColor( int clientIndex ); void GetTeamColor( int &r, int &g, int &b, int teamIndex ); #define bound( min, num, max ) ((num) >= (min) ? ((num) < (max) ? (num) : (max)) : (min)) +#define RAD2DEG( x ) ((float)(x) * (float)(180.f / M_PI)) +#define DEG2RAD( x ) ((float)(x) * (float)(M_PI / 180.f)) diff --git a/cl_dll/include/hud/hud.h b/cl_dll/include/hud/hud.h index 100e7e4..b642287 100644 --- a/cl_dll/include/hud/hud.h +++ b/cl_dll/include/hud/hud.h @@ -814,6 +814,7 @@ public: bool m_bBombPlanted; int m_iPlayerLastPointedAt; + static float m_fTextScale; private: // szMapName is 64 bytes only. Removing "maps/" and ".bsp" gived me this result