summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2020-12-19 20:31:54 +0100
committerFire-Head <Fire-Head@users.noreply.github.com>2020-12-19 20:31:54 +0100
commit4d4758bc1e2c62915ba7b7ed0bfecad1430fe4b4 (patch)
treef36028123d7c99ddd08bd1f1bef5b591f762a69a /src/core
parentrestore original code, fixes, ps2 font (diff)
downloadre3-4d4758bc1e2c62915ba7b7ed0bfecad1430fe4b4.tar
re3-4d4758bc1e2c62915ba7b7ed0bfecad1430fe4b4.tar.gz
re3-4d4758bc1e2c62915ba7b7ed0bfecad1430fe4b4.tar.bz2
re3-4d4758bc1e2c62915ba7b7ed0bfecad1430fe4b4.tar.lz
re3-4d4758bc1e2c62915ba7b7ed0bfecad1430fe4b4.tar.xz
re3-4d4758bc1e2c62915ba7b7ed0bfecad1430fe4b4.tar.zst
re3-4d4758bc1e2c62915ba7b7ed0bfecad1430fe4b4.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Frontend.cpp1
-rw-r--r--src/core/common.h24
2 files changed, 18 insertions, 7 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 5597b358..5a99ad95 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3,6 +3,7 @@
#include <dinput.h>
#endif
+#define FORCE_PC_SCALING
#define WITHWINDOWS
#include "common.h"
#ifndef PS2_MENU
diff --git a/src/core/common.h b/src/core/common.h
index 077a2a1a..7029fdf1 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -116,14 +116,22 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w)
#include "skeleton.h"
#include "Draw.h"
-#ifdef GTA_PS2
-#define DEFAULT_SCREEN_WIDTH (640)
-#define DEFAULT_SCREEN_HEIGHT (480)
-#else
-#define DEFAULT_SCREEN_WIDTH (640)
-//#define DEFAULT_SCREEN_HEIGHT (448)
-#define DEFAULT_SCREEN_HEIGHT (480)
+#if defined(USE_PROPER_SCALING)
+ #ifdef FORCE_PC_SCALING
+ #define DEFAULT_SCREEN_WIDTH (640)
+ #define DEFAULT_SCREEN_HEIGHT (448)
+ #else
+ #define DEFAULT_SCREEN_WIDTH (640)
+ #define DEFAULT_SCREEN_HEIGHT (480)
+ #endif
+#elif defined(GTA_PS2)
+ #define DEFAULT_SCREEN_WIDTH (640)
+ #define DEFAULT_SCREEN_HEIGHT (480)
+#else //elif defined(GTA_PC)
+ #define DEFAULT_SCREEN_WIDTH (640)
+ #define DEFAULT_SCREEN_HEIGHT (448)
#endif
+
#define DEFAULT_ASPECT_RATIO (4.0f/3.0f)
#define DEFAULT_VIEWWINDOW (0.7f)
@@ -141,8 +149,10 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w)
#define SCREEN_WIDTH ((float)RsGlobal.width)
#define SCREEN_HEIGHT ((float)RsGlobal.height)
#endif
+
#define SCREEN_HEIGHT_PAL (512)
#define SCREEN_HEIGHT_NTSC (448)
+
#define SCREEN_ASPECT_RATIO (CDraw::GetAspectRatio())
#define SCREEN_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetScaledFOV() * 0.5f)))