diff options
author | Eric Fry | 2018-06-28 22:50:20 +1000 |
---|---|---|
committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
commit | 8e43261d13a81131e0be0bfc75627f7395f78a90 (patch) | |
tree | e6f2d38900233da689bb59d3ec293f14b510a4b6 /engines/illusions/duckman | |
parent | fee1f3d8cb065182322bc80aba39a66a1b4b0cfb (diff) | |
download | scummvm-rg350-8e43261d13a81131e0be0bfc75627f7395f78a90.tar.gz scummvm-rg350-8e43261d13a81131e0be0bfc75627f7395f78a90.tar.bz2 scummvm-rg350-8e43261d13a81131e0be0bfc75627f7395f78a90.zip |
ILLUSIONS: Formatting fixes
Simplified some point arithmetic
Lock fixedpoint calcs to float rather than double
Diffstat (limited to 'engines/illusions/duckman')
-rw-r--r-- | engines/illusions/duckman/illusions_duckman.cpp | 5 | ||||
-rw-r--r-- | engines/illusions/duckman/menusystem_duckman.h | 16 |
2 files changed, 9 insertions, 12 deletions
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(); |