aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
authorSven Hesse2011-01-25 11:01:51 +0000
committerSven Hesse2011-01-25 11:01:51 +0000
commitc8f58b4e194fe7b8f9cc985505d7ba0dd34cfb6f (patch)
treeb3d2eacdbcfc99ea30ccdc97fa1cb6f91575cb3a /engines/gob
parente1a9c866bf40abf487030aca9fe8a5fa90cefe79 (diff)
downloadscummvm-rg350-c8f58b4e194fe7b8f9cc985505d7ba0dd34cfb6f.tar.gz
scummvm-rg350-c8f58b4e194fe7b8f9cc985505d7ba0dd34cfb6f.tar.bz2
scummvm-rg350-c8f58b4e194fe7b8f9cc985505d7ba0dd34cfb6f.zip
GOB: o7_draw0x0D is o7_loadCursor
Not implemented yet, because they're in cursor32.dll as PE resources... svn-id: r55526
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/inter.h2
-rw-r--r--engines/gob/inter_v7.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 18b7260f78..f49c3fe52d 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -594,7 +594,7 @@ protected:
virtual void setupOpcodesGob();
void o7_draw0x0C();
- void o7_draw0x0D();
+ void o7_loadCursor();
void o7_displayWarning();
void o7_draw0x45();
void o7_draw0x57();
diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp
index 9d76f483cf..d971cf7c05 100644
--- a/engines/gob/inter_v7.cpp
+++ b/engines/gob/inter_v7.cpp
@@ -46,7 +46,7 @@ void Inter_v7::setupOpcodesDraw() {
Inter_Playtoons::setupOpcodesDraw();
OPCODEDRAW(0x0C, o7_draw0x0C);
- OPCODEDRAW(0x0D, o7_draw0x0D);
+ OPCODEDRAW(0x0D, o7_loadCursor);
OPCODEDRAW(0x44, o7_displayWarning);
OPCODEDRAW(0x45, o7_draw0x45);
OPCODEDRAW(0x57, o7_draw0x57);
@@ -77,13 +77,13 @@ void Inter_v7::o7_draw0x0C() {
WRITE_VAR(17, 0);
}
-void Inter_v7::o7_draw0x0D() {
- _vm->_game->_script->evalExpr(0);
- Common::String str0 = _vm->_game->_script->getResultStr();
+void Inter_v7::o7_loadCursor() {
+ int16 cursorIndex = _vm->_game->_script->readValExpr();
- int16 expr0 = _vm->_game->_script->readValExpr();
+ _vm->_game->_script->evalExpr(0);
+ Common::String cursorFile = _vm->_game->_script->getResultStr();
- warning("Addy Stub Draw 0x0D: \"%s\", %d", str0.c_str(), expr0);
+ warning("Addy Stub: Load cursor \"%s\" to %d", cursorFile.c_str(), cursorIndex);
}
void Inter_v7::o7_displayWarning() {