aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
authorSven Hesse2011-01-25 02:51:51 +0000
committerSven Hesse2011-01-25 02:51:51 +0000
commita875901485145174d5ac8c04d8c5a8fb5cf73c08 (patch)
treed3f112b09685f7f665e2e3b2fba45001b3d101a5 /engines/gob
parentc293eb60738c9f5941d011fdffe41a857f9f8d69 (diff)
downloadscummvm-rg350-a875901485145174d5ac8c04d8c5a8fb5cf73c08.tar.gz
scummvm-rg350-a875901485145174d5ac8c04d8c5a8fb5cf73c08.tar.bz2
scummvm-rg350-a875901485145174d5ac8c04d8c5a8fb5cf73c08.zip
GOB: o7_draw0x90 is o7_loadLBM
Stubbed for now svn-id: r55517
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/inter.h2
-rw-r--r--engines/gob/inter_v7.cpp32
2 files changed, 18 insertions, 16 deletions
diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 07f2f74167..c44f93e3ed 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -601,7 +601,7 @@ protected:
void o7_draw0x89();
void o7_draw0x8A();
void o7_getSystemProperty();
- void o7_draw0x90();
+ void o7_loadLBM();
void o7_draw0x93();
void o7_draw0xA1();
void o7_draw0xA2();
diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp
index 6f15a897b1..42004bc69a 100644
--- a/engines/gob/inter_v7.cpp
+++ b/engines/gob/inter_v7.cpp
@@ -52,7 +52,7 @@ void Inter_v7::setupOpcodesDraw() {
OPCODEDRAW(0x89, o7_draw0x89);
OPCODEDRAW(0x8A, o7_draw0x8A);
OPCODEDRAW(0x8C, o7_getSystemProperty);
- OPCODEDRAW(0x90, o7_draw0x90);
+ OPCODEDRAW(0x90, o7_loadLBM);
OPCODEDRAW(0x93, o7_draw0x93);
OPCODEDRAW(0xA1, o7_draw0xA1);
OPCODEDRAW(0xA2, o7_draw0xA2);
@@ -161,21 +161,23 @@ void Inter_v7::o7_getSystemProperty() {
storeValue(0);
}
-void Inter_v7::o7_draw0x90() {
+void Inter_v7::o7_loadLBM() {
_vm->_game->_script->evalExpr(0);
- Common::String str0 = _vm->_game->_script->getResultStr();
-
- int16 expr0 = _vm->_game->_script->readValExpr();
- int16 expr1 = _vm->_game->_script->readValExpr();
- int16 expr2 = _vm->_game->_script->readValExpr();
- int16 expr3 = _vm->_game->_script->readValExpr();
- int16 expr4 = _vm->_game->_script->readValExpr();
- int16 expr5 = _vm->_game->_script->readValExpr();
- int16 expr6 = _vm->_game->_script->readValExpr();
- int16 expr7 = _vm->_game->_script->readValExpr();
-
- warning("Addy Stub Draw 0x90: \"%s\", %d, %d, %d, %d, %d, %d, %d, %d",
- str0.c_str(), expr0, expr1, expr2, expr3, expr4, expr5, expr6, expr7);
+ Common::String file = _vm->_game->_script->getResultStr();
+ if (!file.contains('.'))
+ file += ".LBM";
+
+ int16 spriteIndex = _vm->_game->_script->readValExpr();
+ int16 left = _vm->_game->_script->readValExpr();
+ int16 top = _vm->_game->_script->readValExpr();
+ int16 width = _vm->_game->_script->readValExpr();
+ int16 height = _vm->_game->_script->readValExpr();
+ int16 x = _vm->_game->_script->readValExpr();
+ int16 y = _vm->_game->_script->readValExpr();
+ int16 transp = _vm->_game->_script->readValExpr();
+
+ warning("Addy Stub: Load LBM \"%s\", sprite %d, %dx%d+%d+%d @ %d+%d (%d)",
+ file.c_str(), spriteIndex, width, height, left, top, x, y, transp);
}
void Inter_v7::o7_draw0x93() {