mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-15 09:34:18 +02:00
Code Issues Releases Wiki Activity

#14 reset aim for deactivated enemies

Browse Source
This commit is contained in:
XProger
2018-06-29 03:59:33 +03:00
parent d8d3b3227d
commit e2ffa7cec2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/character.h
View File

@@ -69,6 +69,10 @@ struct Character : Controller {
updateZone(); updateZone();
} }
bool isActiveTarget() {
return flags.state == TR::Entity::asActive && !flags.invisible && health > 0.0f;
}
virtual int getRoomIndex() const { virtual int getRoomIndex() const {
int index = Controller::getRoomIndex(); int index = Controller::getRoomIndex();

4
src/lara.h
View File

@@ -1246,7 +1246,7 @@ struct Lara : Character {
bool retarget = false; bool retarget = false;
if (Core::settings.controls[camera->cameraIndex].retarget) { if (Core::settings.controls[camera->cameraIndex].retarget) {
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
if (!arms[i].tracking || ((Character*)arms[i].tracking)->health <= 0.0f) { if (!arms[i].tracking || !((Character*)arms[i].tracking)->isActiveTarget()) {
retarget = true; retarget = true;
break; break;
} }
@@ -1331,7 +1331,7 @@ struct Lara : Character {
continue; continue;
Character *enemy = (Character*)c; Character *enemy = (Character*)c;
if (enemy->health <= 0) if (!enemy->isActiveTarget())
continue; continue;
Box box = enemy->getBoundingBox(); Box box = enemy->getBoundingBox();