XEEN: Further renaming for _falling enum

scummvm · Jan 26, 2018 · c5268f6 · c5268f6
1 parent 1c26885
commit c5268f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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