diff options
| author | aap <aap@papnet.eu> | 2019-08-28 12:58:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 12:58:42 +0200 |
| commit | 792893df594b8cd09d7e9e8486148aa0126eef3a (patch) | |
| tree | f775059bd6cd968b096f989243e496bea776ae4f /src/control/Bridge.h | |
| parent | Merge pull request #197 from Nick007J/master (diff) | |
| parent | Audio fixes (diff) | |
| download | re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.gz re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.bz2 re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.lz re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.xz re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.zst re3-792893df594b8cd09d7e9e8486148aa0126eef3a.zip | |
Diffstat (limited to 'src/control/Bridge.h')
| -rw-r--r-- | src/control/Bridge.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/control/Bridge.h b/src/control/Bridge.h index 52c85322..377c8bf8 100644 --- a/src/control/Bridge.h +++ b/src/control/Bridge.h @@ -1,27 +1,24 @@ #pragma once #include "Entity.h" +enum bridgeStates { + STATE_BRIDGE_LOCKED, + STATE_LIFT_PART_IS_UP, + STATE_LIFT_PART_MOVING_DOWN, + STATE_LIFT_PART_IS_DOWN, + STATE_LIFT_PART_ABOUT_TO_MOVE_UP, + STATE_LIFT_PART_MOVING_UP +}; + class CBridge { -private: - enum bridgeStates - { - STATE_BRIDGE_LOCKED, - STATE_LIFT_PART_IS_UP, - STATE_LIFT_PART_MOVING_DOWN, - STATE_LIFT_PART_IS_DOWN, - STATE_LIFT_PART_ABOUT_TO_MOVE_UP, - STATE_LIFT_PART_MOVING_UP - }; - - +public: static CEntity *&pLiftRoad, *&pLiftPart, *&pWeight; static int &State, &OldState; static float &DefaultZLiftPart, &DefaultZLiftRoad, &DefaultZLiftWeight; - static float& OldLift; - static uint32& TimeOfBridgeBecomingOperational; + static float &OldLift; + static uint32 &TimeOfBridgeBecomingOperational; -public: static void Init(); static void Update(); static bool ShouldLightsBeFlashing(); |