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

#22 fix pickup & heavy triggers

Browse Source
This commit is contained in:
XProger
2017-12-22 03:56:20 +03:00
parent 9801422949
commit 37a162e2df
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lara.h
View File

@@ -1774,7 +1774,7 @@ struct Lara : Character {
void checkTrigger(Controller *controller, bool heavy) {
TR::Level::FloorInfo info;
getFloorInfo(getRoomIndex(), controller->pos, info);
getFloorInfo(controller->getRoomIndex(), controller->pos, info);
if (getEntity().isLara() && info.lava && info.floor == pos.y) {
hit(LARA_MAX_HEALTH + 1, NULL, TR::HIT_LAVA);
@@ -1857,10 +1857,13 @@ struct Lara : Character {
break;
}
case TR::Level::Trigger::PICKUP :
if (!level->entities[info.trigCmd[cmdIndex++].args].flags.invisible)
case TR::Level::Trigger::PICKUP : {
Controller *controller = (Controller*)level->entities[info.trigCmd[cmdIndex++].args].controller;
if (!controller->flags.invisible)
return;
break;
}
case TR::Level::Trigger::COMBAT :
if (emptyHands())