Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge pull request #145 from guard3/master

Browse Source 
Fixed Bridge
This commit is contained in:
aap 2019-07-17 22:06:50 +02:00 committed by GitHub
commit fa98f40f7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/control/Bridge.cpp
View File

@ -46,6 +46,7 @@ void CBridge::Update()
float liftHeight; float liftHeight;
// Set bridge height and state
if (CStats::CommercialPassed) if (CStats::CommercialPassed)
{ {
if (TimeOfBridgeBecomingOperational == 0) if (TimeOfBridgeBecomingOperational == 0)
@ -81,6 +82,13 @@ void CBridge::Update()
liftHeight = 25.0; liftHeight = 25.0;
State = STATE_LIFT_PART_IS_UP; State = STATE_LIFT_PART_IS_UP;
} }
}
else
{
liftHeight = 25.0;
TimeOfBridgeBecomingOperational = 0;
State = STATE_BRIDGE_LOCKED;
}
// Move bridge part // Move bridge part
if (liftHeight != OldLift) if (liftHeight != OldLift)
@ -105,13 +113,6 @@ void CBridge::Update()
ThePaths.SetLinksBridgeLights(-330.0, -230.0, -700.0, -588.0, true); ThePaths.SetLinksBridgeLights(-330.0, -230.0, -700.0, -588.0, true);
else if (State == STATE_LIFT_PART_IS_DOWN && OldState == STATE_LIFT_PART_MOVING_DOWN) else if (State == STATE_LIFT_PART_IS_DOWN && OldState == STATE_LIFT_PART_MOVING_DOWN)
ThePaths.SetLinksBridgeLights(-330.0, -230.0, -700.0, -588.0, false); ThePaths.SetLinksBridgeLights(-330.0, -230.0, -700.0, -588.0, false);
}
else
{
liftHeight = 25.0;
TimeOfBridgeBecomingOperational = 0;
State = STATE_BRIDGE_LOCKED;
}
} }
bool CBridge::ShouldLightsBeFlashing() { return State != STATE_LIFT_PART_IS_DOWN; } bool CBridge::ShouldLightsBeFlashing() { return State != STATE_LIFT_PART_IS_DOWN; }