From 8e43261d13a81131e0be0bfc75627f7395f78a90 Mon Sep 17 00:00:00 2001
From: Eric Fry
Date: Thu, 28 Jun 2018 22:50:20 +1000
Subject: ILLUSIONS: Formatting fixes Simplified some point arithmetic Lock
 fixedpoint calcs to float rather than double

---
 engines/illusions/duckman/illusions_duckman.cpp |  5 +----
 engines/illusions/duckman/menusystem_duckman.h  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'engines/illusions/duckman')

diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp
index 56c997dd1f..c30b8ce318 100644
--- a/engines/illusions/duckman/illusions_duckman.cpp
+++ b/engines/illusions/duckman/illusions_duckman.cpp
@@ -983,10 +983,7 @@ uint32 IllusionsEngine_Duckman::getObjectActorTypeId(uint32 objectId) {
 }
 
 Common::Point IllusionsEngine_Duckman::convertMousePos(Common::Point mousePos) {
-	Common::Point screenOffsPt = _camera->getScreenOffset();
-	mousePos.x += screenOffsPt.x;
-	mousePos.y += screenOffsPt.y;
-	return mousePos;
+	return mousePos + _camera->getScreenOffset();
 }
 
 void IllusionsEngine_Duckman::startCursorSequence() {
diff --git a/engines/illusions/duckman/menusystem_duckman.h b/engines/illusions/duckman/menusystem_duckman.h
index edf8620020..ee53543550 100644
--- a/engines/illusions/duckman/menusystem_duckman.h
+++ b/engines/illusions/duckman/menusystem_duckman.h
@@ -27,14 +27,14 @@
 
 namespace Illusions {
 
-	enum SliderActionType {
-		SFX,
-		MUSIC,
-		VOICE,
-		TEXT_DURATION
-	};
+enum SliderActionType {
+	SFX,
+	MUSIC,
+	VOICE,
+	TEXT_DURATION
+};
 
-	enum {
+enum {
 	kDuckmanMainMenu,
 	kDuckmanLoadGameMenu,
 	kDuckmanLoadGameFailedMenu,
@@ -52,7 +52,7 @@ namespace Illusions {
 class IllusionsEngine_Duckman;
 class MenuActionUpdateSlider;
 
-	class DuckmanMenuSystem : public BaseMenuSystem {
+class DuckmanMenuSystem : public BaseMenuSystem {
 public:
 	DuckmanMenuSystem(IllusionsEngine_Duckman *vm);
 	~DuckmanMenuSystem();
-- 
cgit v1.2.3