mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-28 18:35:29 +00:00
Code Issues Projects Releases Wiki Activity

removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun

Browse source
This commit is contained in:
majestic 2020-06-11 01:36:45 -07:00
parent 94e3c30054
commit 2cc8ecbb90
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/peds/Ped.cpp
View file

@ -13422,13 +13422,7 @@ CPed::Render(void)
CMatrix mgTopMat, localAdjMat; CMatrix mgTopMat, localAdjMat;
mgTopMat.Attach(RwFrameGetMatrix(frame)); mgTopMat.Attach(RwFrameGetMatrix(frame));
localAdjMat.SetRotateX(player->m_fGunSpinAngle); localAdjMat.SetRotateX(player->m_fGunSpinAngle);
localAdjMat.Rotate(DEGTORAD(-4.477f)* vecTestTemp.x, DEGTORAD(29.731f) * vecTestTemp.y, DEGTORAD(1.064f) * vecTestTemp.z);
// 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.GetPosition() += CVector(0.829f, -0.001f, 0.226f); localAdjMat.GetPosition() += CVector(0.829f, -0.001f, 0.226f);
mgTopMat = mgTopMat * localAdjMat; mgTopMat = mgTopMat * localAdjMat;
mgTopMat.UpdateRW(); mgTopMat.UpdateRW();

2
src/render/Fluff.cpp
View file

@ -22,7 +22,7 @@
bool CSmokeTrails::CigOn = false; bool CSmokeTrails::CigOn = false;
CSmokeTrail CSmokeTrails::aSmoke[3]; 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 }; 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, 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,