From d40ae86ba4f9fe23ec8cacfba357ad74e8d496bf Mon Sep 17 00:00:00 2001
From: Mathew Velasquez <mathewvq@gmail.com>
Date: Tue, 17 Nov 2015 11:16:45 -0500
Subject: [PATCH] Tweaked configuration options

---
 src/config.cpp      | 2 --
 src/config.h        | 2 --
 src/eventthread.cpp | 4 ++--
 src/main.cpp        | 2 --
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index 5f830c6..02424ab 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -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, "") \
diff --git a/src/config.h b/src/config.h
index 60a95e3..7d571f3 100644
--- a/src/config.h
+++ b/src/config.h
@@ -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;
 
diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index 34d9475..3ea37fe 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -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;
diff --git a/src/main.cpp b/src/main.cpp
index c16a18d..ceeeb65 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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;