steering tweaks

[blobs.git] / src / creature / creature.cpp

diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp
index 39b96b22cafda71e9cfdae849e5cb50234319ffa..d7a9724fbe62474884cf9538165efbac1df73b81 100644 (file)
--- a/src/creature/creature.cpp
+++ b/src/creature/creature.cpp
@@ -208,6 +208,14 @@ void Creature::DoWork(double amount) noexcept {
 
 void Creature::Hurt(double amount) noexcept {
        stats.Damage().Add(amount);
+       if (stats.Damage().Full()) {
+               Die();
+       }
+}
+
+void Creature::Die() noexcept {
+       if (Dead()) return;
+
        if (stats.Damage().Full()) {
                std::ostream &log = sim.Log() << name << " ";
                if (stats.Exhaustion().Full()) {
@@ -225,12 +233,7 @@ void Creature::Hurt(double amount) noexcept {
                        << " (" << ui::PercentageString(Age() / properties.Lifetime())
                        << " of life expectancy of " << ui::TimeString(properties.Lifetime())
                        << ")" << std::endl;
-               Die();
        }
-}
-
-void Creature::Die() noexcept {
-       if (Dead()) return;
 
        sim.SetDead(this);
        death = sim.Time();
@@ -947,10 +950,8 @@ glm::dvec3 Steering::Force(const Situation::State &s) const noexcept {
                        glm::dvec3 diff = s.Position() - other->GetSituation().Position();
                        if (length2(diff) > max_look * max_look) continue;
                        if (!c.PerceptionTest(other->GetSituation().Position())) continue;
-                       double sep = length(diff) - other->Size() * 0.707 - c.Size() * 0.707;
-                       if (sep < min_dist) {
-                               repulse += normalize(diff) * (1.0 - sep / min_dist);
-                       }
+                       double sep = glm::clamp(length(diff) - other->Size() * 0.707 - c.Size() * 0.707, 0.0, min_dist);
+                       repulse += normalize(diff) * (1.0 - sep / min_dist) * force;
                }
                result += repulse;
        }