aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/gfx
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-29 18:58:36 -0500
committerPaul Gilbert2017-01-29 18:58:36 -0500
commit5095f4c00d1b5ffd1dab06f20332500cafc84e74 (patch)
tree9eb53580015a0809d43a3f9dcafe78c940b6f124 /engines/titanic/gfx
parente7446adaf2b734350110d84eb43252639d7805e7 (diff)
downloadscummvm-rg350-5095f4c00d1b5ffd1dab06f20332500cafc84e74.tar.gz
scummvm-rg350-5095f4c00d1b5ffd1dab06f20332500cafc84e74.tar.bz2
scummvm-rg350-5095f4c00d1b5ffd1dab06f20332500cafc84e74.zip
TITANIC: Cleanup of music instrument settings code
Diffstat (limited to 'engines/titanic/gfx')
-rw-r--r--engines/titanic/gfx/music_control.cpp2
-rw-r--r--engines/titanic/gfx/music_control.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/gfx/music_control.cpp b/engines/titanic/gfx/music_control.cpp
index 26f27666ba..40a9f89789 100644
--- a/engines/titanic/gfx/music_control.cpp
+++ b/engines/titanic/gfx/music_control.cpp
@@ -45,7 +45,7 @@ void CMusicControl::save(SimpleFile *file, int indent) {
void CMusicControl::load(SimpleFile *file) {
file->readNumber();
- _controlArea = (MusicControlArea)file->readNumber();
+ _controlArea = (MusicInstrument)file->readNumber();
_controlVal = file->readNumber();
_controlMax = file->readNumber();
_enabled = file->readNumber();
diff --git a/engines/titanic/gfx/music_control.h b/engines/titanic/gfx/music_control.h
index b33b4ae809..3da063af19 100644
--- a/engines/titanic/gfx/music_control.h
+++ b/engines/titanic/gfx/music_control.h
@@ -33,7 +33,7 @@ class CMusicControl : public CBackground {
bool MouseButtonDownMsg(CMouseButtonDownMsg *msg);
bool MouseDoubleClickMsg(CMouseDoubleClickMsg *msg);
public:
- MusicControlArea _controlArea;
+ MusicInstrument _controlArea;
int _controlVal;
int _controlMax;
bool _enabled;