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@438 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2006-12-28 20:36:38 +00:00
parent d2566913bb
commit f74c413b68
3 changed files with 45 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/source/funct.h
View file

@ -113,7 +113,6 @@ extern void savetemp(const char *fn,long daptr,long dasiz);
extern int loadplayer(signed char spot); extern int loadplayer(signed char spot);
extern int saveplayer(signed char spot); extern int saveplayer(signed char spot);
extern inline int menutext(int x,int y,short s,short p,const char *t); extern inline int menutext(int x,int y,short s,short p,const char *t);
extern int getfilenames(const char *path, char kind[]);
extern void menus(void); extern void menus(void);
extern void palto(char r,char g,char b,long e); extern void palto(char r,char g,char b,long e);
extern void playanm(const char *fn,char); extern void playanm(const char *fn,char);

13
polymer/eduke32/source/gamedef.c
View file

@ -4427,20 +4427,19 @@ repeatcase:
static void passone(void) static void passone(void)
{ {
#ifdef DEBUG
int i;
#endif
while (parsecommand() == 0); while (parsecommand() == 0);
if ((error+warning) > 63) if ((error+warning) > 63)
initprintf("fatal error: too many warnings or errors: Aborted\n"); initprintf("fatal error: too many warnings or errors: Aborted\n");
#ifdef DEBUG #ifdef DEBUG
initprintf("Game Definitions\n");
for (i=0;i<iGameVarCount;i++)
{ {
initprintf("%20s\t%d\n",apszGameVarLabel[i],lGameVarValue[i]); int i=0;
initprintf("Game Definitions\n");
for (;i<iGameVarCount;i++)
{
initprintf("%20s\t%d\n",apszGameVarLabel[i],lGameVarValue[i]);
}
} }
#endif #endif
} }

48
polymer/eduke32/source/menus.c
View file

@ -501,7 +501,7 @@ static void clearfilenames(void)
numfiles = numdirs = 0; numfiles = numdirs = 0;
} }
int getfilenames(const char *path, char kind[]) static int getfilenames(const char *path, char kind[])
{ {
CACHE1D_FIND_REC *r; CACHE1D_FIND_REC *r;
@ -539,8 +539,6 @@ void check_player_color(int *color,int prev_color)
void sendquit(void) void sendquit(void)
{ {
int i;
if (gamequit == 0 && (numplayers > 1)) if (gamequit == 0 && (numplayers > 1))
{ {
if (ps[myconnectindex].gm&MODE_GAME) if (ps[myconnectindex].gm&MODE_GAME)
@ -550,6 +548,8 @@ void sendquit(void)
} }
else else
{ {
int i;
tempbuf[0] = 254; tempbuf[0] = 254;
tempbuf[1] = myconnectindex; tempbuf[1] = myconnectindex;
@ -600,6 +600,7 @@ void menus(void)
x = 0; x = 0;
sh = 4-(sintable[(totalclock<<4)&2047]>>11); sh = 4-(sintable[(totalclock<<4)&2047]>>11);
if (bpp > 8) if (bpp > 8)
{ {
long x,y,y1=0,y2=ydim; long x,y,y1=0,y2=ydim;
@ -607,15 +608,42 @@ void menus(void)
for (x=0;x<xdim;x+=tilesizx[BIGHOLE]) for (x=0;x<xdim;x+=tilesizx[BIGHOLE])
rotatesprite(x<<16,y<<16,65536L,0,BIGHOLE,80,0,1+8+16,0,0,xdim-1,ydim-1); rotatesprite(x<<16,y<<16,65536L,0,BIGHOLE,80,0,1+8+16,0,0,xdim-1,ydim-1);
} }
if (!(current_menu >= 1000 && current_menu <= 2999 && current_menu >= 300 && current_menu <= 369)) if (!(current_menu >= 1000 && current_menu <= 2999 && current_menu >= 300 && current_menu <= 369))
vscrn(); vscrn();
if (KB_KeyPressed(sc_Q) && current_menu >= 0 && (current_menu > 502 || current_menu < 500) && current_menu != 20003 && if (KB_KeyPressed(sc_Q))
current_menu != 20005 && current_menu != 210 && current_menu != 603 && current_menu != 10001 && !(current_menu > 359 && current_menu < 370))
{ {
last_menu = current_menu; switch (current_menu)
last_probey = probey; {
cmenu(502); case 210:
case 360:
case 361:
case 362:
case 363:
case 364:
case 365:
case 366:
case 367:
case 368:
case 369:
case 500:
case 501:
case 502:
case 603:
case 10001:
case 20003:
case 20005:
break;
default:
if (current_menu >= 0)
{
last_menu = current_menu;
last_probey = probey;
cmenu(502);
}
break;
}
} }
switch (current_menu) switch (current_menu)
@ -795,7 +823,7 @@ void menus(void)
menutext(40,50+16+16+16,MENUHIGHLIGHT(3),0,"AUTO AIM"); menutext(40,50+16+16+16,MENUHIGHLIGHT(3),0,"AUTO AIM");
menutext(40,50+16+16+16+16,MENUHIGHLIGHT(4),0,"WEAPON SWITCH"); menutext(40,50+16+16+16+16,MENUHIGHLIGHT(4),0,"WEAPON SWITCH");
menutext(40,50+16+16+16+16+16,MENUHIGHLIGHT(5),0,"AIMING TYPE"); menutext(40,50+16+16+16+16+16,MENUHIGHLIGHT(5),0,"AIMING TYPE");
menutext(40,50+16+16+16+16+16+16,MENUHIGHLIGHT(6),0,"MACRO SETUP"); menutext(40,50+16+16+16+16+16+16,MENUHIGHLIGHT(6),0,"TAUNT MACRO SETUP");
if (current_menu == 20002) if (current_menu == 20002)
{ {
@ -825,7 +853,7 @@ void menus(void)
case 20004: case 20004:
case 20005: case 20005:
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
menutext(160,24,0,0,"MACRO SETUP"); menutext(160,24,0,0,"TAUNT MACRO SETUP");
if (current_menu == 20004) if (current_menu == 20004)
{ {