From 46d0b3a4e9ea54b7605cf5675ffbfd00a0f42366 Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 15 Apr 2020 19:52:49 -0700 Subject: [PATCH] Fix indentation of "graphicoptions" in Render.cpp There was one level that was indented with 2 spaces instead of 4, which made everything else look weird. Then some lines were randomly indented further for no reason. Doing this before the next commit is done so as to not make the next commit noisier. --- desktop_version/src/Render.cpp | 100 ++++++++++++++++----------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index 6fb936f8..b109e2b6 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -113,59 +113,59 @@ void menurender() } else if (game.currentmenuname == "graphicoptions") { - if (game.currentmenuoption == 0) - { - 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.currentmenuoption == 0) + { + 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); - } - - }else if (game.currentmenuoption == 1) - { - graphics.bigprint( -1, 30, "Toggle Letterbox", 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); - } - }else if (game.currentmenuoption == 2) - { - 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); - } - - } else if (game.currentmenuoption == 3) - { - graphics.bigprint( -1, 30, "Analogue Mode", tr, tg, tb, true); - graphics.Print( -1, 65, "There is nothing wrong with your", tr, tg, tb, true); - graphics.Print( -1, 75, "television set. Do not attempt to", tr, tg, tb, true); - graphics.Print( -1, 85, "adjust the picture.", 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); } - else if (game.currentmenuoption == 4) - { - graphics.bigprint(-1, 30, "Toggle Mouse Cursor", tr, tg, tb, true); - graphics.Print(-1, 65, "Show/hide the system mouse cursor.", tr, tg, tb, true); - if (graphics.showmousecursor) { - graphics.Print(-1, 85, "Current mode: SHOW", tr, tg, tb, true); - } - else { - graphics.Print(-1, 85, "Current mode: HIDE", tr/2, tg/2, tb/2, true); - } - } + }else if (game.currentmenuoption == 1) + { + graphics.bigprint( -1, 30, "Toggle Letterbox", 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); + } + }else if (game.currentmenuoption == 2) + { + 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); + } + + } else if (game.currentmenuoption == 3) + { + graphics.bigprint( -1, 30, "Analogue Mode", tr, tg, tb, true); + graphics.Print( -1, 65, "There is nothing wrong with your", tr, tg, tb, true); + graphics.Print( -1, 75, "television set. Do not attempt to", tr, tg, tb, true); + graphics.Print( -1, 85, "adjust the picture.", tr, tg, tb, true); + } + else if (game.currentmenuoption == 4) + { + graphics.bigprint(-1, 30, "Toggle Mouse Cursor", tr, tg, tb, true); + graphics.Print(-1, 65, "Show/hide the system mouse cursor.", tr, tg, tb, true); + + if (graphics.showmousecursor) { + graphics.Print(-1, 85, "Current mode: SHOW", tr, tg, tb, true); + } + else { + graphics.Print(-1, 85, "Current mode: HIDE", tr/2, tg/2, tb/2, true); + } + } } else if (game.currentmenuname == "credits") {