diff options
| author | Borja Lorente | 2016-06-20 08:59:53 +0200 |
|---|---|---|
| committer | Borja Lorente | 2016-08-14 18:29:57 +0200 |
| commit | 2fbff0e6782759770048c9b9442832e525d001b6 (patch) | |
| tree | 56678d73782ee1cf28d27d1c99c50d5eec5c1e7d /engines/macventure/gui.cpp | |
| parent | 60d5ef5c5b875269f29cd817481de7e162f4966a (diff) | |
| download | scummvm-rg350-2fbff0e6782759770048c9b9442832e525d001b6.tar.gz scummvm-rg350-2fbff0e6782759770048c9b9442832e525d001b6.tar.bz2 scummvm-rg350-2fbff0e6782759770048c9b9442832e525d001b6.zip | |
MACVENTURE: Fix some minor warnings
Diffstat (limited to 'engines/macventure/gui.cpp')
| -rw-r--r-- | engines/macventure/gui.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp index 1a468eb93c..c5c6df30cb 100644 --- a/engines/macventure/gui.cpp +++ b/engines/macventure/gui.cpp @@ -94,6 +94,10 @@ void Gui::draw() { _wm.draw(); } +void Gui::drawMenu() { + _menu->draw(&_screen); +} + bool Gui::processEvent(Common::Event &event) { return _wm.processEvent(event); } @@ -271,7 +275,6 @@ bool Gui::loadMenus() { uint8 titleLength; char* title; - int menunum = -1; // High level menus have level -1 /* Skip menuID, width, height, resourceID, placeholder */ for (int skip = 0; skip < 5; skip++) { res->readUint16BE(); } enabled = res->readUint32BE(); @@ -320,8 +323,7 @@ bool Gui::loadWindows() { for (iter = resArray.begin(); iter != resArray.end(); ++iter) { res = _resourceManager->getResource(MKTAG('W', 'I', 'N', 'D'), *iter); WindowData data; - uint16 top, left, bottom, right; - uint16 borderSize; + uint16 top, left, bottom, right; top = res->readUint16BE(); left = res->readUint16BE(); bottom = res->readUint16BE(); @@ -512,7 +514,7 @@ bool diplomaWindowCallback(Graphics::WindowClick click, Common::Event &event, vo bool inventoryWindowCallback(Graphics::WindowClick click, Common::Event &event, void *gui) { Gui *g = (Gui*)gui; - return true; + return g->processInventoryEvents(click, event); } void menuCommandsCallback(int action, Common::String &text, void *data) { @@ -670,6 +672,10 @@ bool MacVenture::Gui::processDiplomaEvents(WindowClick click, Common::Event & ev return getWindowData(kDiplomaWindow).visible; } +bool Gui::processInventoryEvents(WindowClick click, Common::Event & event) { + return false; +} + /* Ugly switches */ BorderBounds Gui::borderBounds(MVWindowType type) { |