diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-08 17:31:48 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-08 17:31:48 +0100 |
| commit | 368d2f3279b474056e888dcccea234f32614b506 (patch) | |
| tree | 6ab081b692b3a7e9185076049d4f0655565235e8 /src/core/common.h | |
| parent | upd (diff) | |
| download | re3-368d2f3279b474056e888dcccea234f32614b506.tar re3-368d2f3279b474056e888dcccea234f32614b506.tar.gz re3-368d2f3279b474056e888dcccea234f32614b506.tar.bz2 re3-368d2f3279b474056e888dcccea234f32614b506.tar.lz re3-368d2f3279b474056e888dcccea234f32614b506.tar.xz re3-368d2f3279b474056e888dcccea234f32614b506.tar.zst re3-368d2f3279b474056e888dcccea234f32614b506.zip | |
Diffstat (limited to 'src/core/common.h')
| -rw-r--r-- | src/core/common.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/common.h b/src/core/common.h index 44d94370..5767b087 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -121,7 +121,7 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w) #include "skeleton.h" #include "Draw.h" -#if defined(ASPECT_RATIO_SCALE) +#if defined(PROPER_SCALING) || defined(PS2_HUD) #ifdef FORCE_PC_SCALING #define DEFAULT_SCREEN_WIDTH (640) #define DEFAULT_SCREEN_HEIGHT (448) @@ -176,10 +176,6 @@ 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))) - #ifndef FORCE_PC_SCALING - #undef SCREEN_SCALE_Y - #define SCREEN_SCALE_Y(a) CDraw::ScaleY(SCREEN_STRETCH_Y(a)) - #endif #else #define SCREEN_SCALE_AR(a) (a) #define SCALE_AND_CENTER_X(x) SCREEN_STRETCH_X(x) |