From 87ddcb2761ca5c50dc5b112d13e6de8543fdd85e Mon Sep 17 00:00:00 2001 From: Krodin <16670637+KRodinn@users.noreply.github.com> Date: Wed, 22 Sep 2021 13:18:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D1=83=D1=82=20=D1=87=D1=82=D0=BE=20?= =?UTF-8?q?=D1=82=D0=BE=20=D0=BE=D1=87=D0=B5=D0=BD=D1=8C=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=BD=D0=BE=D0=B5=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ogsr_engine/xrGame/GameObject.cpp | 6 +++--- ogsr_engine/xrGame/PHShell.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ogsr_engine/xrGame/GameObject.cpp b/ogsr_engine/xrGame/GameObject.cpp index c16c834bac..5ea5cacf0f 100644 --- a/ogsr_engine/xrGame/GameObject.cpp +++ b/ogsr_engine/xrGame/GameObject.cpp @@ -874,9 +874,9 @@ u32 CGameObject::ef_anomaly_type () const u32 CGameObject::ef_weapon_type () const { string16 temp; CLSID2TEXT(CLS_ID,temp); - R_ASSERT3 (false,"Invalid weapon type request, virtual function is not properly overridden!",temp); - return (u32(-1)); -// return (u32(0)); + //R_ASSERT3 (false,"Invalid weapon type request, virtual function is not properly overridden!",temp); + Msg("!![%s] Invalid weapon type request, virtual function is not properly overridden [%s] ", __FUNCTION__, temp); + return u32(-1); } u32 CGameObject::ef_detector_type () const diff --git a/ogsr_engine/xrGame/PHShell.cpp b/ogsr_engine/xrGame/PHShell.cpp index 43df20e129..a0696dacbe 100644 --- a/ogsr_engine/xrGame/PHShell.cpp +++ b/ogsr_engine/xrGame/PHShell.cpp @@ -298,7 +298,7 @@ void CPHShell:: applyImpulseTrace (const Fvector& pos, const Fvector& dir, floa CBoneInstance& instance=m_pKinematics->LL_GetBoneInstance (id); if(instance.callback_type() != bctPhysics || !instance.callback_param()) return; - ((CPhysicsElement*)instance.callback_param())->applyImpulseTrace ( pos, dir, val, id); + static_cast(instance.callback_param())->applyImpulseTrace( pos, dir, val, id); EnableObject(0); }