aboutsummaryrefslogtreecommitdiff
path: root/sword2/mouse.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sword2/mouse.cpp')
-rw-r--r--sword2/mouse.cpp27
1 files changed, 21 insertions, 6 deletions
diff --git a/sword2/mouse.cpp b/sword2/mouse.cpp
index be8953c254..a0ee7361ac 100644
--- a/sword2/mouse.cpp
+++ b/sword2/mouse.cpp
@@ -326,19 +326,34 @@ void Mouse::systemMenuMouse(void) {
switch (hit) {
case 0:
- _vm->_gui->optionControl();
+ {
+ OptionsDialog dialog(_vm);
+ dialog.runModal();
+ }
break;
case 1:
- _vm->_gui->quitControl();
+ {
+ QuitDialog dialog(_vm);
+ dialog.runModal();
+ }
break;
case 2:
- _vm->_gui->saveControl();
+ {
+ SaveLoadDialog dialog(_vm, kSaveDialog);
+ dialog.runModal();
+ }
break;
case 3:
- _vm->_gui->restoreControl();
+ {
+ SaveLoadDialog dialog(_vm, kLoadDialog);
+ dialog.runModal();
+ }
break;
case 4:
- _vm->_gui->restartControl();
+ {
+ RestartDialog dialog(_vm);
+ dialog.runModal();
+ }
break;
}
@@ -993,7 +1008,7 @@ void Mouse::createPointerText(uint32 text_id, uint32 pointer_res) {
int16 xOffset, yOffset;
uint8 justification;
- if (!_vm->_gui->_pointerTextSelected || !text_id)
+ if (!_objectLabels || !text_id)
return;
// Check what the pointer is, to set offsets correctly for text