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

Added EVENT_DISPLAYSTATUSBAR and moved the "detail" option out of game options and into the video setup menu (but only while classic mode is enabled).

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@492 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2007-02-13 02:22:17 +00:00
parent ef8f308c9b
commit 32470fe65c
4 changed files with 71 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -701,6 +701,7 @@ enum events {
EVENT_DRAWWEAPON, EVENT_DRAWWEAPON,
EVENT_DISPLAYCROSSHAIR, EVENT_DISPLAYCROSSHAIR,
EVENT_DISPLAYREST, EVENT_DISPLAYREST,
EVENT_DISPLAYSBAR,
EVENT_RESETPLAYER, EVENT_RESETPLAYER,
EVENT_INCURDAMAGE, EVENT_INCURDAMAGE,
EVENT_AIMDOWN, EVENT_AIMDOWN,

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

@ -1893,8 +1893,6 @@ static void coolgaugetext(int snum)
long i, j, o, ss, u; long i, j, o, ss, u;
int permbit; int permbit;
if (p->invdisptime > 0) displayinventory(p);
if (ps[snum].gm&MODE_MENU) if (ps[snum].gm&MODE_MENU)
if ((current_menu >= 400 && current_menu <= 405)) if ((current_menu >= 400 && current_menu <= 405))
return; return;
@ -3362,7 +3360,13 @@ void displayrest(long smoothratio)
} }
} }
if (pp->invdisptime > 0) displayinventory(pp);
SetGameVarID(g_iReturnVarID,0,ps[screenpeek].i,screenpeek);
OnEvent(EVENT_DISPLAYSBAR, ps[screenpeek].i, screenpeek, -1);
if (GetGameVarID(g_iReturnVarID,ps[screenpeek].i,screenpeek) == 0)
coolgaugetext(screenpeek); coolgaugetext(screenpeek);
operatefta(); operatefta();
if (KB_KeyPressed(sc_Escape) && ud.overhead_on == 0 if (KB_KeyPressed(sc_Escape) && ud.overhead_on == 0
@ -3954,7 +3958,7 @@ void displayrooms(int snum,long smoothratio)
i = sintable[i+512]*8 + sintable[i]*5L; i = sintable[i+512]*8 + sintable[i]*5L;
setaspect(i>>1,yxaspect); setaspect(i>>1,yxaspect);
} }
else if (getrendermode() > 0 /*&& (p->rotscrnang || p->orotscrnang)*/) else if (getrendermode() > 0 && ud.screen_tilting /*&& (p->rotscrnang || p->orotscrnang)*/)
{ {
setrollangle(p->orotscrnang + mulscale16(((p->rotscrnang - p->orotscrnang + 1024)&2047)-1024,smoothratio)); setrollangle(p->orotscrnang + mulscale16(((p->rotscrnang - p->orotscrnang + 1024)&2047)-1024,smoothratio));
p->orotscrnang = p->rotscrnang; // JBF: save it for next time p->orotscrnang = p->rotscrnang; // JBF: save it for next time
@ -10193,7 +10197,7 @@ MAIN_LOOP_RESTART:
else else
i = 65536; i = 65536;
if (ud.statusbarmode == 1 && ud.statusbarscale == 100) if (ud.statusbarmode == 1 && (ud.statusbarscale == 100 || bpp == 8))
{ {
ud.statusbarmode = 0; ud.statusbarmode = 0;
vscrn(); vscrn();

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

@ -1047,6 +1047,7 @@ char CheckEventSync(int iEventID)
case EVENT_DISPLAYCROSSHAIR: case EVENT_DISPLAYCROSSHAIR:
case EVENT_DISPLAYREST: case EVENT_DISPLAYREST:
case EVENT_DISPLAYROOMS: case EVENT_DISPLAYROOMS:
case EVENT_DISPLAYSBAR:
case EVENT_DISPLAYWEAPON: case EVENT_DISPLAYWEAPON:
case EVENT_DRAWWEAPON: case EVENT_DRAWWEAPON:
case EVENT_ENTERLEVEL: case EVENT_ENTERLEVEL:
@ -4547,6 +4548,7 @@ static void AddDefaultDefinitions(void)
AddDefinition("EVENT_DISPLAYCROSSHAIR",EVENT_DISPLAYCROSSHAIR,LABEL_DEFINE); AddDefinition("EVENT_DISPLAYCROSSHAIR",EVENT_DISPLAYCROSSHAIR,LABEL_DEFINE);
AddDefinition("EVENT_DISPLAYREST",EVENT_DISPLAYREST,LABEL_DEFINE); AddDefinition("EVENT_DISPLAYREST",EVENT_DISPLAYREST,LABEL_DEFINE);
AddDefinition("EVENT_DISPLAYROOMS",EVENT_DISPLAYROOMS,LABEL_DEFINE); AddDefinition("EVENT_DISPLAYROOMS",EVENT_DISPLAYROOMS,LABEL_DEFINE);
AddDefinition("EVENT_DISPLAYSBAR",EVENT_DISPLAYSBAR,LABEL_DEFINE);
AddDefinition("EVENT_DISPLAYWEAPON",EVENT_DISPLAYWEAPON,LABEL_DEFINE); AddDefinition("EVENT_DISPLAYWEAPON",EVENT_DISPLAYWEAPON,LABEL_DEFINE);
AddDefinition("EVENT_DOFIRE",EVENT_DOFIRE,LABEL_DEFINE); AddDefinition("EVENT_DOFIRE",EVENT_DOFIRE,LABEL_DEFINE);
AddDefinition("EVENT_DRAWWEAPON",EVENT_DRAWWEAPON,LABEL_DEFINE); AddDefinition("EVENT_DRAWWEAPON",EVENT_DRAWWEAPON,LABEL_DEFINE);

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

@ -2519,7 +2519,6 @@ cheat_for_port_credits:
"-", "-",
"Run key style", "Run key style",
"-", "-",
"Detail",
"Shadows", "Shadows",
"Screen tilting", "Screen tilting",
"-", "-",
@ -2529,6 +2528,8 @@ cheat_for_port_credits:
"-", "-",
"-", "-",
"-", "-",
"-",
"-",
"More...", "More...",
NULL NULL
}; };
@ -2617,32 +2618,27 @@ cheat_for_port_credits:
gametextpal(d,yy, ud.runkey_mode ? "Classic" : "Modern", MENUHIGHLIGHT(io), 0); gametextpal(d,yy, ud.runkey_mode ? "Classic" : "Modern", MENUHIGHLIGHT(io), 0);
break; break;
case 5: case 5:
if (x==io) ud.detail = 1-ud.detail;
modval(0,1,(int *)&ud.detail,1,probey==io);
gametextpal(d,yy, ud.detail ? "High" : "Low", MENUHIGHLIGHT(io), 0);
break;
case 6:
if (x==io) ud.shadows = 1-ud.shadows; if (x==io) ud.shadows = 1-ud.shadows;
modval(0,1,(int *)&ud.shadows,1,probey==io); modval(0,1,(int *)&ud.shadows,1,probey==io);
gametextpal(d,yy, ud.shadows ? "On" : "Off", MENUHIGHLIGHT(io), 0); gametextpal(d,yy, ud.shadows ? "On" : "Off", MENUHIGHLIGHT(io), 0);
break; break;
case 7: case 6:
if (x==io) ud.screen_tilting = 1-ud.screen_tilting; if (x==io) ud.screen_tilting = 1-ud.screen_tilting;
modval(0,1,(int *)&ud.screen_tilting,1,probey==io); modval(0,1,(int *)&ud.screen_tilting,1,probey==io);
gametextpal(d,yy, ud.screen_tilting ? "On" : "Off", MENUHIGHLIGHT(io), 0); gametextpal(d,yy, ud.screen_tilting ? "On" : "Off", MENUHIGHLIGHT(io), 0);
break; // original had a 'full' option break; // original had a 'full' option
case 8: case 7:
if (x==io) ud.showweapons = 1-ud.showweapons; if (x==io) ud.showweapons = 1-ud.showweapons;
modval(0,1,(int *)&ud.showweapons,1,probey==io); modval(0,1,(int *)&ud.showweapons,1,probey==io);
ShowOpponentWeapons = ud.showweapons; ShowOpponentWeapons = ud.showweapons;
gametextpal(d,yy, ShowOpponentWeapons ? "On" : "Off", MENUHIGHLIGHT(io), 0); gametextpal(d,yy, ShowOpponentWeapons ? "On" : "Off", MENUHIGHLIGHT(io), 0);
break; break;
case 9: case 8:
if (x==io) ud.democams = 1-ud.democams; if (x==io) ud.democams = 1-ud.democams;
modval(0,1,(int *)&ud.democams,1,probey==io); modval(0,1,(int *)&ud.democams,1,probey==io);
gametextpal(d,yy, ud.democams ? "On" : "Off", MENUHIGHLIGHT(io), 0); gametextpal(d,yy, ud.democams ? "On" : "Off", MENUHIGHLIGHT(io), 0);
break; break;
case 10: case 9:
if (x==io) if (x==io)
{ {
enabled = !((ps[myconnectindex].gm&MODE_GAME) && ud.m_recstat != 1); enabled = !((ps[myconnectindex].gm&MODE_GAME) && ud.m_recstat != 1);
@ -2653,7 +2649,7 @@ cheat_for_port_credits:
enabled = 0; enabled = 0;
gametextpal(d,yy,ud.m_recstat?((ud.m_recstat && enabled && ps[myconnectindex].gm&MODE_GAME)?"Running":"On"):"Off",enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE,enabled?0:1); gametextpal(d,yy,ud.m_recstat?((ud.m_recstat && enabled && ps[myconnectindex].gm&MODE_GAME)?"Running":"On"):"Off",enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE,enabled?0:1);
break; break;
case 11: case 10:
if (x==io) cmenu(201); if (x==io) cmenu(201);
break; break;
default: default:
@ -2722,7 +2718,7 @@ cheat_for_port_credits:
if (x == -1) if (x == -1)
{ {
cmenu(200); cmenu(200);
probey = 11; probey = 10;
break; break;
} }
@ -2806,6 +2802,7 @@ cheat_for_port_credits:
case 8: case 8:
#endif #endif
if (x==io) cmenu(200); if (x==io) cmenu(200);
probey = 10;
break; break;
default: default:
break; break;
@ -2906,9 +2903,9 @@ cheat_for_port_credits:
c = (320>>1)-120; c = (320>>1)-120;
#if defined(POLYMOST) && defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
x = 8; x = (bpp>8?8:6);
#else #else
x = 5; x = 6;
#endif #endif
onbar = (probey == 4); onbar = (probey == 4);
if (probey == 0 || probey == 1 || probey == 2) if (probey == 0 || probey == 1 || probey == 2)
@ -3134,9 +3131,13 @@ cheat_for_port_credits:
case 4: case 4:
break; break;
#if defined(POLYMOST) && defined(USE_OPENGL)
case 5: case 5:
if (bpp==8) break; if (bpp==8)
{
ud.detail = 1-ud.detail;
break;
}
#if defined(POLYMOST) && defined(USE_OPENGL)
/* switch (gltexfiltermode) /* switch (gltexfiltermode)
{ {
case 0: case 0:
@ -3157,7 +3158,6 @@ cheat_for_port_credits:
gltexfiltermode = 0; gltexfiltermode = 0;
gltexapplyprops(); gltexapplyprops();
break; break;
case 6: case 6:
if (bpp==8) break; if (bpp==8) break;
glanisotropy *= 2; glanisotropy *= 2;
@ -3197,7 +3197,16 @@ cheat_for_port_credits:
} }
} }
if (bpp == 8)
{
menutext(c,50+62+16+16,MENUHIGHLIGHT(5),0,"DETAIL");
menutext(c+154,50+62+16+16,MENUHIGHLIGHT(5),0,ud.detail?"HIGH":"LOW");
modval(0,1,(int *)&ud.detail,1,probey==5);
}
#if defined(POLYMOST) && defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
if (bpp > 8)
{
menutext(c,50+62+16+16,MENUHIGHLIGHT(5),bpp==8,"FILTERING"); menutext(c,50+62+16+16,MENUHIGHLIGHT(5),bpp==8,"FILTERING");
switch (gltexfiltermode) switch (gltexfiltermode)
{ {
@ -3208,13 +3217,13 @@ cheat_for_port_credits:
strcpy(tempbuf,"LINEAR"); strcpy(tempbuf,"LINEAR");
break; break;
case 2: case 2:
strcpy(tempbuf,"NEAREST_MM_N"); strcpy(tempbuf,"NEAR_MM_NEAR");
break; break;
case 3: case 3:
strcpy(tempbuf,"BILINEAR"); strcpy(tempbuf,"BILINEAR");
break; break;
case 4: case 4:
strcpy(tempbuf,"NEAREST_MM_L"); strcpy(tempbuf,"NEAR_MM_LIN");
break; break;
case 5: case 5:
strcpy(tempbuf,"TRILINEAR"); strcpy(tempbuf,"TRILINEAR");
@ -3223,7 +3232,7 @@ cheat_for_port_credits:
strcpy(tempbuf,"OTHER"); strcpy(tempbuf,"OTHER");
break; break;
} }
// menutext(c+154,50+62+16+16,MENUHIGHLIGHT(5),bpp==8,tempbuf); // menutext(c+154,50+62+16+16,MENUHIGHLIGHT(5),bpp==8,tempbuf);
gametextpal(c+154,50+62+16+16-8,tempbuf,MENUHIGHLIGHT(5),bpp==8); gametextpal(c+154,50+62+16+16-8,tempbuf,MENUHIGHLIGHT(5),bpp==8);
menutext(c,50+62+16+16+16,MENUHIGHLIGHT(6),bpp==8,"ANISOTROPY"); menutext(c,50+62+16+16+16,MENUHIGHLIGHT(6),bpp==8,"ANISOTROPY");
@ -3231,6 +3240,7 @@ cheat_for_port_credits:
else sprintf(tempbuf,"%ld-tap",glanisotropy); else sprintf(tempbuf,"%ld-tap",glanisotropy);
menutext(c+154,50+62+16+16+16,MENUHIGHLIGHT(6),bpp==8,tempbuf); menutext(c+154,50+62+16+16+16,MENUHIGHLIGHT(6),bpp==8,tempbuf);
menutext(c,50+62+16+16+16+16,MENUHIGHLIGHT(7),bpp==8,"ADVANCED VIDEO"); menutext(c,50+62+16+16+16+16,MENUHIGHLIGHT(7),bpp==8,"ADVANCED VIDEO");
}
#endif #endif
break; break;