Skip to content

Commit 87ddcb2

Browse files
committed
Тут что то очень странное [skip ci]
1 parent 6f15135 commit 87ddcb2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ogsr_engine/xrGame/GameObject.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -874,9 +874,9 @@ u32 CGameObject::ef_anomaly_type () const
874874
u32 CGameObject::ef_weapon_type () const
875875
{
876876
string16 temp; CLSID2TEXT(CLS_ID,temp);
877-
R_ASSERT3 (false,"Invalid weapon type request, virtual function is not properly overridden!",temp);
878-
return (u32(-1));
879-
// return (u32(0));
877+
//R_ASSERT3 (false,"Invalid weapon type request, virtual function is not properly overridden!",temp);
878+
Msg("!![%s] Invalid weapon type request, virtual function is not properly overridden [%s] ", __FUNCTION__, temp);
879+
return u32(-1);
880880
}
881881

882882
u32 CGameObject::ef_detector_type () const

ogsr_engine/xrGame/PHShell.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ void CPHShell:: applyImpulseTrace (const Fvector& pos, const Fvector& dir, floa
298298
CBoneInstance& instance=m_pKinematics->LL_GetBoneInstance (id);
299299
if(instance.callback_type() != bctPhysics || !instance.callback_param()) return;
300300

301-
((CPhysicsElement*)instance.callback_param())->applyImpulseTrace ( pos, dir, val, id);
301+
static_cast<CPhysicsElement*>(instance.callback_param())->applyImpulseTrace( pos, dir, val, id);
302302
EnableObject(0);
303303
}
304304

0 commit comments

Comments
 (0)