-

Author: codenamecpp

src/GameDefs.h

@@ -810,7 +810,7 @@ enum ePedestrianDeathReason
     ePedestrianDeathReason_Fried,
     ePedestrianDeathReason_Electrocuted,
     ePedestrianDeathReason_Drowned,
-    ePedestrianDeathReason_HitByCar, // blown in car
+    ePedestrianDeathReason_HitByCar,
 };
 
 decl_enum_strings(ePedestrianDeathReason);

src/GameParams.cpp

@@ -10,7 +10,7 @@ GameParams::GameParams()
 
 void GameParams::SetToDefaults()
 {
-    mPedestrianBoundsSphereRadius = Convert::MapUnitsToMeters(0.15f);
+    mPedestrianBoundsSphereRadius = Convert::MapUnitsToMeters(0.13f);
 
     mPedestrianTurnSpeed = 260.0f;
     mPedestrianTurnSpeedSlideOnCar = 120.0f;
@@ -30,7 +30,7 @@ void GameParams::SetToDefaults()
     mWeaponsRechargeTime[eWeaponType_RocketLauncher] = 1.0f * 3.0f;
 
     // weapons distance todo
-    mWeaponsDistance[eWeaponType_Fists] = mPedestrianBoundsSphereRadius + Convert::MapUnitsToMeters(0.6f);
+    mWeaponsDistance[eWeaponType_Fists] = mPedestrianBoundsSphereRadius + 0.2f;
     mWeaponsDistance[eWeaponType_Pistol] = Convert::MapUnitsToMeters(1.0f);
     mWeaponsDistance[eWeaponType_Machinegun] = Convert::MapUnitsToMeters(1.0f);
     mWeaponsDistance[eWeaponType_Flamethrower] = Convert::MapUnitsToMeters(1.0f);

src/Pedestrian.cpp

@@ -181,7 +181,7 @@ void Pedestrian::ComputeDrawHeight(const glm::vec3& position)
     }
 
     float drawOffset = 0.02f; // todo: magic numbers
-    if (IsUnconscious())
+    if (IsUnconscious() || IsDead())
     {
         drawOffset = 0.001f; // todo: magic numbers
     }
@@ -381,3 +381,20 @@ void Pedestrian::SetDead(ePedestrianDeathReason deathReason)
     }
 }
 
+void Pedestrian::ReceiveHitByCar(Vehicle* targetCar, float impulse)
+{
+    debug_assert(targetCar);
+
+    if (IsDead())
+        return;
+
+    // todo: magic numbers
+    if (impulse > 4.0f)
+    {
+        Die(ePedestrianDeathReason_HitByCar, nullptr);
+        return;
+    }
+
+    // todo
+}
+

src/Pedestrian.h

@@ -66,6 +66,10 @@ class Pedestrian final: public GameObject
     // get damage from weapon, it may be ignored depending on its current state
     void ReceiveDamage(eWeaponType weapon, Pedestrian* attacker);
 
+    // get damage from vehicle, it may be ignored depending on its current state
+    // @param impulse: Impact value
+    void ReceiveHitByCar(Vehicle* targetCar, float impulse);
+
     // check if pedestrian entering/exiting or driving car at this moment
     bool IsCarPassenger() const;
     bool IsCarDriver() const;

src/PedestrianStates.cpp

@@ -324,6 +324,7 @@ void PedestrianStatesManager::StateDead_ProcessEnter(const PedestrianStateEvent&
     debug_assert(stateEvent.mID == ePedestrianStateEvent_Die);
     mPedestrian->SetAnimation(eSpriteAnimID_Ped_LiesOnFloor, eSpriteAnimLoop_FromStart);
     mPedestrian->SetDead(stateEvent.mDeathReason);
+    mPedestrian->mPhysicsComponent->ClearForces();
 }
 
 //////////////////////////////////////////////////////////////////////////

src/PhysicsComponents.cpp

@@ -87,8 +87,8 @@ glm::vec3 PhysicsComponent::GetPosition() const
 
 glm::vec2 PhysicsComponent::GetLinearVelocity() const
 {
-    const b2Vec2& b2position = mPhysicsBody->GetLinearVelocity();
-    return { b2position.x, b2position.y };
+    const b2Vec2& b2velocity = mPhysicsBody->GetLinearVelocity();
+    return { b2velocity.x, b2velocity.y };
 }
 
 cxx::angle_t PhysicsComponent::GetAngularVelocity() const

src/PhysicsManager.cpp

@@ -659,5 +659,8 @@ void PhysicsManager::QueryObjectsWithinBox(const glm::vec2& aaboxCenter, const g
 
 void PhysicsManager::HandleContactPedVsCar(b2Contact* contact, float impulse, PedPhysicsComponent* ped, CarPhysicsComponent* car)
 {
+    if (!ped->ShouldCollideWith(PHYSICS_OBJCAT_CAR))
+        return;
 
+    ped->mReferencePed->ReceiveHitByCar(car->mReferenceCar, impulse);
 }

src/System.cpp

@@ -73,7 +73,7 @@ bool SystemStartupParams::ParseStartupParams(int argc, char *argv[])
 {
     ClearParams();
 
-    for (int iarg = 1; iarg < argc; )
+    for (int iarg = 0; iarg < argc; )
     {
         if (cxx_stricmp(argv[iarg], "-mapname") == 0 && (argc > iarg + 1))
         {