summaryrefslogtreecommitdiffstats
path: root/src/renderer
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-08-08 14:34:02 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-08-08 14:34:02 +0200
commit88b4c7b50b032f06510fec278babe7502cd85d64 (patch)
treea3696b405ab314eb845766c57f4c3e941753c3d5 /src/renderer
parentMerge pull request #1266 from Nick007J/miami (diff)
parentCVehicle fixes and cleanup (diff)
downloadre3-88b4c7b50b032f06510fec278babe7502cd85d64.tar
re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.gz
re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.bz2
re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.lz
re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.xz
re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.zst
re3-88b4c7b50b032f06510fec278babe7502cd85d64.zip
Diffstat (limited to 'src/renderer')
-rw-r--r--src/renderer/Draw.cpp2
-rw-r--r--src/renderer/Font.cpp2
-rw-r--r--src/renderer/Font.h2
-rw-r--r--src/renderer/Sprite.cpp4
4 files changed, 7 insertions, 3 deletions
diff --git a/src/renderer/Draw.cpp b/src/renderer/Draw.cpp
index 9c5921c3..a5e7504b 100644
--- a/src/renderer/Draw.cpp
+++ b/src/renderer/Draw.cpp
@@ -110,4 +110,4 @@ float CDraw::ScaleY(float y)
{
return ms_bProperScaling ? y : y * ((float)DEFAULT_SCREEN_HEIGHT/SCREEN_HEIGHT_NTSC);
}
-#endif \ No newline at end of file
+#endif \ No newline at end of file
diff --git a/src/renderer/Font.cpp b/src/renderer/Font.cpp
index 9c499248..6ae10011 100644
--- a/src/renderer/Font.cpp
+++ b/src/renderer/Font.cpp
@@ -49,7 +49,7 @@ UnicodeMakeUpperCase(wchar *dst, const wchar *src) //idk what to do with it, see
}
CFontDetails CFont::Details;
-int16 CFont::NewLine;
+bool16 CFont::NewLine;
CSprite2d CFont::Sprite[MAX_FONTS];
CFontRenderState CFont::RenderState;
diff --git a/src/renderer/Font.h b/src/renderer/Font.h
index 42eb7b4c..02e7df3b 100644
--- a/src/renderer/Font.h
+++ b/src/renderer/Font.h
@@ -129,7 +129,7 @@ class CFont
#else
static int16 Size[MAX_FONTS][210];
#endif
- static int16 NewLine;
+ static bool16 NewLine;
public:
static CSprite2d Sprite[MAX_FONTS];
static CFontDetails Details;
diff --git a/src/renderer/Sprite.cpp b/src/renderer/Sprite.cpp
index 58b29ea9..ecfd3fdc 100644
--- a/src/renderer/Sprite.cpp
+++ b/src/renderer/Sprite.cpp
@@ -5,6 +5,10 @@
#include "Camera.h"
#include "Sprite.h"
+#ifdef ASPECT_RATIO_SCALE
+#include "Frontend.h"
+#endif
+
float CSprite::m_f2DNearScreenZ;
float CSprite::m_f2DFarScreenZ;
float CSprite::m_fRecipNearClipPlane;