Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate screen configuration variables

Browse Source 
There were some duplicate Screen configuration variables that were on
Game, when there didn't need to be.

 - game.fullScreenEffect_badSignal is a duplicate of
   graphics.screenbuffer->badSignalEffect
 - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed
 - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode
 - game.useLinearFilter is a duplicate of
   graphics.screenbuffer->isFiltered

These duplicate variables have been removed now.

I put indentation when handling the ScreenSettings struct in main() so
the local doesn't live for the entirety of main() (which is the entirety
of the program).
This commit is contained in:
Misa
2020-11-12 16:45:51 -08:00
committed by Ethan Lee
parent af11f6936a
commit 40b7ddda05
6 changed files with 55 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
desktop_version/src/Render.cpp
View File

@@ -173,10 +173,13 @@ void menurender()
graphics.bigprint( -1, 30, "Toggle Fullscreen", tr, tg, tb, true);
graphics.Print( -1, 65, "Change to fullscreen/windowed mode.", tr, tg, tb, true);
if(game.fullscreen){
graphics.Print( -1, 85, "Current mode: FULLSCREEN", tr, tg, tb, true);
}else{
graphics.Print( -1, 85, "Current mode: WINDOWED", tr, tg, tb, true);
if (graphics.screenbuffer->isWindowed)
{
graphics.Print( -1, 85, "Current mode: WINDOWED", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 85, "Current mode: FULLSCREEN", tr, tg, tb, true);
}
break;
@@ -184,12 +187,17 @@ void menurender()
graphics.bigprint( -1, 30, "Scaling Mode", tr, tg, tb, true);
graphics.Print( -1, 65, "Choose letterbox/stretch/integer mode.", tr, tg, tb, true);
if(game.stretchMode == 2){
graphics.Print( -1, 85, "Current mode: INTEGER", tr, tg, tb, true);
}else if (game.stretchMode == 1){
graphics.Print( -1, 85, "Current mode: STRETCH", tr, tg, tb, true);
}else{
graphics.Print( -1, 85, "Current mode: LETTERBOX", tr, tg, tb, true);
switch (graphics.screenbuffer->stretchMode)
{
case 2:
graphics.Print( -1, 85, "Current mode: INTEGER", tr, tg, tb, true);
break;
case 1:
graphics.Print( -1, 85, "Current mode: STRETCH", tr, tg, tb, true);
break;
default:
graphics.Print( -1, 85, "Current mode: LETTERBOX", tr, tg, tb, true);
break;
}
break;
case 2:
@@ -206,10 +214,13 @@ void menurender()
graphics.bigprint( -1, 30, "Toggle Filter", tr, tg, tb, true);
graphics.Print( -1, 65, "Change to nearest/linear filter.", tr, tg, tb, true);
if(game.useLinearFilter){
graphics.Print( -1, 85, "Current mode: LINEAR", tr, tg, tb, true);
}else{
graphics.Print( -1, 85, "Current mode: NEAREST", tr, tg, tb, true);
if (graphics.screenbuffer->isFiltered)
{
graphics.Print( -1, 85, "Current mode: LINEAR", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 85, "Current mode: NEAREST", tr, tg, tb, true);
}
break;