summaryrefslogtreecommitdiffstats
path: root/src/core/common.h
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2021-01-08 21:30:30 +0100
committerFire-Head <Fire-Head@users.noreply.github.com>2021-01-08 21:30:30 +0100
commit00d23c61d99a0a676de2219da42d576b5c5c0474 (patch)
tree2a6d74663312bdb01b5ae1fd9abbd1c8fc5d857f /src/core/common.h
parentMerge pull request #909 from Fire-Head/master (diff)
downloadre3-00d23c61d99a0a676de2219da42d576b5c5c0474.tar
re3-00d23c61d99a0a676de2219da42d576b5c5c0474.tar.gz
re3-00d23c61d99a0a676de2219da42d576b5c5c0474.tar.bz2
re3-00d23c61d99a0a676de2219da42d576b5c5c0474.tar.lz
re3-00d23c61d99a0a676de2219da42d576b5c5c0474.tar.xz
re3-00d23c61d99a0a676de2219da42d576b5c5c0474.tar.zst
re3-00d23c61d99a0a676de2219da42d576b5c5c0474.zip
Diffstat (limited to 'src/core/common.h')
-rw-r--r--src/core/common.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/common.h b/src/core/common.h
index 5767b087..9253a465 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -176,6 +176,12 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w)
#ifdef ASPECT_RATIO_SCALE
#define SCREEN_SCALE_AR(a) ((a) * DEFAULT_ASPECT_RATIO / SCREEN_ASPECT_RATIO)
#define SCALE_AND_CENTER_X(x) ((SCREEN_WIDTH == DEFAULT_SCREEN_WIDTH) ? (x) : (SCREEN_WIDTH - SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH)) / 2 + SCREEN_SCALE_X((x)))
+#ifdef PROPER_SCALING
+ #ifndef FORCE_PC_SCALING
+ #undef SCREEN_SCALE_Y
+ #define SCREEN_SCALE_Y(a) CDraw::ScaleY(SCREEN_STRETCH_Y(a))
+ #endif
+#endif
#else
#define SCREEN_SCALE_AR(a) (a)
#define SCALE_AND_CENTER_X(x) SCREEN_STRETCH_X(x)