FWGS
/
cs16-client-legacy
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline little functions

This commit is contained in:
a1batross 2016-07-08 19:14:05 +06:00
parent f7444b5402
commit 574ee7897b
4 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/hud/hud_spectator.cpp
View File

@ -1392,7 +1392,7 @@ void CHudSpectator::DrawOverviewEntities()
int playerNum = ent->index - 1;
m_vPlayerPos[playerNum][0] = screen[0];
m_vPlayerPos[playerNum][1] = screen[1] + Length(offset);
m_vPlayerPos[playerNum][1] = screen[1] + offset.Length();
m_vPlayerPos[playerNum][2] = 1; // mark player as visible
}

59
cl_dll/include/cl_util.h
View File

@ -125,11 +125,12 @@ inline void PlaySound( int iSound, float vol ) { gEngfuncs.pfnPlaySoundByIndex(
#define VectorAdd(a,b,c) {(c)[0]=(a)[0]+(b)[0];(c)[1]=(a)[1]+(b)[1];(c)[2]=(a)[2]+(b)[2];}
#define VectorCopy(a,b) {(b)[0]=(a)[0];(b)[1]=(a)[1];(b)[2]=(a)[2];}
inline void VectorClear(float *a) { a[0]=0.0;a[1]=0.0;a[2]=0.0;}
float Length(const float *v);
void VectorMA (const float *veca, float scale, const float *vecb, float *vecc);
void VectorScale (const float *in, float scale, float *out);
#define DotProduct(x,y) ((x)[0]*(y)[0]+(x)[1]*(y)[1]+(x)[2]*(y)[2])
#define VectorLength(a) ( sqrt( DotProduct( a, a )))
#define VectorMA(a, scale, b, c) ((c)[0] = (a)[0] + (scale) * (b)[0],(c)[1] = (a)[1] + (scale) * (b)[1],(c)[2] = (a)[2] + (scale) * (b)[2])
#define VectorScale(in, scale, out) ((out)[0] = (in)[0] * (scale),(out)[1] = (in)[1] * (scale),(out)[2] = (in)[2] * (scale))
float VectorNormalize (float *v);
void VectorInverse ( float *v );
#define VectorInverse(x) ((x)[0] = -(x)[0], (x)[1] = -(x)[1], (x)[2] = -(x)[2])
extern vec3_t vec3_origin;
@ -140,9 +141,55 @@ extern vec3_t vec3_origin;
#pragma warning( disable: 4305 )
#endif
HSPRITE LoadSprite(const char *pszName);
float *GetClientColor( int clientIndex );
void GetTeamColor( int &r, int &g, int &b, int teamIndex );
inline HSPRITE LoadSprite(const char *pszName)
{
int i;
char sz[256];
if (ScreenWidth < 640)
i = 320;
else
i = 640;
sprintf(sz, pszName, i);
return SPR_Load(sz);
}
extern vec3_t g_ColorRed, g_ColorBlue, g_ColorYellow, g_ColorGrey;
inline void GetTeamColor( int &r, int &g, int &b, int teamIndex )
{
r = 255;
g = 255;
b = 255;
switch( teamIndex )
{
case TEAM_TERRORIST:
r *= g_ColorRed[0];
g *= g_ColorRed[1];
b *= g_ColorRed[2];
break;
case TEAM_CT:
r *= g_ColorBlue[0];
g *= g_ColorBlue[1];
b *= g_ColorBlue[2];
break;
case TEAM_SPECTATOR:
case TEAM_UNASSIGNED:
r *= g_ColorYellow[0];
g *= g_ColorYellow[1];
b *= g_ColorYellow[2];
break;
default:
r *= g_ColorGrey[0];
g *= g_ColorGrey[1];
b *= g_ColorGrey[2];
break;
}
}
#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))

54
cl_dll/util.cpp
View File

@ -130,20 +130,6 @@ void VectorMA (const float *veca, float scale, const float *vecb, float *vecc)
vecc[2] = veca[2] + scale*vecb[2];
}
*/
HSPRITE LoadSprite(const char *pszName)
{
int i;
char sz[256];
if (ScreenWidth < 640)
i = 320;
else
i = 640;
sprintf(sz, pszName, i);
return SPR_Load(sz);
}
int HUD_GetSpriteIndexByName( const char *sz )
{
@ -160,11 +146,11 @@ wrect_t HUD_GetSpriteRect( int index )
return gHUD.GetSpriteRect( index );
}
float g_ColorBlue[3] = { 0.6, 0.8, 1.0 };
float g_ColorRed[3] = { 1.0, 0.25, 0.25 };
float g_ColorGreen[3] = { 0.6, 1.0, 0.6 };
float g_ColorYellow[3] = { 1.0, 0.7, 0.0 };
float g_ColorGrey[3] = { 0.8, 0.8, 0.8 };
vec3_t g_ColorBlue = { 0.6, 0.8, 1.0 };
vec3_t g_ColorRed = { 1.0, 0.25, 0.25 };
vec3_t g_ColorGreen = { 0.6, 1.0, 0.6 };
vec3_t g_ColorYellow = { 1.0, 0.7, 0.0 };
vec3_t g_ColorGrey = { 0.8, 0.8, 0.8 };
float *GetClientColor( int clientIndex )
{
@ -179,34 +165,4 @@ float *GetClientColor( int clientIndex )
}
}
void GetTeamColor(int &r, int &g, int &b, int teamIndex)
{
r = 255;
g = 255;
b = 255;
switch( teamIndex )
{
case TEAM_TERRORIST:
r *= g_ColorRed[0];
g *= g_ColorRed[1];
b *= g_ColorRed[2];
break;
case TEAM_CT:
r *= g_ColorBlue[0];
g *= g_ColorBlue[1];
b *= g_ColorBlue[2];
break;
case TEAM_SPECTATOR:
case TEAM_UNASSIGNED:
r *= g_ColorYellow[0];
g *= g_ColorYellow[1];
b *= g_ColorYellow[2];
break;
default:
r *= g_ColorGrey[0];
g *= g_ColorGrey[1];
b *= g_ColorGrey[2];
break;
}
}

2
pm_shared/pm_math.h
View File

@ -49,7 +49,7 @@ void AngleIMatrix(const vec_t *angles, float (*matrix)[4]);
void NormalizeAngles(float *angles);
void InterpolateAngles(float *start, float *end, float *output, float frac);
float AngleBetweenVectors(const vec_t *v1, const vec_t *v2);
void VectorTransform(const vec_t *in1, float *in2, vec_t *out);
void VectorTransform(const vec_t *in1, float (*in2)[4], vec_t *out);
int VectorCompare(const vec_t *v1, const vec_t *v2);
void VectorMA(const vec_t *veca, float scale, const vec_t *vecb, vec_t *vecc);