diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2020-06-29 10:23:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 10:23:02 +0200 |
| commit | a01fe76db72a8890f56da21c9e04503f487e7654 (patch) | |
| tree | bdab5315528220a05436eeb81756784ac74930b9 /src/control | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | Update MBlur.cpp (diff) | |
| download | re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.gz re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.bz2 re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.lz re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.xz re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.zst re3-a01fe76db72a8890f56da21c9e04503f487e7654.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/GameLogic.cpp | 6 | ||||
| -rw-r--r-- | src/control/Script.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp index ae26dd05..04983e30 100644 --- a/src/control/GameLogic.cpp +++ b/src/control/GameLogic.cpp @@ -127,7 +127,7 @@ CGameLogic::Update() RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat); SortOutStreamingAndMemory(pPlayerInfo.GetPos()); TheCamera.m_fCamShakeForce = 0.0f; - TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE); + TheCamera.SetMotionBlur(0, 0, 0, 0, MOTION_BLUR_NONE); CPad::GetPad(0)->StopShaking(0); CReferences::RemoveReferencesToPlayer(); CCarCtrl::CountDownToCarsAtStart = 2; @@ -207,7 +207,7 @@ CGameLogic::Update() pPlayerInfo.m_pPed->ClearWeapons(); SortOutStreamingAndMemory(pPlayerInfo.GetPos()); TheCamera.m_fCamShakeForce = 0.0f; - TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE); + TheCamera.SetMotionBlur(0, 0, 0, 0, MOTION_BLUR_NONE); CPad::GetPad(0)->StopShaking(0); CReferences::RemoveReferencesToPlayer(); CCarCtrl::CountDownToCarsAtStart = 2; @@ -254,7 +254,7 @@ CGameLogic::Update() RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat); SortOutStreamingAndMemory(pPlayerInfo.GetPos()); TheCamera.m_fCamShakeForce = 0.0f; - TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE); + TheCamera.SetMotionBlur(0, 0, 0, 0, MOTION_BLUR_NONE); CPad::GetPad(0)->StopShaking(0); CReferences::RemoveReferencesToPlayer(); CCarCtrl::CountDownToCarsAtStart = 2; diff --git a/src/control/Script.h b/src/control/Script.h index 9c4b2b6c..e0ed314e 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -380,7 +380,7 @@ private: enum { - MAX_STACK_DEPTH = 6, + MAX_STACK_DEPTH = 6, // 4 PS2 NUM_LOCAL_VARS = 16, NUM_TIMERS = 2 }; |