diff options
| author | Paul Gilbert | 2017-01-29 19:27:11 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-29 19:27:11 -0500 |
| commit | 6af5b08014e6573ccb9735ce3e4e2da2c141c857 (patch) | |
| tree | 41b05ce04050dae74ad8d53ac3ab0b7ef0127c6a /engines/titanic/carry | |
| parent | 5095f4c00d1b5ffd1dab06f20332500cafc84e74 (diff) | |
| download | scummvm-rg350-6af5b08014e6573ccb9735ce3e4e2da2c141c857.tar.gz scummvm-rg350-6af5b08014e6573ccb9735ce3e4e2da2c141c857.tar.bz2 scummvm-rg350-6af5b08014e6573ccb9735ce3e4e2da2c141c857.zip | |
TITANIC: Fix all music instrument properties that are bool
Diffstat (limited to 'engines/titanic/carry')
| -rw-r--r-- | engines/titanic/carry/phonograph_cylinder.cpp | 12 | ||||
| -rw-r--r-- | engines/titanic/carry/phonograph_cylinder.h | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/engines/titanic/carry/phonograph_cylinder.cpp b/engines/titanic/carry/phonograph_cylinder.cpp index 777aa8be5b..67ea301681 100644 --- a/engines/titanic/carry/phonograph_cylinder.cpp +++ b/engines/titanic/carry/phonograph_cylinder.cpp @@ -35,15 +35,15 @@ BEGIN_MESSAGE_MAP(CPhonographCylinder, CCarry) END_MESSAGE_MAP() CPhonographCylinder::CPhonographCylinder() : CCarry(), - _bellsMuteControl(false), _bellsPitchControl(false), - _bellsSpeedControl(false), _bellsDirectionControl(false), + _bellsMuteControl(false), _bellsPitchControl(0), + _bellsSpeedControl(0), _bellsDirectionControl(false), _bellsInversionControl(false), _snakeMuteControl(false), - _snakeSpeedControl(false), _snakePitchControl(false), + _snakeSpeedControl(0), _snakePitchControl(0), _snakeInversionControl(false), _snakeDirectionControl(false), - _pianoMuteControl(false), _pianoSpeedControl(false), - _pianoPitchControl(false), _pianoInversionControl(false), + _pianoMuteControl(false), _pianoSpeedControl(0), + _pianoPitchControl(0), _pianoInversionControl(false), _pianoDirectionControl(false), _bassMuteControl(false), - _bassSpeedControl(false), _bassPitchControl(false), + _bassSpeedControl(0), _bassPitchControl(0), _bassInversionControl(false) { } diff --git a/engines/titanic/carry/phonograph_cylinder.h b/engines/titanic/carry/phonograph_cylinder.h index bbb1524cb5..086dedd2fe 100644 --- a/engines/titanic/carry/phonograph_cylinder.h +++ b/engines/titanic/carry/phonograph_cylinder.h @@ -36,24 +36,24 @@ class CPhonographCylinder : public CCarry { bool ErasePhonographCylinderMsg(CErasePhonographCylinderMsg *msg); private: CString _itemName; + int _bellsPitchControl; + int _bellsSpeedControl; bool _bellsMuteControl; - bool _bellsPitchControl; - bool _bellsSpeedControl; bool _bellsDirectionControl; bool _bellsInversionControl; + int _snakeSpeedControl; + int _snakePitchControl; bool _snakeMuteControl; - bool _snakeSpeedControl; - bool _snakePitchControl; bool _snakeInversionControl; bool _snakeDirectionControl; + int _pianoSpeedControl; + int _pianoPitchControl; bool _pianoMuteControl; - bool _pianoSpeedControl; - bool _pianoPitchControl; bool _pianoInversionControl; bool _pianoDirectionControl; + int _bassSpeedControl; + int _bassPitchControl; bool _bassMuteControl; - bool _bassSpeedControl; - bool _bassPitchControl; bool _bassInversionControl; bool _bassDirectionControl; public: |