diff options
| author | Strangerke | 2014-03-24 19:15:59 +0100 |
|---|---|---|
| committer | Strangerke | 2014-03-24 19:15:59 +0100 |
| commit | 48e785c329937868b403869414344dbc78525a95 (patch) | |
| tree | 362c3c293dd8ee7765f65a3de411fe81efc0ade4 | |
| parent | 0b1c15e6dcd2f16d5ef67e61fd4c8c0157f66706 (diff) | |
| download | scummvm-rg350-48e785c329937868b403869414344dbc78525a95.tar.gz scummvm-rg350-48e785c329937868b403869414344dbc78525a95.tar.bz2 scummvm-rg350-48e785c329937868b403869414344dbc78525a95.zip | |
MADS: Fix a couple of warnings in the hotspot code
| -rw-r--r-- | engines/mads/hotspots.h | 2 | ||||
| -rw-r--r-- | engines/mads/user_interface.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/mads/hotspots.h b/engines/mads/hotspots.h index ec9f12dc77..37c37fa1c2 100644 --- a/engines/mads/hotspots.h +++ b/engines/mads/hotspots.h @@ -57,7 +57,7 @@ public: public: DynamicHotspots(MADSEngine *vm); - int size() const { return _entries.size(); } + Common::Array<MADS::DynamicHotspot>::size_type size() const { return _entries.size(); } DynamicHotspot &operator[](uint idx) { return _entries[idx]; } int add(int descId, int vocabId, int seqIndex, const Common::Rect &bounds); int setPosition(int index, int xp, int yp, int facing); diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp index 2ea656d0c5..28fc5a6e55 100644 --- a/engines/mads/user_interface.cpp +++ b/engines/mads/user_interface.cpp @@ -665,7 +665,7 @@ void UserInterface::scrollInventory() { _scrollFlag = true; if (yp == (MADS_SCREEN_HEIGHT - 1)) { - if (_inventoryTopIndex < (invList.size() - 1)) { + if (_inventoryTopIndex < (int)(invList.size() - 1)) { ++_inventoryTopIndex; _inventoryChanged = true; } |