summaryrefslogtreecommitdiffstats
path: root/src/core/main.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-24 17:25:53 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-24 17:25:53 +0200
commite4f136344cff39f30ca795ba0032d8f348cbf52e (patch)
tree018327f24b5bb38ac27d7c2918a141a2fb05e346 /src/core/main.cpp
parentMerge branch 'master' into opus (diff)
parentall my fixes live in exes (diff)
downloadre3-e4f136344cff39f30ca795ba0032d8f348cbf52e.tar
re3-e4f136344cff39f30ca795ba0032d8f348cbf52e.tar.gz
re3-e4f136344cff39f30ca795ba0032d8f348cbf52e.tar.bz2
re3-e4f136344cff39f30ca795ba0032d8f348cbf52e.tar.lz
re3-e4f136344cff39f30ca795ba0032d8f348cbf52e.tar.xz
re3-e4f136344cff39f30ca795ba0032d8f348cbf52e.tar.zst
re3-e4f136344cff39f30ca795ba0032d8f348cbf52e.zip
Diffstat (limited to 'src/core/main.cpp')
-rw-r--r--src/core/main.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index acdf6f4e..666758c8 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -137,9 +137,13 @@ DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomR
CRGBA TopColor(TopRed, TopGreen, TopBlue, Alpha);
CRGBA BottomColor(BottomRed, BottomGreen, BottomBlue, Alpha);
+#ifndef ASPECT_RATIO_SCALE
+ CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, (CMenuManager::m_PrefsUseWideScreen ? 16.f / 9.f : 4.f / 3.f));
+#else
CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+#endif
CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
- RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
+ RwCameraClear(Scene.camera, &TopColor.rwRGBA, rwCAMERACLEARZ);
if(!RsCameraBeginUpdate(Scene.camera))
return false;
@@ -155,7 +159,11 @@ DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomR
bool
DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha)
{
+#ifndef ASPECT_RATIO_SCALE
+ CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, (CMenuManager::m_PrefsUseWideScreen ? 16.f/9.f : 4.f/3.f));
+#else
CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+#endif
CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);