CEntity::KillEntity: Detach Actor from Vehicle or Mounted Weapon upon…

… death to circumvent crash with character_physics_support
OpenXRay · Sep 17, 2016 · 9701519 · 9701519
1 parent 473004e
commit 9701519
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/xrGame/Actor.h b/src/xrGame/Actor.h
@@ -244,15 +244,14 @@ struct SDefNewsMsg{
  void detach_Vehicle ();
  void steer_Vehicle (float angle);
  void attach_Vehicle (CHolderCustom* vehicle);
-
+ bool use_MountedWeapon (CHolderCustom* object);
  virtual bool can_attach (const CInventoryItem *inventory_item) const;
 protected:
  CHolderCustom* m_holder;
  u16 m_holderID;
  bool use_Holder (CHolderCustom* holder);
 
  bool use_Vehicle (CHolderCustom* object);
- bool use_MountedWeapon (CHolderCustom* object);
  void ActorUse ();
 
 protected:

diff --git a/src/xrGame/Entity.cpp b/src/xrGame/Entity.cpp
@@ -246,6 +246,11 @@ void CEntity::net_Destroy ()
 
 void CEntity::KillEntity(u16 whoID)
 {
+ if (this->ID() == Actor()->ID())
+ {
+ Actor()->detach_Vehicle();
+ Actor()->use_MountedWeapon(NULL);
+ }
  if (whoID != ID()) {
 #ifdef DEBUG
  if (m_killer_id != ALife::_OBJECT_ID(-1)) {