aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorBendegúz Nagy2016-08-09 08:33:31 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commit3f1fee6dcb9d13dda82683e39cc642419d73d08a (patch)
treeeb76b374dddcf1068f8646c090a9bee484469b39 /engines
parentd7ff8127152a6a70c854f698142f86300d36243d (diff)
downloadscummvm-rg350-3f1fee6dcb9d13dda82683e39cc642419d73d08a.tar.gz
scummvm-rg350-3f1fee6dcb9d13dda82683e39cc642419d73d08a.tar.bz2
scummvm-rg350-3f1fee6dcb9d13dda82683e39cc642419d73d08a.zip
DM: Add _g335_selectedDialogChoice
Diffstat (limited to 'engines')
-rw-r--r--engines/dm/dialog.cpp4
-rw-r--r--engines/dm/dialog.h1
-rw-r--r--engines/dm/eventman.cpp3
3 files changed, 6 insertions, 2 deletions
diff --git a/engines/dm/dialog.cpp b/engines/dm/dialog.cpp
index fc610c6ff7..e13cf314ff 100644
--- a/engines/dm/dialog.cpp
+++ b/engines/dm/dialog.cpp
@@ -33,7 +33,9 @@
namespace DM {
-DialogMan::DialogMan(DMEngine* vm) : _vm(vm) {}
+DialogMan::DialogMan(DMEngine* vm) : _vm(vm) {
+ _g335_selectedDialogChoice = 0;
+}
void DialogMan::f427_dialogDraw(char* msg1, char* msg2, char* choice1, char* choice2, char* choice3, char* choice4, bool screenDialog, bool clearScreen, bool fading) {
static Box constBox1 = Box(0, 223, 101, 125);
diff --git a/engines/dm/dialog.h b/engines/dm/dialog.h
index 2dd3e5bd2a..a4dd7e3425 100644
--- a/engines/dm/dialog.h
+++ b/engines/dm/dialog.h
@@ -33,6 +33,7 @@ namespace DM {
class DialogMan {
DMEngine *_vm;
public:
+ uint16 _g335_selectedDialogChoice; // @ G0335_ui_SelectedDialogChoice
explicit DialogMan(DMEngine *vm);
void f427_dialogDraw(char *msg1, char *msg2, char *choice1, char *choice2,
char *choice3, char *choice4, bool screenDialog, bool clearScreen, bool fading); // @ F0427_DIALOG_Draw
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
index f4e506179e..efa541f446 100644
--- a/engines/dm/eventman.cpp
+++ b/engines/dm/eventman.cpp
@@ -38,6 +38,7 @@
#include "projexpl.h"
#include "text.h"
#include "group.h"
+#include "dialog.h"
namespace DM {
@@ -814,7 +815,7 @@ void EventManager::f380_processCommandQueue() {
return;
}
if ((cmdType >= k210_CommandClickOnDialogChoice_1) && (cmdType <= k213_CommandClickOnDialogChoice_4)) {
- warning(false, "MISSING CODE:G0335_ui_SelectedDialogChoice = cmdType - (k210_CommandClickOnDialogChoice_1 - 1);");
+ _vm->_dialog->_g335_selectedDialogChoice = cmdType - (k210_CommandClickOnDialogChoice_1 - 1);
return;
}
if (cmdType == k215_CommandRestartGame) {