mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-20 11:51:36 +02:00
Code Issues Releases Wiki Activity

fix deadloop for giant mutant and multi activation trigger for enemies

Browse Source
This commit is contained in:
XProger
2018-07-01 21:13:49 +03:00
parent 73d4915493
commit 3dbbab4c3b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/controller.h
View File

@@ -513,7 +513,7 @@ struct Controller {
} }
virtual bool activate() { virtual bool activate() {
if (flags.state == TR::Entity::asActive) if (flags.state == TR::Entity::asActive || next)
return false; return false;
flags.invisible = false; flags.invisible = false;
flags.state = TR::Entity::asActive; flags.state = TR::Entity::asActive;
@@ -539,6 +539,7 @@ struct Controller {
prev = c; prev = c;
c = c->next; c = c->next;
} }
next = NULL;
} }
} }
@@ -546,15 +547,17 @@ struct Controller {
Controller *prev = NULL; Controller *prev = NULL;
Controller *c = first; Controller *c = first;
while (c) { while (c) {
Controller *next = c->next;
if (c->flags.state == TR::Entity::asInactive) { if (c->flags.state == TR::Entity::asInactive) {
if (prev) if (prev)
prev->next = c->next; prev->next = c->next;
else else
first = c->next; first = c->next;
c->flags.state = TR::Entity::asNone; c->flags.state = TR::Entity::asNone;
c->next = NULL;
} else } else
prev = c; prev = c;
c = c->next; c = next;
} }
} }