From 4a8cb7e1f7bc6f1bf45f22caa176f9a20087d1c8 Mon Sep 17 00:00:00 2001
From: XProger <xproger@list.ru>
Date: Sun, 24 Jun 2018 13:29:07 +0300
Subject: [PATCH] fixed #53 check for enemy-enemy collisions, stalking mode if
 player is out of enemy zone

---
 src/enemy.h | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/enemy.h b/src/enemy.h
index 0960397..133bf3f 100644
--- a/src/enemy.h
+++ b/src/enemy.h
@@ -155,12 +155,36 @@ struct Enemy : Character {
         if (pz != nz) pos.z = float(nz);
     }
 
+    void collideEnemies() {
+        if (getEntity().isBigEnemy())
+            return;
+
+        Controller *c = Controller::first;
+        while (c) {
+            if (c != this && c->getEntity().isEnemy()) {
+                Enemy *enemy = (Enemy*)c;
+                if (enemy->health > 0.0f) {
+                    vec3 dir = vec3(enemy->pos.x - pos.x, 0.0f, enemy->pos.z - pos.z);
+                    float D = dir.length2();
+                    float R = enemy->radius + radius;
+                    if (D < R * R) {
+                        D = sqrt(D);
+                        pos -= dir.normal() * (R - D);
+                    }
+                }
+            }
+            c = c->next;
+        }
+    }
+
     virtual void updatePosition() {
         if (!flags.active) return;
 
         vec3 p = pos;
         pos += velocity * (30.0f * Core::deltaTime);
 
+        collideEnemies();
+
         clipByBox(pos);
 
         TR::Level::FloorInfo info;
@@ -339,12 +363,12 @@ struct Enemy : Character {
 
         int targetBoxOld = targetBox;
 
-        if (target->health <= 0.0f)
+        bool inZone = zone == target->zone;
+
+        if (target->health <= 0.0f || !inZone)
             targetBox = -1;
 
     // update mood
-        bool inZone = zone == target->zone;
-
         if (mood != MOOD_ATTACK && targetBox > -1 && !checkBox(targetBox)) {
             if (!inZone)
                 mood = MOOD_SLEEP;