libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-21 01:08:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XEEN: Further renaming for _falling enum

Browse Source
This commit is contained in:
Paul Gilbert 2018-01-26 06:12:57 -05:00
parent 1c26885900
commit c5268f6363
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/xeen/interface.cpp
View File

@ -639,7 +639,7 @@ void Interface::doStepCode() {
// We can fly, we can.. oh wait, we can't! // We can fly, we can.. oh wait, we can't!
damage = 100; damage = 100;
party._damageType = DT_PHYSICAL; party._damageType = DT_PHYSICAL;
_falling = FALL_1; _falling = FALL_IN_PROGRESS;
break; break;
case SURFTYPE_DESERT: case SURFTYPE_DESERT:
// Without navigation skills, simulate getting lost by adding extra time // Without navigation skills, simulate getting lost by adding extra time
@ -649,7 +649,7 @@ void Interface::doStepCode() {
case SURFTYPE_CLOUD: case SURFTYPE_CLOUD:
if (!party._levitateCount) { if (!party._levitateCount) {
party._damageType = DT_PHYSICAL; party._damageType = DT_PHYSICAL;
_falling = FALL_1; _falling = FALL_IN_PROGRESS;
damage = 100; damage = 100;
} }
break; break;
@ -698,7 +698,7 @@ void Interface::startFalling(bool flag) {
_falling = FALL_NONE; _falling = FALL_NONE;
draw3d(true); draw3d(true);
_falling = FALL_2; _falling = FALL_START;
draw3d(false); draw3d(false);
if (flag && (!isDarkCc || party._fallMaze != 0)) { 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); map.load(party._mazeId);
if (flag) { if (flag) {
@ -1241,10 +1241,10 @@ void Interface::draw3d(bool updateFlag, bool pauseFlag) {
// Handle any darkness-based oscurity // Handle any darkness-based oscurity
obscureScene(_obscurity); obscureScene(_obscurity);
if (_falling == 1) if (_falling == FALL_IN_PROGRESS)
handleFalling(); handleFalling();
if (_falling == 2) { if (_falling == FALL_START) {
screen.saveBackground(1); screen.saveBackground(1);
} }

4
engines/xeen/interface.h
View File

@ -49,8 +49,8 @@ enum IconsMode {
enum FallState { enum FallState {
FALL_NONE = 0, FALL_NONE = 0,
FALL_1 = 1, FALL_IN_PROGRESS = 1,
FALL_2 = 2 FALL_START = 2
}; };
#define HILIGHT_CHAR_DISABLED -2 #define HILIGHT_CHAR_DISABLED -2