summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-21 03:20:31 +0100
committerwithmorten <morten.with@gmail.com>2021-01-21 03:20:31 +0100
commitf2596b3759e11098e27f440b129293adab1f4c07 (patch)
tree9157c19ae9a5c7c7fbfd3ec43ce6663297d050a1 /src/render
parentmake building with Codewarrior 7 possible (diff)
parentfixed saving (diff)
downloadre3-f2596b3759e11098e27f440b129293adab1f4c07.tar
re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.gz
re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.bz2
re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.lz
re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.xz
re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.zst
re3-f2596b3759e11098e27f440b129293adab1f4c07.zip
Diffstat (limited to 'src/render')
-rw-r--r--src/render/SpecialFX.cpp2
-rw-r--r--src/render/Sprite2d.cpp6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index 6f0f24f1..97b70a94 100644
--- a/src/render/SpecialFX.cpp
+++ b/src/render/SpecialFX.cpp
@@ -587,7 +587,7 @@ C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size
pMarker->m_Color.alpha = (float)a * 0.4f * someSin + a;
}
if (pMarker->m_nRotateRate) {
- RwV3d pos = pMarker->m_Matrix.m_matrix.pos;
+ CVector pos = pMarker->m_Matrix.GetPosition();
pMarker->m_Matrix.RotateZ(DEGTORAD(pMarker->m_nRotateRate * CTimer::GetTimeStep()));
pMarker->m_Matrix.GetPosition() = pos;
}
diff --git a/src/render/Sprite2d.cpp b/src/render/Sprite2d.cpp
index 98bb6eb2..59622516 100644
--- a/src/render/Sprite2d.cpp
+++ b/src/render/Sprite2d.cpp
@@ -358,7 +358,11 @@ CSprite2d::SetMaskVertices(int n, float *positions)
RwIm2DVertexSetScreenZ(&maVertices[i], screenz);
RwIm2DVertexSetCameraZ(&maVertices[i], z);
RwIm2DVertexSetRecipCameraZ(&maVertices[i], recipz);
- RwIm2DVertexSetIntRGBA(&maVertices[i], 255, 255, 255, 255); // 0, 0, 0, 0 on PC
+#if !defined(GTA_PS2_STUFF) && defined(RWLIBS)
+ RwIm2DVertexSetIntRGBA(&maVertices[i], 0, 0, 0, 0);
+#else
+ RwIm2DVertexSetIntRGBA(&maVertices[i], 255, 255, 255, 255);
+#endif
}
}