diff options
author | Paul Gilbert | 2018-01-26 06:12:57 -0500 |
---|---|---|
committer | Paul Gilbert | 2018-01-26 07:52:28 -0500 |
commit | c5268f63635f9282b3dc904fb61ebd365a001542 (patch) | |
tree | e44cda0f1399e35783dc35fa4cebc7953df7200c | |
parent | 1c268859006156c0ce810c2b297b6dc082914da0 (diff) | |
download | scummvm-rg350-c5268f63635f9282b3dc904fb61ebd365a001542.tar.gz scummvm-rg350-c5268f63635f9282b3dc904fb61ebd365a001542.tar.bz2 scummvm-rg350-c5268f63635f9282b3dc904fb61ebd365a001542.zip |
XEEN: Further renaming for _falling enum
-rw-r--r-- | engines/xeen/interface.cpp | 12 | ||||
-rw-r--r-- | engines/xeen/interface.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp index 625f9c68b4..5fec9ad08c 100644 --- a/engines/xeen/interface.cpp +++ b/engines/xeen/interface.cpp @@ -639,7 +639,7 @@ void Interface::doStepCode() { // We can fly, we can.. oh wait, we can't! damage = 100; party._damageType = DT_PHYSICAL; - _falling = FALL_1; + _falling = FALL_IN_PROGRESS; break; case SURFTYPE_DESERT: // Without navigation skills, simulate getting lost by adding extra time @@ -649,7 +649,7 @@ void Interface::doStepCode() { case SURFTYPE_CLOUD: if (!party._levitateCount) { party._damageType = DT_PHYSICAL; - _falling = FALL_1; + _falling = FALL_IN_PROGRESS; damage = 100; } break; @@ -698,7 +698,7 @@ void Interface::startFalling(bool flag) { _falling = FALL_NONE; draw3d(true); - _falling = FALL_2; + _falling = FALL_START; draw3d(false); if (flag && (!isDarkCc || party._fallMaze != 0)) { @@ -875,7 +875,7 @@ void Interface::startFalling(bool flag) { } } - _falling = FALL_1; + _falling = FALL_IN_PROGRESS; map.load(party._mazeId); if (flag) { @@ -1241,10 +1241,10 @@ void Interface::draw3d(bool updateFlag, bool pauseFlag) { // Handle any darkness-based oscurity obscureScene(_obscurity); - if (_falling == 1) + if (_falling == FALL_IN_PROGRESS) handleFalling(); - if (_falling == 2) { + if (_falling == FALL_START) { screen.saveBackground(1); } diff --git a/engines/xeen/interface.h b/engines/xeen/interface.h index 5051dad692..9e6a2a7555 100644 --- a/engines/xeen/interface.h +++ b/engines/xeen/interface.h @@ -49,8 +49,8 @@ enum IconsMode { enum FallState { FALL_NONE = 0, - FALL_1 = 1, - FALL_2 = 2 + FALL_IN_PROGRESS = 1, + FALL_START = 2 }; #define HILIGHT_CHAR_DISABLED -2 |