hit by car

Author: codenamecpp

src/GameParams.cpp

@@ -10,7 +10,7 @@ GameParams::GameParams()
 
 void GameParams::SetToDefaults()
 {
-    mPedestrianBoundsSphereRadius = Convert::MapUnitsToMeters(0.13f);
+    mPedestrianBoundsSphereRadius = Convert::MapUnitsToMeters(0.10f);
 
     mPedestrianTurnSpeed = 260.0f;
     mPedestrianTurnSpeedSlideOnCar = 120.0f;

src/Pedestrian.cpp

@@ -388,13 +388,18 @@ void Pedestrian::ReceiveHitByCar(Vehicle* targetCar, float impulse)
     if (IsDead())
         return;
 
-    // todo: magic numbers
-    if (impulse > 4.0f)
+    if (impulse > 4.0f || IsUnconscious()) // todo: magic numbers
     {
         Die(ePedestrianDeathReason_HitByCar, nullptr);
         return;
     }
 
-    // todo
+    // jump over
+    if (mStatesManager.CanStartSlideOnCarState())
+    {
+        PedestrianStateEvent evData { ePedestrianStateEvent_PushByCar };
+        mStatesManager.ChangeState(ePedestrianState_SlideOnCar, evData);
+        return;
+    }
 }
 

src/PedestrianStates.cpp

@@ -530,7 +530,7 @@ void PedestrianStatesManager::StateKnockedDown_ProcessEnter(const PedestrianStat
         mPedestrian->SetCarExited();
     }
 
-    float impulse = 0.6f;
+    float impulse = 0.5f; // todo: magic numbers
 
     mPedestrian->SetAnimation(eSpriteAnimID_Ped_FallShort, eSpriteAnimLoop_None);
     mPedestrian->mPhysicsComponent->AddLinearImpulse(-mPedestrian->mPhysicsComponent->GetSignVector() * impulse);

src/PedestrianStates.h

@@ -16,6 +16,7 @@ enum ePedestrianStateEvent
     ePedestrianStateEvent_FallFromHeightEnd,
     ePedestrianStateEvent_WeaponChange, 
     ePedestrianStateEvent_WaterContact,
+    ePedestrianStateEvent_PushByCar,
 };
 
 // defines state event
@@ -58,6 +59,8 @@ class PedestrianStatesManager: public cxx::noncopyable
     // update current state
     void ProcessFrame();
 
+    bool CanStartSlideOnCarState() const;
+
 private:
     void InitFuncsTable();
 
@@ -71,7 +74,6 @@ class PedestrianStatesManager: public cxx::noncopyable
     // anims helpers
     eSpriteAnimID DetectIdleAnimation() const;
 
-    bool CanStartSlideOnCarState() const;
     void SetInCarPositionToDoor();
     void SetInCarPositionToSeat();