fix waterfall fliprooms

XProger · Jul 15, 2018 · b2af886 · b2af886
1 parent ff81590
commit b2af886
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/game.h b/src/game.h
@@ -22,11 +22,12 @@ namespace Game {
         delete level;
         level = new Level(*lvl);
 
+        bool playLogo  = level->level.isTitle() && id == TR::LVL_MAX;
         bool playVideo = id != level->level.id;
         if (level->level.isTitle() && id != TR::LVL_MAX)
             playVideo = false;
 
-        level->init(id == TR::LVL_MAX, playVideo);
+        level->init(playLogo, playVideo);
 
         UI::game = level;
         #if !defined(_OS_PSP) && !defined(_OS_CLOVER)

diff --git a/src/trigger.h b/src/trigger.h
@@ -1456,7 +1456,7 @@ struct Waterfall : Controller {
     Waterfall(IGame *game, int entity) : Controller(game, entity), timer(0.0f) {}
 
     virtual void update() {
-        if (getEntity().room != getRoomIndex()) // room is flipped
+        if (getRoom().alternateRoom != -1 && level->state.flags.flipped) // room is flipped
             return;
 
         vec3 delta = (game->getLara(pos)->pos - pos) * (1.0f / 1024.0f);