[Scummvm-cvs-logs] SF.net SVN: scummvm:[55517] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Tue Jan 25 03:51:51 CET 2011
Revision: 55517
http://scummvm.svn.sourceforge.net/scummvm/?rev=55517&view=rev
Author: drmccoy
Date: 2011-01-25 02:51:51 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
GOB: o7_draw0x90 is o7_loadLBM
Stubbed for now
Modified Paths:
--------------
scummvm/trunk/engines/gob/inter.h
scummvm/trunk/engines/gob/inter_v7.cpp
Modified: scummvm/trunk/engines/gob/inter.h
===================================================================
--- scummvm/trunk/engines/gob/inter.h 2011-01-25 02:51:26 UTC (rev 55516)
+++ scummvm/trunk/engines/gob/inter.h 2011-01-25 02:51:51 UTC (rev 55517)
@@ -601,7 +601,7 @@
void o7_draw0x89();
void o7_draw0x8A();
void o7_getSystemProperty();
- void o7_draw0x90();
+ void o7_loadLBM();
void o7_draw0x93();
void o7_draw0xA1();
void o7_draw0xA2();
Modified: scummvm/trunk/engines/gob/inter_v7.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v7.cpp 2011-01-25 02:51:26 UTC (rev 55516)
+++ scummvm/trunk/engines/gob/inter_v7.cpp 2011-01-25 02:51:51 UTC (rev 55517)
@@ -52,7 +52,7 @@
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 @@
storeValue(0);
}
-void Inter_v7::o7_draw0x90() {
+void Inter_v7::o7_loadLBM() {
_vm->_game->_script->evalExpr(0);
- Common::String str0 = _vm->_game->_script->getResultStr();
+ Common::String file = _vm->_game->_script->getResultStr();
+ if (!file.contains('.'))
+ file += ".LBM";
- 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();
+ 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 Draw 0x90: \"%s\", %d, %d, %d, %d, %d, %d, %d, %d",
- str0.c_str(), expr0, expr1, expr2, expr3, expr4, expr5, expr6, expr7);
+ 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() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list