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

Fixes for a couple of map mode issues that pop up when you pause the game with the map showing as well as a couple more menu tweaks

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@73 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-19 23:48:43 +00:00
parent 73eb097921
commit 4276901071
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
polymer/eduke32/source/config.c
View file

@ -585,7 +585,8 @@ void CONFIG_ReadSetup( void )
SCRIPT_GetNumber( scripthandle, "Misc", "Crosshairs",&ud.crosshair); SCRIPT_GetNumber( scripthandle, "Misc", "Crosshairs",&ud.crosshair);
SCRIPT_GetNumber( scripthandle, "Misc", "StatusBarScale",&ud.statusbarscale); SCRIPT_GetNumber( scripthandle, "Misc", "StatusBarScale",&ud.statusbarscale);
SCRIPT_GetNumber( scripthandle, "Misc", "ShowLevelStats",&ud.levelstats); SCRIPT_GetNumber( scripthandle, "Misc", "ShowLevelStats",&ud.levelstats);
SCRIPT_GetNumber( scripthandle, "Misc", "ShowOpponentWeapons",&ShowOpponentWeapons); SCRIPT_GetNumber( scripthandle, "Misc", "ShowOpponentWeapons",(int32 *)&ud.showweapons);
ShowOpponentWeapons = ud.showweapons;
SCRIPT_GetNumber( scripthandle, "Misc", "ShowViewWeapon",&ud.drawweapon); SCRIPT_GetNumber( scripthandle, "Misc", "ShowViewWeapon",&ud.drawweapon);
SCRIPT_GetNumber( scripthandle, "Misc", "BrightSkins",&ud.brightskins); SCRIPT_GetNumber( scripthandle, "Misc", "BrightSkins",&ud.brightskins);
SCRIPT_GetNumber( scripthandle, "Misc", "DemoCams",&ud.democams); SCRIPT_GetNumber( scripthandle, "Misc", "DemoCams",&ud.democams);

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

@ -2659,7 +2659,7 @@ void displayrest(long smoothratio)
dointerpolations(smoothratio); dointerpolations(smoothratio);
if( ud.scrollmode == 0 ) if( ud.scrollmode == 0 )
{ {
if(pp->newowner == -1) if(pp->newowner == -1 && !ud.pause_on)
{ {
if (screenpeek == myconnectindex && numplayers > 1) if (screenpeek == myconnectindex && numplayers > 1)
{ {
@ -2683,11 +2683,12 @@ void displayrest(long smoothratio)
} }
else else
{ {
if(!ud.pause_on)
ud.fola += ud.folavel>>3; {
ud.folx += (ud.folfvel*sintable[(512+2048-ud.fola)&2047])>>14; ud.fola += ud.folavel>>3;
ud.foly += (ud.folfvel*sintable[(512+1024-512-ud.fola)&2047])>>14; ud.folx += (ud.folfvel*sintable[(512+2048-ud.fola)&2047])>>14;
ud.foly += (ud.folfvel*sintable[(512+1024-512-ud.fola)&2047])>>14;
}
cposx = ud.folx; cposx = ud.folx;
cposy = ud.foly; cposy = ud.foly;
cang = ud.fola; cang = ud.fola;

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

@ -2709,7 +2709,7 @@ cheat_for_port_credits:
if (probey < (MAXMOUSEBUTTONS-2)*2+2) if (probey < (MAXMOUSEBUTTONS-2)*2+2)
x = probesm(73,40,8,(MAXMOUSEBUTTONS-2)*2+2+2+2); x = probesm(73,40,8,(MAXMOUSEBUTTONS-2)*2+2+2+2);
else else
x = probesm(40,124-((MAXMOUSEBUTTONS-2)*2+2)*9,9,(MAXMOUSEBUTTONS-2)*2+2+2+2); x = probesm(40,128-((MAXMOUSEBUTTONS-2)*2+2)*9,9,(MAXMOUSEBUTTONS-2)*2+2+2+2);
if (x==-1) { if (x==-1) {
cmenu(202); cmenu(202);
@ -2765,23 +2765,23 @@ cheat_for_port_credits:
} }
} }
gametextpal(40,119,"SENSITIVITY",5,2); gametextpal(40,122,"SENSITIVITY",5,2);
gametextpal(40,119+9,"MOUSE AIMING TOGGLE",!ud.mouseaiming?5:15,2); gametextpal(40,122+9,"MOUSE AIMING TOGGLE",!ud.mouseaiming?5:15,2);
gametextpal(40,119+9+9,"INVERT MOUSE AIM",5,2); gametextpal(40,122+9+9,"INVERT MOUSE AIM",5,2);
gametextpal(40,119+9+9+9,"ADVANCED...",5,2); gametextpal(40,122+9+9+9,"ADVANCED...",5,2);
{ {
short sense; short sense;
sense = CONTROL_GetMouseSensitivity()>>10; sense = CONTROL_GetMouseSensitivity()>>10;
barsm(248,125,&sense,4,x==(MAXMOUSEBUTTONS-2)*2+2,SHX(-7),PHX(-7)); barsm(248,128,&sense,4,x==(MAXMOUSEBUTTONS-2)*2+2,SHX(-7),PHX(-7));
CONTROL_SetMouseSensitivity( sense<<10 ); CONTROL_SetMouseSensitivity( sense<<10 );
} }
if (!ud.mouseaiming) modval(0,1,(int *)&myaimmode,1,probey == (MAXMOUSEBUTTONS-2)*2+2+1); if (!ud.mouseaiming) modval(0,1,(int *)&myaimmode,1,probey == (MAXMOUSEBUTTONS-2)*2+2+1);
modval(0,1,(int *)&ud.mouseflip,1,probey == (MAXMOUSEBUTTONS-2)*2+2+2); modval(0,1,(int *)&ud.mouseflip,1,probey == (MAXMOUSEBUTTONS-2)*2+2+2);
gametextpal(240,119+9, myaimmode && !ud.mouseaiming ? "On" : "Off", !ud.mouseaiming?0:10, 0); gametextpal(240,122+9, myaimmode && !ud.mouseaiming ? "On" : "Off", !ud.mouseaiming?0:10, 0);
gametextpal(240,119+9+9, ud.mouseflip ? "On" : "Off", 0, 0); gametextpal(240,122+9+9, ud.mouseflip ? "On" : "Off", 0, 0);
if (probey < (MAXMOUSEBUTTONS-2)*2+2) { if (probey < (MAXMOUSEBUTTONS-2)*2+2) {
gametext(160,164,"UP/DOWN = SELECT BUTTON",0,2+8+16); gametext(160,164,"UP/DOWN = SELECT BUTTON",0,2+8+16);