diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-12-07 19:12:13 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-12-07 19:12:13 +0100 |
| commit | c5fbb594a51f37e5a3af6c6b98342a71c8fe4611 (patch) | |
| tree | 50a9a7cf3f5ff72d905eac13dfa68b6151caed3f /src/core/common.h | |
| parent | Update librw (diff) | |
| download | re3-c5fbb594a51f37e5a3af6c6b98342a71c8fe4611.tar re3-c5fbb594a51f37e5a3af6c6b98342a71c8fe4611.tar.gz re3-c5fbb594a51f37e5a3af6c6b98342a71c8fe4611.tar.bz2 re3-c5fbb594a51f37e5a3af6c6b98342a71c8fe4611.tar.lz re3-c5fbb594a51f37e5a3af6c6b98342a71c8fe4611.tar.xz re3-c5fbb594a51f37e5a3af6c6b98342a71c8fe4611.tar.zst re3-c5fbb594a51f37e5a3af6c6b98342a71c8fe4611.zip | |
Diffstat (limited to 'src/core/common.h')
| -rw-r--r-- | src/core/common.h | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/core/common.h b/src/core/common.h index 48b20884..077a2a1a 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -116,17 +116,33 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w) #include "skeleton.h" #include "Draw.h" -#define DEFAULT_SCREEN_WIDTH (640) -#define DEFAULT_SCREEN_HEIGHT (448) -#define DEFAULT_SCREEN_HEIGHT_PAL (512) -#define DEFAULT_SCREEN_HEIGHT_NTSC (448) +#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) +#endif #define DEFAULT_ASPECT_RATIO (4.0f/3.0f) #define DEFAULT_VIEWWINDOW (0.7f) // game uses maximumWidth/Height, but this probably won't work // with RW windowed mode -#define SCREEN_WIDTH ((float)RsGlobal.width) +#ifdef GTA_PS2 + #ifdef GTA_PAL + #define SCREEN_WIDTH ((float)640) + #define SCREEN_HEIGHT ((float)512) + #else + #define SCREEN_WIDTH ((float)640) + #define SCREEN_HEIGHT ((float)448) + #endif +#else +#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))) |