aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-13 19:08:40 +0000
committerMartin Kiewitz2009-10-13 19:08:40 +0000
commit8ccafc09a96a4fafceec67794b1f86691d3efc67 (patch)
tree4c7d51911e1b779514767d4a9e1519344b529ba8
parentc59c10ac087cd835996d71c0e52f416d46e083ac (diff)
downloadscummvm-rg350-8ccafc09a96a4fafceec67794b1f86691d3efc67.tar.gz
scummvm-rg350-8ccafc09a96a4fafceec67794b1f86691d3efc67.tar.bz2
scummvm-rg350-8ccafc09a96a4fafceec67794b1f86691d3efc67.zip
SCI/newgui: DrawControl type 10 is actually just a dummy in qfg1ega, we dont need to do anything. I believe some other control is responsible for the percentage box
svn-id: r45044
-rw-r--r--engines/sci/engine/kgraphics.cpp4
-rw-r--r--engines/sci/gui/gui.cpp4
-rw-r--r--engines/sci/gui/gui.h2
3 files changed, 6 insertions, 4 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index ff1f4e528e..aedaee39cf 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -1130,8 +1130,8 @@ void _k_GenericDrawControl(EngineState *s, reg_t controlObject, bool hilite) {
delete[] listStrings;
return;
- case SCI_CONTROLS_TYPE_PERCENTAGE:
- // TODO: Implement this
+ case SCI_CONTROLS_TYPE_DUMMY:
+ // Actually this here does nothing at all, its required by at least QfG1/EGA that we accept this type
return;
default:
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index 8600d4a472..0848ba9b81 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -408,9 +408,11 @@ void SciGui::editControl(reg_t controlObject, reg_t eventObject) {
SegManager *segMan = _s->_segMan;
int16 controlType = GET_SEL32V(controlObject, type);
- if (controlType == SCI_CONTROLS_TYPE_TEXTEDIT) {
+ switch (controlType) {
+ case SCI_CONTROLS_TYPE_TEXTEDIT:
// Only process textedit controls in here
_gfx->TexteditChange(controlObject, eventObject);
+ return;
}
}
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index eea965e182..bcc0060e8e 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -38,7 +38,7 @@ enum {
SCI_CONTROLS_TYPE_ICON = 4,
SCI_CONTROLS_TYPE_LIST = 6,
SCI_CONTROLS_TYPE_LIST_ALIAS = 7,
- SCI_CONTROLS_TYPE_PERCENTAGE = 10
+ SCI_CONTROLS_TYPE_DUMMY = 10
};
class SciGuiScreen;