diff options
| -rw-r--r-- | engines/sherlock/image_file.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/inventory.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/journal.cpp | 5 | ||||
| -rw-r--r-- | engines/sherlock/music.cpp | 6 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_inventory.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/widget_verbs.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp index 4d713b155a..7e14ebebb4 100644 --- a/engines/sherlock/image_file.cpp +++ b/engines/sherlock/image_file.cpp @@ -1016,6 +1016,7 @@ StreamingImageFile::StreamingImageFile() { _flags = 0; _scaleVal = 0; _zPlacement = 0; + _compressed = false; } StreamingImageFile::~StreamingImageFile() { diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp index c74034f8e1..01d515c61e 100644 --- a/engines/sherlock/inventory.cpp +++ b/engines/sherlock/inventory.cpp @@ -30,13 +30,13 @@ namespace Sherlock { InventoryItem::InventoryItem(int requiredFlag, const Common::String &name, const Common::String &description, const Common::String &examine) : - _requiredFlag(requiredFlag), _name(name), _description(description), + _requiredFlag(requiredFlag), _requiredFlag1(0), _name(name), _description(description), _examine(examine), _lookFlag(0) { } InventoryItem::InventoryItem(int requiredFlag, const Common::String &name, const Common::String &description, const Common::String &examine, const Common::String &verbName) : - _requiredFlag(requiredFlag), _name(name), _description(description), + _requiredFlag(requiredFlag), _requiredFlag1(0), _name(name), _description(description), _examine(examine), _lookFlag(0) { _verb._verb = verbName; } diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp index a0c9108a55..bcac69f683 100644 --- a/engines/sherlock/journal.cpp +++ b/engines/sherlock/journal.cpp @@ -37,6 +37,11 @@ Journal *Journal::init(SherlockEngine *vm) { } Journal::Journal(SherlockEngine *vm) : _vm(vm) { + _up = _down = false; + _index = 0; + _page = 0; + _maxPage = 0; + _sub = 0; } bool Journal::drawJournal(int direction, int howFar) { diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index c6e542d135..1f211f4c51 100644 --- a/engines/sherlock/music.cpp +++ b/engines/sherlock/music.cpp @@ -450,12 +450,6 @@ bool Music::playMusic(const Common::String &name) { return false; } } else { - if (dataSize < 4) { - warning("Music: expected music header not found in music file"); - delete[] midiMusicData; - return false; - } - if (memcmp("FORM", dataPos, 4)) { warning("Music: expected header not found in music file"); delete[] midiMusicData; diff --git a/engines/sherlock/scalpel/scalpel_inventory.cpp b/engines/sherlock/scalpel/scalpel_inventory.cpp index 11f2b33eac..e19a43238c 100644 --- a/engines/sherlock/scalpel/scalpel_inventory.cpp +++ b/engines/sherlock/scalpel/scalpel_inventory.cpp @@ -85,7 +85,7 @@ void ScalpelInventory::drawInventory(InvNewMode mode) { if (tempMode == INVENTORY_DONT_DISPLAY) mode = LOOK_INVENTORY_MODE; - _invMode = (InvMode)mode; + _invMode = (InvMode)((int)mode); if (mode != PLAIN_INVENTORY) { ui._oldKey = INVENTORY_COMMANDS[(int)mode]; diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp index 2eaa70b8ef..8da60bc622 100644 --- a/engines/sherlock/tattoo/widget_verbs.cpp +++ b/engines/sherlock/tattoo/widget_verbs.cpp @@ -173,7 +173,7 @@ void WidgetVerbs::handleEvents() { _outsideMenu = true; // See if they released the mouse button - if (events._released || events._released) { + if (events._released || events._rightReleased) { // See if they want to close the menu (they clicked outside of the menu) if (!_bounds.contains(mousePos)) { if (_outsideMenu) { |