zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@937 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-08-07 11:45:28 +00:00
parent ddf53e9516
commit 563f0d81ae
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
polymer/eduke32/source/game.c
View file

@ -147,6 +147,9 @@ extern void computergetinput(int snum, input_t *syn);
#define USERQUOTE_LEFTOFFSET 5 #define USERQUOTE_LEFTOFFSET 5
#define USERQUOTE_RIGHTOFFSET 14 #define USERQUOTE_RIGHTOFFSET 14
int althud_numbertile = 2930;
int althud_numberpal = 0;
enum enum
{ {
T_EOF = -2, T_EOF = -2,
@ -1834,7 +1837,7 @@ static void altdigitalnumber(int x,int y,int n,char s,char cs)
for (k=0;k<i;k++) for (k=0;k<i;k++)
{ {
p = 2930+*(b+k)-'0'; p = althud_numbertile+*(b+k)-'0';
j += tilesizx[p]+1; j += tilesizx[p]+1;
} }
c = x-(j>>1); c = x-(j>>1);
@ -1844,10 +1847,10 @@ static void altdigitalnumber(int x,int y,int n,char s,char cs)
// j = 0; // j = 0;
for (k=0;k<i;k++) for (k=0;k<i;k++)
{ {
p = 2930+*(b+k)-'0'; p = althud_numbertile+*(b+k)-'0';
if (shd) if (shd)
rotatesprite(sbarxr(c+j-1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|1|32,0,0,xdim-1,ydim-1); rotatesprite(sbarxr(c+j-1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|1|32,0,0,xdim-1,ydim-1);
rotatesprite(sbarxr(c+j),sbary(y),sbarsc(65536L),0,p,s,0,cs,0,0,xdim-1,ydim-1); rotatesprite(sbarxr(c+j),sbary(y),sbarsc(65536L),0,p,s,althud_numberpal,cs,0,0,xdim-1,ydim-1);
j -= tilesizx[p]+1; j -= tilesizx[p]+1;
} }
return; return;
@ -1855,10 +1858,10 @@ static void altdigitalnumber(int x,int y,int n,char s,char cs)
j = 0; j = 0;
for (k=0;k<i;k++) for (k=0;k<i;k++)
{ {
p = 2930+*(b+k)-'0'; p = althud_numbertile+*(b+k)-'0';
if (shd) if (shd)
rotatesprite(sbarx(c+j+1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|1|32,0,0,xdim-1,ydim-1); rotatesprite(sbarx(c+j+1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|1|32,0,0,xdim-1,ydim-1);
rotatesprite(sbarx(c+j),sbary(y),sbarsc(65536L),0,p,s,0,cs,0,0,xdim-1,ydim-1); rotatesprite(sbarx(c+j),sbary(y),sbarsc(65536L),0,p,s,althud_numberpal,cs,0,0,xdim-1,ydim-1);
j += tilesizx[p]+1; j += tilesizx[p]+1;
} }
} }
@ -2029,12 +2032,12 @@ static void coolgaugetext(int snum)
altdigitalnumber(105,-(200-22),p->shield_amount,-16,10+16); altdigitalnumber(105,-(200-22),p->shield_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&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(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&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&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(34),sbary(200-41),sbarsc(32768),0,ACCESSCARD,0,23,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&2) rotatesprite(sbarxr(29),sbary(200-39),sbarsc(32768),0,ACCESSCARD,0,21,10+16,0,0,xdim-1,ydim-1);
i = 32768; i = 32768;
if (p->curr_weapon == PISTOL_WEAPON) i = 16384; if (p->curr_weapon == PISTOL_WEAPON) i = 16384;
@ -3687,7 +3690,7 @@ void displayrest(int smoothratio)
{ {
if (ud.screen_size == 4) 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); j = scale(scale(6,ud.config.ScreenWidth,320),ud.statusbarscale,100);
} }
else if (ud.screen_size > 2) else if (ud.screen_size > 2)

6
polymer/eduke32/source/osdcmds.c
View file

@ -35,6 +35,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern int voting, doquicksave; extern int voting, doquicksave;
struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat; struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat;
float r_ambientlight = 1.0, r_ambientlightrecip = 1.0; 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) 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 }, { "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_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_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 }, { "cl_autovote", "cl_autovote: enable/disable automatic voting", (void*)&ud.autovote, CVAR_INT|CVAR_MULTI, 0, 0, 2 },