From a9a62a8641571bb68564714907bb4bc1be29bc6c Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Wed, 17 Jul 2019 13:24:04 +0300 Subject: script fix, bomb fix, flying components fix --- src/core/Camera.cpp | 2 +- src/core/Camera.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index 166928c1..e35198d8 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -23,7 +23,7 @@ WRAPPER void CCamera::DrawBordersForWideScreen(void) { EAXJMP(0x46B430); } WRAPPER void CCamera::CalculateDerivedValues(void) { EAXJMP(0x46EEA0); } WRAPPER void CCamera::Restore(void) { EAXJMP(0x46F990); } WRAPPER void CCamera::SetWidescreenOff(void) { EAXJMP(0x46FF10); } -WRAPPER void CCamera::CamShake(float) { EAXJMP(0x46B100); } +WRAPPER void CamShakeNoPos(CCamera*, float) { EAXJMP(0x46B100); } bool CCamera::IsSphereVisible(const CVector ¢er, float radius, const CMatrix *mat) diff --git a/src/core/Camera.h b/src/core/Camera.h index 10554601..d5de76d4 100644 --- a/src/core/Camera.h +++ b/src/core/Camera.h @@ -466,7 +466,6 @@ int m_iModeObbeCamIsInForCar; void DrawBordersForWideScreen(void); void Restore(void); void SetWidescreenOff(void); - void CamShake(float); void dtor(void) { this->CCamera::~CCamera(); } }; @@ -479,3 +478,5 @@ static_assert(offsetof(CCamera, m_BlurBlue) == 0x9C, "CCamera: error"); static_assert(offsetof(CCamera, Cams) == 0x1A4, "CCamera: error"); static_assert(sizeof(CCamera) == 0xE9D8, "CCamera: wrong size"); extern CCamera &TheCamera; + +void CamShakeNoPos(CCamera*, float); \ No newline at end of file -- cgit v1.2.3 From 682e3f5984713814c53371c04469e0b4f5118772 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Wed, 17 Jul 2019 13:24:55 +0300 Subject: fix fix --- src/core/Camera.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/Camera.h b/src/core/Camera.h index d5de76d4..a88bf83a 100644 --- a/src/core/Camera.h +++ b/src/core/Camera.h @@ -479,4 +479,4 @@ static_assert(offsetof(CCamera, Cams) == 0x1A4, "CCamera: error"); static_assert(sizeof(CCamera) == 0xE9D8, "CCamera: wrong size"); extern CCamera &TheCamera; -void CamShakeNoPos(CCamera*, float); \ No newline at end of file +void CamShakeNoPos(CCamera*, float); -- cgit v1.2.3