kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#215 improved naming

Browse Source
This commit is contained in:
drian
2021-04-15 13:31:06 +02:00
parent 963190b072
commit 1535f9e4f6
8 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderhud.cpp
+4 -4
View File
@@ -522,7 +522,7 @@ void drawradar_showmap(playerent *p, int w, int h)
vec rtmp = vec(pl->o).sub(mdd).mul(coordtrans);
drawradarent(rtmp.x, rtmp.y, pl->yaw, pl->state==CS_ALIVE ? (isattacking(pl) ? 2 : 0) : 1, spect3rd && d == pl ? 2 : pl_baseteam, iconsize, isattacking(pl), "%s", colorname(pl));
}
if(m_genflags)
if(m_flags_)
{
glColor4f(1.0f, 1.0f, 1.0f, (sinf(lastmillis / 100.0f) + 1.0f) / 2.0f);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -616,7 +616,7 @@ void drawradar_vicinity(playerent *p, int w, int h)
drawradarent(rtmp.x, rtmp.y, pl->yaw, pl->state==CS_ALIVE ? (isattacking(pl) ? 2 : 0) : 1, spect3rd && d == pl ? 2 : pl_baseteam, iconsize, isattacking(pl), "%s", colorname(pl));
}
}
if(m_genflags)
if(m_flags_)
{
glColor4f(1.0f, 1.0f, 1.0f, (sinf(lastmillis / 100.0f) + 1.0f) / 2.0f);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -1048,13 +1048,13 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
popfont();
}
if((m_genflags || m_teammode) && !hideteamscorehud)
if((m_flags_ || m_teammode) && !hideteamscorehud)
{
glLoadIdentity();
glOrtho(0, VIRTW, VIRTH, 0, -1, 1);
glColor4f(1.0f, 1.0f, 1.0f, 0.2f);
turn_on_transparency(255);
int scores[4], offs = m_genflags ? 0 : 2;
int scores[4], offs = m_flags_ ? 0 : 2;
calcteamscores(scores);
const char *cc = scores[offs] > 99 || scores[offs + 1] > 99 ? "31" : "55";