LASTEXPRESS: Replace INVERT_Y macro

scummvm · Jul 17, 2012 · be94a24 · be94a24
1 parent 3cf7e8c
commit be94a24
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/engines/lastexpress/game/beetle.cpp b/engines/lastexpress/game/beetle.cpp
@@ -336,33 +336,35 @@ void Beetle::drawUpdate() {
 		}
 	}
 
-#define INVERT_Y() \
-	switch (_data->indexes[_data->offset]) { \
-	default: \
-		break; \
-	case 24: \
-	case 25: \
-	case 26: \
-	case 27: \
-	case 28: \
-		_data->coordY = -_data->coordY; \
-		break; \
-	}
-
 	// Invert direction
-	INVERT_Y();
+	invertDirection();
 
 	SequenceFrame *frame = new SequenceFrame(_data->currentSequence, (uint16)_data->currentFrame);
 	updateFrame(frame);
 
-	INVERT_Y();
+	invertDirection();
 
 	getScenes()->addToQueue(frame);
 
 	SAFE_DELETE(_data->frame);
 	_data->frame = frame;
 }
 
+void Beetle::invertDirection() {
+	switch (_data->indexes[_data->offset]) {
+	default:
+		break;
+
+	case 24:
+	case 25:
+	case 26:
+	case 27:
+	case 28:
+		_data->coordY = -_data->coordY;
+		break;
+	}
+}
+
 void Beetle::move() {
 	if (!_data)
 		error("[Beetle::move] Sequences have not been loaded");

diff --git a/engines/lastexpress/game/beetle.h b/engines/lastexpress/game/beetle.h
@@ -111,6 +111,7 @@ class Beetle {
 	void updateFrame(SequenceFrame *frame) const;
 	void updateData(uint32 index);
 	void drawUpdate();
+	void invertDirection();
 };
 
 } // End of namespace LastExpress