From 3550cc0ff57e566a93ef0dc626c4e6a77fcb2634 Mon Sep 17 00:00:00 2001
From: Jonas Kulla <Nyocurio@gmail.com>
Date: Tue, 12 Aug 2014 22:21:57 +0200
Subject: [PATCH] Use correct default resolution for RGSS2/3 (544x416)

---
 src/config.cpp   | 4 ++--
 src/config.h     | 8 ++++++++
 src/graphics.cpp | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index 3db101e..8eb29cd 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -40,8 +40,8 @@ Config::Config()
       fixedAspectRatio(true),
       smoothScaling(false),
       vsync(false),
-      defScreenW(640),
-      defScreenH(480),
+      defScreenW(DEF_SCREEN_W),
+      defScreenH(DEF_SCREEN_H),
       fixedFramerate(0),
       frameSkip(true),
       solidFonts(false),
diff --git a/src/config.h b/src/config.h
index fd8a113..a50569e 100644
--- a/src/config.h
+++ b/src/config.h
@@ -25,6 +25,14 @@
 #include <string>
 #include <vector>
 
+#ifndef RGSS2
+#define DEF_SCREEN_W 640
+#define DEF_SCREEN_H 480
+#else
+#define DEF_SCREEN_W 544
+#define DEF_SCREEN_H 416
+#endif
+
 struct Config
 {
 	bool debugMode;
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 651af79..bd0738c 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -24,6 +24,7 @@
 #include "util.h"
 #include "gl-util.h"
 #include "sharedstate.h"
+#include "config.h"
 #include "glstate.h"
 #include "shader.h"
 #include "scene.h"
@@ -398,7 +399,7 @@ struct GraphicsPrivate
 	TEXFBO transBuffer;
 
 	GraphicsPrivate(RGSSThreadData *rtData)
-	    : scRes(640, 480),
+	    : scRes(DEF_SCREEN_W, DEF_SCREEN_H),
 	      scSize(scRes),
 	      winSize(rtData->config.defScreenW, rtData->config.defScreenH),
 	      screen(scRes.x, scRes.y),