diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-19 13:35:48 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-01-21 03:18:15 +0100 |
| commit | ac0f759b274368b9424222a392d9f28b73980eb0 (patch) | |
| tree | 613c034aea3e8a98d9a752954198216ffebce83e /src/render | |
| parent | fix RWLIBS build without GTA_PS2_STUFF (diff) | |
| download | re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.gz re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.bz2 re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.lz re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.xz re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.zst re3-ac0f759b274368b9424222a392d9f28b73980eb0.zip | |
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/Font.h | 2 | ||||
| -rw-r--r-- | src/render/Glass.cpp | 2 | ||||
| -rw-r--r-- | src/render/Hud.cpp | 8 | ||||
| -rw-r--r-- | src/render/Instance.h | 2 | ||||
| -rw-r--r-- | src/render/SpecialFX.cpp | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/src/render/Font.h b/src/render/Font.h index a7a4b487..621375d6 100644 --- a/src/render/Font.h +++ b/src/render/Font.h @@ -1,5 +1,7 @@ #pragma once +#include "Sprite2d.h" + void AsciiToUnicode(const char *src, wchar *dst); void UnicodeStrcpy(wchar *dst, const wchar *src); void UnicodeStrcat(wchar *dst, wchar *append); diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp index 0b25525e..3b6fbd46 100644 --- a/src/render/Glass.cpp +++ b/src/render/Glass.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "common.h" #include "Glass.h" #include "Timer.h" diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index b718c163..f20397a3 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -1148,20 +1148,20 @@ void CHud::Draw() // Yeah, top and bottom changed place. R* vision if (IntroRect.m_bIsUsed && IntroRect.m_bBeforeFade) { if (IntroRect.m_nTextureId >= 0) { - CRect rect = { + CRect rect ( IntroRect.m_sRect.left, IntroRect.m_sRect.top, IntroRect.m_sRect.right, - IntroRect.m_sRect.bottom }; + IntroRect.m_sRect.bottom ); CTheScripts::ScriptSprites[IntroRect.m_nTextureId].Draw(rect, IntroRect.m_sColor); } else { - CRect rect = { + CRect rect ( IntroRect.m_sRect.left, IntroRect.m_sRect.top, IntroRect.m_sRect.right, - IntroRect.m_sRect.bottom }; + IntroRect.m_sRect.bottom ); CSprite2d::DrawRect(rect, IntroRect.m_sColor); } diff --git a/src/render/Instance.h b/src/render/Instance.h index 01dfb6a2..693cfdf1 100644 --- a/src/render/Instance.h +++ b/src/render/Instance.h @@ -9,6 +9,6 @@ class CInstance : public CPlaceable public: int m_modelIndex; public: - ~CInstance() = default; + ~CInstance() { } void Shutdown(); }; diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp index e3d2ffa6..6f0f24f1 100644 --- a/src/render/SpecialFX.cpp +++ b/src/render/SpecialFX.cpp @@ -1119,7 +1119,7 @@ CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8 } CRGBA FoamColour(255, 255, 255, 255); -unsigned int CSpecialParticleStuff::BoatFromStart; +uint32 CSpecialParticleStuff::BoatFromStart; void CSpecialParticleStuff::CreateFoamAroundObject(CMatrix* pMatrix, float innerFw, float innerRg, float innerUp, int32 particles) |