Tweaked configuration options

This commit is contained in:
Mathew Velasquez 2015-11-17 11:16:45 -05:00
parent 0b04d60ce0
commit d40ae86ba4
4 changed files with 2 additions and 8 deletions

View File

@ -139,7 +139,6 @@ void Config::read(int argc, char *argv[])
#define PO_DESC_ALL \
PO_DESC(debugMode, bool, false) \
PO_DESC(printFPS, bool, false) \
PO_DESC(winResizable, bool, true) \
PO_DESC(fullscreen, bool, false) \
PO_DESC(fixedAspectRatio, bool, true) \
PO_DESC(smoothScaling, bool, false) \
@ -153,7 +152,6 @@ void Config::read(int argc, char *argv[])
PO_DESC(subImageFix, bool, false) \
PO_DESC(gameFolder, std::string, ".") \
PO_DESC(anyAltToggleFS, bool, false) \
PO_DESC(enableReset, bool, false) \
PO_DESC(allowSymlinks, bool, false) \
PO_DESC(dataPathOrg, std::string, "") \
PO_DESC(dataPathApp, std::string, "") \

View File

@ -32,7 +32,6 @@ struct Config
bool debugMode;
bool printFPS;
bool winResizable;
bool fullscreen;
bool fixedAspectRatio;
bool smoothScaling;
@ -51,7 +50,6 @@ struct Config
std::string gameFolder;
bool anyAltToggleFS;
bool enableReset;
bool allowSymlinks;
bool pathCache;

View File

@ -322,7 +322,7 @@ void EventThread::process(RGSSThreadData &rtData)
if (event.key.keysym.scancode == SDL_SCANCODE_F12)
{
if (!rtData.config.enableReset)
if (!rtData.config.debugMode)
break;
if (resetting)
@ -340,7 +340,7 @@ void EventThread::process(RGSSThreadData &rtData)
case SDL_KEYUP :
if (event.key.keysym.scancode == SDL_SCANCODE_F12)
{
if (!rtData.config.enableReset)
if (!rtData.config.debugMode)
break;
resetting = false;

View File

@ -251,8 +251,6 @@ int main(int argc, char *argv[])
SDL_Window *win;
Uint32 winFlags = SDL_WINDOW_OPENGL | SDL_WINDOW_INPUT_FOCUS;
if (conf.winResizable)
winFlags |= SDL_WINDOW_RESIZABLE;
if (conf.fullscreen)
winFlags |= SDL_WINDOW_FULLSCREEN_DESKTOP;