aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorFilippos Karapetis2010-02-03 01:36:53 +0000
committerFilippos Karapetis2010-02-03 01:36:53 +0000
commit887ca3145ebfce7c54d2cffeffb3d40de3fbe272 (patch)
tree347bb5bb687bcd0654493d3ca96210727786f59c /engines/sci/engine
parent09046947d4885dea20321c5ca1166e980b169517 (diff)
downloadscummvm-rg350-887ca3145ebfce7c54d2cffeffb3d40de3fbe272.tar.gz
scummvm-rg350-887ca3145ebfce7c54d2cffeffb3d40de3fbe272.tar.bz2
scummvm-rg350-887ca3145ebfce7c54d2cffeffb3d40de3fbe272.zip
Initial implementation of text drawing for SCI2 (it's a hack for now, done the "SCI0-SCI11" way, and text splitting is wrong...)
svn-id: r47838
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/kernel32.cpp2
-rw-r--r--engines/sci/engine/selector.cpp2
-rw-r--r--engines/sci/engine/vm.h3
3 files changed, 6 insertions, 1 deletions
diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp
index 44a6a04b23..917637a7c1 100644
--- a/engines/sci/engine/kernel32.cpp
+++ b/engines/sci/engine/kernel32.cpp
@@ -778,7 +778,7 @@ reg_t kCreateTextBitmap(EngineState *s, int argc, reg_t *argv) {
// TODO: argument 0 is usually 0, and arguments 1 and 2 are usually 1
reg_t object = argv[3];
Common::String text = s->_segMan->getString(GET_SEL32(s->_segMan, object, text));
- debug("%s", text.c_str());
+ debug("kCreateTextBitmap: %s", text.c_str());
return NULL_REG;
}
diff --git a/engines/sci/engine/selector.cpp b/engines/sci/engine/selector.cpp
index 8e3f57e547..c2bc7de2ac 100644
--- a/engines/sci/engine/selector.cpp
+++ b/engines/sci/engine/selector.cpp
@@ -165,6 +165,8 @@ void Kernel::mapSelectors() {
FIND_SELECTOR(plane);
FIND_SELECTOR(top);
FIND_SELECTOR(left);
+ FIND_SELECTOR(dimmed);
+ FIND_SELECTOR(fore);
#endif
}
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index 6da1868805..85ece64d7a 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -204,6 +204,9 @@ struct SelectorCache {
Selector plane;
Selector top;
Selector left;
+
+ Selector fore;
+ Selector dimmed;
#endif
};