diff options
Diffstat (limited to 'gui/gui-manager.cpp')
| -rw-r--r-- | gui/gui-manager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp index feb4e50ce2..76f557711d 100644 --- a/gui/gui-manager.cpp +++ b/gui/gui-manager.cpp @@ -255,13 +255,13 @@ Dialog *GuiManager::getTopDialog() const { } void GuiManager::addToTrash(GuiObject* object, Dialog* parent) { - debug(7, "Adding Gui Object %p to trash", object); + debug(7, "Adding Gui Object %p to trash", (void *)object); GuiObjectTrashItem t; t.object = object; t.parent = 0; // If a dialog was provided, check it is in the dialog stack if (parent != 0) { - for (int i = 0 ; i < _dialogStack.size() ; ++i) { + for (uint i = 0 ; i < _dialogStack.size() ; ++i) { if (_dialogStack[i] == parent) { t.parent = parent; break; @@ -345,11 +345,11 @@ void GuiManager::runLoop() { // triggered in 3x mode or when running ScummVM under Valgrind.) if (activeDialog != getTopDialog() && event.type != Common::EVENT_SCREEN_CHANGED) { processEvent(event, getTopDialog()); - continue; + continue; } - + processEvent(event, activeDialog); - + if (lastRedraw + waitTime < _system->getMillis(true)) { lastRedraw = _system->getMillis(true); @@ -362,7 +362,7 @@ void GuiManager::runLoop() { Common::List<GuiObjectTrashItem>::iterator it = _guiObjectTrash.begin(); while (it != _guiObjectTrash.end()) { if ((*it).parent == 0 || (*it).parent == activeDialog) { - debug(7, "Delayed deletion of Gui Object %p", (*it).object); + debug(7, "Delayed deletion of Gui Object %p", (void *)(*it).object); delete (*it).object; it = _guiObjectTrash.erase(it); } else |