From 2cc8ecbb90b044fc10829d14dc7e21d46af826e1 Mon Sep 17 00:00:00 2001 From: majestic Date: Thu, 11 Jun 2020 01:36:45 -0700 Subject: [PATCH] removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun --- src/peds/Ped.cpp | 8 +------- src/render/Fluff.cpp | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 0395abff..785050c9 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -13422,13 +13422,7 @@ CPed::Render(void) CMatrix mgTopMat, localAdjMat; mgTopMat.Attach(RwFrameGetMatrix(frame)); localAdjMat.SetRotateX(player->m_fGunSpinAngle); - - // TODO(Miami): What are those numbers?! - // localAdjMat.Rotate(flt_691FFC * flt_97F878, flt_691FF8 * flt_97F87C, flt_691FF4 * flt_97F880); - float rotX = DEGTORAD(-4.469f)* vecTestTemp.x; - float rotY = DEGTORAD(27.736f) * vecTestTemp.y; - float rotZ = DEGTORAD(1.064f) * vecTestTemp.z; - localAdjMat.Rotate(rotX, rotY, rotZ); + localAdjMat.Rotate(DEGTORAD(-4.477f)* vecTestTemp.x, DEGTORAD(29.731f) * vecTestTemp.y, DEGTORAD(1.064f) * vecTestTemp.z); localAdjMat.GetPosition() += CVector(0.829f, -0.001f, 0.226f); mgTopMat = mgTopMat * localAdjMat; mgTopMat.UpdateRW(); diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp index 9074ee66..9770eb0a 100644 --- a/src/render/Fluff.cpp +++ b/src/render/Fluff.cpp @@ -22,7 +22,7 @@ bool CSmokeTrails::CigOn = false; CSmokeTrail CSmokeTrails::aSmoke[3]; -extern RwImVertexIndex SmokeTrailIndices[32] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, +RwImVertexIndex SmokeTrailIndices[32] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16 }; float RandomSmoke[16] = { 10.0f, 5.0f, -1.0f, -9.0f, -7.0f, -1.0f, 0.0f, 3.0f, 6.0f, 7.0f, 4.0f, 2.0f,