mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-02-25 07:52:43 +01:00
Code Issues Releases Wiki Activity

fix waterfall fliprooms

Browse Source
This commit is contained in:
XProger 2018-07-15 05:23:18 +03:00
parent ff8159003c
commit b2af88608f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/game.h
View File

@ -22,11 +22,12 @@ namespace Game {
delete level; delete level;
level = new Level(*lvl); level = new Level(*lvl);
bool playLogo = level->level.isTitle() && id == TR::LVL_MAX;
bool playVideo = id != level->level.id; bool playVideo = id != level->level.id;
if (level->level.isTitle() && id != TR::LVL_MAX) if (level->level.isTitle() && id != TR::LVL_MAX)
playVideo = false; playVideo = false;
level->init(id == TR::LVL_MAX, playVideo); level->init(playLogo, playVideo);
UI::game = level; UI::game = level;
#if !defined(_OS_PSP) && !defined(_OS_CLOVER) #if !defined(_OS_PSP) && !defined(_OS_CLOVER)

2
src/trigger.h
View File

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