Remove duplicate screen configuration variables

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

View File

@@ -5,6 +5,8 @@
#include <string>
#include <vector>
#include "ScreenSettings.h"
// Forward decl without including all of <tinyxml2.h>
namespace tinyxml2
{
@@ -128,17 +130,17 @@ public:
void unlocknum(int t);
void loadstats(int *width, int *height, bool *vsync);
void loadstats(ScreenSettings* screen_settings);
void savestats(const bool stats_only = false);
void deletestats();
void deserializesettings(tinyxml2::XMLElement* dataNode, int* width, int* height, bool* vsync);
void deserializesettings(tinyxml2::XMLElement* dataNode, ScreenSettings* screen_settings);
void serializesettings(tinyxml2::XMLElement* dataNode);
void loadsettings(int* width, int* height, bool* vsync);
void loadsettings(ScreenSettings* screen_settings);
void savesettings();
@@ -308,7 +310,6 @@ public:
bool unlocknotify[numunlock];
bool anything_unlocked();
int stat_trinkets;
bool fullscreen;
int bestgamedeaths;
@@ -368,9 +369,6 @@ public:
bool savemystats;
bool fullScreenEffect_badSignal;
bool useLinearFilter;
int stretchMode;
int controllerSensitivity;
bool quickrestartkludge;