mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-16 01:54:38 +02:00
Code Issues Releases Wiki Activity

fixed #53 check for enemy-enemy collisions, stalking mode if player is out of enemy zone

Browse Source
This commit is contained in:
XProger
2018-06-24 13:29:07 +03:00
parent 2d07e96ce8
commit 4a8cb7e1f7
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/enemy.h
View File

@@ -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;