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

bug fix: disconnect when ignoring or mute, disrupt password connection force attempts; adds: whereami and go_to (useful for edit), logs about items (allowing the clips to be 3 cubes distant), and clean up

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5593 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-08-10 04:54:16 +00:00
parent 5c693f194f
commit 001baa1731
6 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderhud.cpp
+5 -5
View File
@@ -736,19 +736,19 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
bool menu = menuvisible();
bool command = getcurcommand() ? true : false;
if((p->state==CS_ALIVE || p->state==CS_EDITING) && !p->weaponsel->reloading)
{
bool drawteamwarning = crosshairteamsign && targetplayer && isteam(targetplayer->team, p->team) && targetplayer->state==CS_ALIVE;
p->weaponsel->renderaimhelp(drawteamwarning);
}
{
bool drawteamwarning = crosshairteamsign && targetplayer && isteam(targetplayer->team, p->team) && targetplayer->state==CS_ALIVE;
p->weaponsel->renderaimhelp(drawteamwarning);
}
drawdmgindicator();
if(p->state==CS_ALIVE && !hidehudequipment) drawequipicons(p);
if(/*!menu &&*/ (!hideradar || showmap)) drawradar(p, w, h);
if(!editmode)
{
glMatrixMode(GL_MODELVIEW);
if(/*!menu &&*/ (!hideradar || showmap)) drawradar(p, w, h);
if(!hideteam && m_teammode) drawteamicons(w, h);
glMatrixMode(GL_PROJECTION);
}