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

new voting

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1306 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-09-25 17:37:43 +00:00
parent 9856d020bb
commit ba07fc8cd1
9 changed files with 201 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderhud.cpp
+36
View File
@@ -38,6 +38,18 @@ void drawctficon(float x, float y, float s, int col, int row, float ts)
if(tex) drawicon(tex, x, y, s, col, row, ts);
}
void drawvoteicon(float x, float y, int col, int row)
{
static Texture *tex = NULL;
if(!tex) tex = textureload("packages/misc/voteicons.png");
if(tex)
{
glDisable(GL_BLEND);
drawicon(tex, x, y, 240, col, row, 1/2.0f);
glEnable(GL_BLEND);
}
}
VARP(crosshairsize, 0, 15, 50);
int dblend = 0;
@@ -49,6 +61,7 @@ VARP(hideradar, 0, 0, 1);
VARP(radarres, 1, 64, 1024);
VARP(radarentsize, 1, 4, 64);
VARP(hidectfhud, 0, 0, 1);
VARP(hidevote, 0, 0, 1);
VAR(showmap, 0, 0, 1);
@@ -325,6 +338,29 @@ 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;
if(curvote && curvote->millis >= lastmillis)
{
const int left = 20*2, top = VIRTH;
draw_textf("%s called a vote", left, top+240, colorname(curvote->owner, 10));
draw_textf("\f3§ %s", left, top+320, curvote->desc);
glColor3f(1,1,1);
switch(curvote->result)
{
case VOTE_NEUTRAL:
drawvoteicon(left, top, 0, 0);
draw_textf("Press F1/F2 to vote yes or no", left, top+400);
break;
default:
drawvoteicon(left, top, (curvote->result-1)&1, 1);
draw_textf("vote %s", left, top+400, curvote->result == VOTE_YES ? "PASSED" : "FAILED");
break;
}
draw_textf("%d yes vs. %d no", left, top+480, curvote->stats[VOTE_YES], curvote->stats[VOTE_NO]);
}
}
if(player1->state==CS_ALIVE)
{