summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-15 23:44:25 +0200
committerSergeanur <s.anureev@yandex.ua>2020-04-15 23:46:09 +0200
commitd455cd8a62639145d7b5c03ada6fc84d2ad8ac36 (patch)
treee690f03a618e5c0e9b3cc51dc85083937fdab66f /src/core
parentUpdate README.md (diff)
downloadre3-d455cd8a62639145d7b5c03ada6fc84d2ad8ac36.tar
re3-d455cd8a62639145d7b5c03ada6fc84d2ad8ac36.tar.gz
re3-d455cd8a62639145d7b5c03ada6fc84d2ad8ac36.tar.bz2
re3-d455cd8a62639145d7b5c03ada6fc84d2ad8ac36.tar.lz
re3-d455cd8a62639145d7b5c03ada6fc84d2ad8ac36.tar.xz
re3-d455cd8a62639145d7b5c03ada6fc84d2ad8ac36.tar.zst
re3-d455cd8a62639145d7b5c03ada6fc84d2ad8ac36.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Camera.cpp8
-rw-r--r--src/core/Camera.h4
-rw-r--r--src/core/config.h1
-rw-r--r--src/core/main.cpp5
4 files changed, 16 insertions, 2 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 91dd6573..c7fa41e4 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -2183,13 +2183,21 @@ CCamera::DrawBordersForWideScreen(void)
SetMotionBlurAlpha(80);
CSprite2d::DrawRect(
+#ifdef FIX_BUGS
+ CRect(0.0f, (SCREEN_HEIGHT/2) * m_ScreenReductionPercentage/100.0f - SCREEN_SCALE_Y(8.0f),
+#else
CRect(0.0f, (SCREEN_HEIGHT/2) * m_ScreenReductionPercentage/100.0f - 8.0f,
+#endif
SCREEN_WIDTH, 0.0f),
CRGBA(0, 0, 0, 255));
CSprite2d::DrawRect(
CRect(0.0f, SCREEN_HEIGHT,
+#ifdef FIX_BUGS
+ SCREEN_WIDTH, SCREEN_HEIGHT - (SCREEN_HEIGHT/2) * m_ScreenReductionPercentage/100.0f - SCREEN_SCALE_Y(8.0f)),
+#else
SCREEN_WIDTH, SCREEN_HEIGHT - (SCREEN_HEIGHT/2) * m_ScreenReductionPercentage/100.0f - 8.0f),
+#endif
CRGBA(0, 0, 0, 255));
}
diff --git a/src/core/Camera.h b/src/core/Camera.h
index eca4518a..09a8d603 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -415,7 +415,7 @@ uint32 unknown; // some counter having to do with music
float CamFrontXNorm;
float CamFrontYNorm;
-#if 0 // TODO: FIX_BUGS once GenericLoad is done
+#ifdef FIX_BUGS
int32 CarZoomIndicator;
#else
float CarZoomIndicator;
@@ -455,7 +455,7 @@ uint32 unknown; // some counter having to do with music
float m_ScreenReductionSpeed;
float m_AlphaForPlayerAnim1rstPerson;
float Orientation;
-#if 0 // TODO: FIX_BUGS once GenericLoad is done
+#ifdef FIX_BUGS
int32 PedZoomIndicator;
#else
float PedZoomIndicator;
diff --git a/src/core/config.h b/src/core/config.h
index f7fde579..38e7679f 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -189,6 +189,7 @@ enum Config {
#define FIX_BUGS // fixes bugs that we've came across during reversing, TODO: use this more
#define TOGGLEABLE_BETA_FEATURES // toggleable from debug menu. not too many things
#define MORE_LANGUAGES // Add more translations to the game
+#define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch)
// Pad
#define XINPUT
diff --git a/src/core/main.cpp b/src/core/main.cpp
index b028b5fb..08463df9 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -240,8 +240,13 @@ DoFade(void)
float y = SCREEN_HEIGHT/2 * TheCamera.m_ScreenReductionPercentage/100.0f;
rect.left = 0.0f;
rect.right = SCREEN_WIDTH;
+#ifdef FIX_BUGS
+ rect.top = y - SCREEN_SCALE_Y(8.0f);
+ rect.bottom = SCREEN_HEIGHT - y - SCREEN_SCALE_Y(8.0f);
+#else
rect.top = y - 8.0f;
rect.bottom = SCREEN_HEIGHT - y - 8.0f;
+#endif // FIX_BUGS
}else{
rect.left = 0.0f;
rect.right = SCREEN_WIDTH;