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

fixed sound distance, mapreload vote

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1488 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-12-25 20:35:21 +00:00
parent bedf989f49
commit d617e97cdf
16 changed files with 126 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderhud.cpp
+18 -2
View File
@@ -330,11 +330,10 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
glEnable(GL_TEXTURE_2D);
playerent *targetplayer = playerincrosshair();
bool didteamkill = player1->lastteamkill && player1->lastteamkill + 5000 > lastmillis;
bool menu = menuvisible();
bool command = getcurcommand() ? true : false;
if(player1->state==CS_ALIVE && !player1->weaponsel->reloading && !didteamkill && !menu)
if(player1->state==CS_ALIVE && !player1->weaponsel->reloading && !menu)
{
bool drawteamwarning = targetplayer ? (isteam(targetplayer->team, player1->team) && targetplayer->state!=CS_DEAD) : false;
if(player1->weaponsel->type==GUN_SNIPER && scoped) drawscope();
@@ -368,6 +367,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
draw_textf("wvt %d", left, top+240, curvert);
draw_textf("evt %d", left, top+320, xtraverts);
}
if(!hidevote)
{
extern votedisplayinfo *curvote;
@@ -398,6 +398,22 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
hudmsgs.render();
if(player1->state==CS_DEAD && player1->spectating==SM_NONE)
{
glLoadIdentity();
glOrtho(0, VIRTW*3/2, VIRTH*3/2, 0, -1, 1);
const int left = (VIRTW*3/2)*6/8, top = (VIRTH*3/2)*3/4;
draw_textf("jump or switch weapons", left, top);
draw_textf("to enter spectator mode", left, top+80);
}
if(player1->state==CS_SPECTATE || (player1->state==CS_DEAD && player1->spectating!=SM_NONE))
{
glLoadIdentity();
glOrtho(0, VIRTW, VIRTH, 0, -1, 1);
draw_text("SPECTATING", VIRTW/40, VIRTH/10*7);
}
if(player1->state==CS_ALIVE)
{
glLoadIdentity();