Corona widescreen fix

GTAmodding · Oct 5, 2019 · cc621ba0995f659c32dee4b7d7870902ef50c9eb · cc621ba
1 parent cf0edb3
commit cc621ba0995f659c32dee4b7d7870902ef50c9eb
Unified Split

Showing with 5 additions and 3 deletions.

+3 −1 src/core/common.h

+2 −2 src/render/Coronas.cpp
diff --git a/src/core/common.h b/src/core/common.h
@@ -92,9 +92,11 @@ extern void **rwengine;
 #define SCREEN_SCALE_FROM_BOTTOM(a) (SCREEN_HEIGHT - SCREEN_SCALE_Y(a))
 
 #ifdef ASPECT_RATIO_SCALE
-#define SCREEN_SCALE_AR(a) ((a) * (4.0f / 3.0f) / SCREEN_ASPECT_RATIO)
+#define SCREEN_SCALE_AR(a) ((a) * DEFAULT_ASPECT_RATIO / SCREEN_ASPECT_RATIO)
+#define SCREEN_SCALE_AR2(a) ((a) / (DEFAULT_ASPECT_RATIO / SCREEN_ASPECT_RATIO))
 #else
 #define SCREEN_SCALE_AR(a) (a)
+#define SCREEN_SCALE_AR2(a) (a)
 #endif
 
 #include "maths.h"

diff --git a/src/render/Coronas.cpp b/src/render/Coronas.cpp
@@ -324,7 +324,7 @@ CCoronas::Render(void)
 
 						CSprite::RenderOneXLUSprite(spriteCoors.x, spriteCoors.y, spriteCoors.z,
 							spritew * aCoronas[i].size * wscale,
-							spriteh * aCoronas[i].size * fogscale * hscale,
+							spriteh * SCREEN_SCALE_AR2(aCoronas[i].size * fogscale * hscale),
 							CCoronas::aCoronas[i].red / fogscale,
 							CCoronas::aCoronas[i].green / fogscale,
 							CCoronas::aCoronas[i].blue / fogscale,
@@ -335,7 +335,7 @@ CCoronas::Render(void)
 						CSprite::RenderOneXLUSprite_Rotate_Aspect(
 							spriteCoors.x, spriteCoors.y, spriteCoors.z,
 							spritew * aCoronas[i].size * fogscale,
-							spriteh * aCoronas[i].size * fogscale,
+							spriteh * SCREEN_SCALE_AR2(aCoronas[i].size * fogscale),
 							CCoronas::aCoronas[i].red / fogscale,
 							CCoronas::aCoronas[i].green / fogscale,
 							CCoronas::aCoronas[i].blue / fogscale,