From 563f0d81aece0d6815affe20ace40005cfaa5a1b Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 7 Aug 2008 11:45:28 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@937 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/game.c | 23 +++++++++++++---------- polymer/eduke32/source/osdcmds.c | 6 +++++- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 80d57bf6e..a532c434e 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -147,6 +147,9 @@ extern void computergetinput(int snum, input_t *syn); #define USERQUOTE_LEFTOFFSET 5 #define USERQUOTE_RIGHTOFFSET 14 +int althud_numbertile = 2930; +int althud_numberpal = 0; + enum { T_EOF = -2, @@ -1834,7 +1837,7 @@ static void altdigitalnumber(int x,int y,int n,char s,char cs) for (k=0;k>1); @@ -1844,10 +1847,10 @@ static void altdigitalnumber(int x,int y,int n,char s,char cs) // j = 0; for (k=0;kshield_amount,-16,10+16); if (p->got_access&1) rotatesprite(sbarxr(39-1),sbary(200-43+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1); - if (p->got_access&2) rotatesprite(sbarxr(34-1),sbary(200-41+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1); - if (p->got_access&4) rotatesprite(sbarxr(29-1),sbary(200-39+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1); + if (p->got_access&4) rotatesprite(sbarxr(34-1),sbary(200-41+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1); + if (p->got_access&2) rotatesprite(sbarxr(29-1),sbary(200-39+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1); if (p->got_access&1) rotatesprite(sbarxr(39),sbary(200-43),sbarsc(32768),0,ACCESSCARD,0,0,10+16,0,0,xdim-1,ydim-1); - if (p->got_access&2) rotatesprite(sbarxr(34),sbary(200-41),sbarsc(32768),0,ACCESSCARD,0,21,10+16,0,0,xdim-1,ydim-1); - if (p->got_access&4) rotatesprite(sbarxr(29),sbary(200-39),sbarsc(32768),0,ACCESSCARD,0,23,10+16,0,0,xdim-1,ydim-1); + if (p->got_access&4) rotatesprite(sbarxr(34),sbary(200-41),sbarsc(32768),0,ACCESSCARD,0,23,10+16,0,0,xdim-1,ydim-1); + if (p->got_access&2) rotatesprite(sbarxr(29),sbary(200-39),sbarsc(32768),0,ACCESSCARD,0,21,10+16,0,0,xdim-1,ydim-1); i = 32768; if (p->curr_weapon == PISTOL_WEAPON) i = 16384; @@ -3687,7 +3690,7 @@ void displayrest(int smoothratio) { if (ud.screen_size == 4) { - i = scale(tilesizy[INVENTORYBOX]+2,ud.statusbarscale,100); + i = scale(tilesizy[ud.althud ? SHIELD : INVENTORYBOX]+2,ud.statusbarscale,100); j = scale(scale(6,ud.config.ScreenWidth,320),ud.statusbarscale,100); } else if (ud.screen_size > 2) diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c index 44fd7e689..64131a4e9 100644 --- a/polymer/eduke32/source/osdcmds.c +++ b/polymer/eduke32/source/osdcmds.c @@ -35,6 +35,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern int voting, doquicksave; struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat; float r_ambientlight = 1.0, r_ambientlightrecip = 1.0; +extern int althud_numbertile; +extern int althud_numberpal; static inline int osdcmd_quit(const osdfuncparm_t *parm) { @@ -656,7 +658,9 @@ cvarmappings cvar[] = { { "crosshair", "crosshair: enable/disable crosshair", (void*)&ud.crosshair, CVAR_BOOL, 0, 0, 1 }, - { "cl_althud", "cl_althud: enable/disable alternate mini-hud", (void*)&ud.althud, CVAR_BOOL, 0, 0, 1 }, + { "hud_althud", "hud_althud: enable/disable alternate mini-hud", (void*)&ud.althud, CVAR_BOOL, 0, 0, 1 }, + { "hud_althudnumbertile", "hud_althudnumbertile: first tile in alt hud number set", (void*)&althud_numbertile, CVAR_INT, 0, 0, MAXTILES-10 }, + { "hud_althudnumberpal", "hud_althudnumberpal: pal for alt hud numbers", (void*)&althud_numberpal, CVAR_INT, 0, 0, MAXPALOOKUPS }, { "cl_autoaim", "cl_autoaim: enable/disable weapon autoaim", (void*)&ud.config.AutoAim, CVAR_INT|CVAR_MULTI, 0, 0, 2 }, { "cl_automsg", "cl_automsg: enable/disable automatically sending messages to all players", (void*)&ud.automsg, CVAR_BOOL, 0, 0, 1 }, { "cl_autovote", "cl_autovote: enable/disable automatic voting", (void*)&ud.autovote, CVAR_INT|CVAR_MULTI, 0, 0, 2 },