Use correct default resolution for RGSS2/3 (544x416)

This commit is contained in:
Jonas Kulla 2014-08-12 22:21:57 +02:00
parent d128375d62
commit 3550cc0ff5
3 changed files with 12 additions and 3 deletions

View File

@ -40,8 +40,8 @@ Config::Config()
fixedAspectRatio(true), fixedAspectRatio(true),
smoothScaling(false), smoothScaling(false),
vsync(false), vsync(false),
defScreenW(640), defScreenW(DEF_SCREEN_W),
defScreenH(480), defScreenH(DEF_SCREEN_H),
fixedFramerate(0), fixedFramerate(0),
frameSkip(true), frameSkip(true),
solidFonts(false), solidFonts(false),

View File

@ -25,6 +25,14 @@
#include <string> #include <string>
#include <vector> #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 struct Config
{ {
bool debugMode; bool debugMode;

View File

@ -24,6 +24,7 @@
#include "util.h" #include "util.h"
#include "gl-util.h" #include "gl-util.h"
#include "sharedstate.h" #include "sharedstate.h"
#include "config.h"
#include "glstate.h" #include "glstate.h"
#include "shader.h" #include "shader.h"
#include "scene.h" #include "scene.h"
@ -398,7 +399,7 @@ struct GraphicsPrivate
TEXFBO transBuffer; TEXFBO transBuffer;
GraphicsPrivate(RGSSThreadData *rtData) GraphicsPrivate(RGSSThreadData *rtData)
: scRes(640, 480), : scRes(DEF_SCREEN_W, DEF_SCREEN_H),
scSize(scRes), scSize(scRes),
winSize(rtData->config.defScreenW, rtData->config.defScreenH), winSize(rtData->config.defScreenW, rtData->config.defScreenH),
screen(scRes.x, scRes.y), screen(scRes.x, scRes.y),