diff options
| author | Sven Hesse | 2011-01-31 21:01:50 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-31 21:01:50 +0000 |
| commit | a3a51efa807843993dc31fdfe5b5b5a6efc321fb (patch) | |
| tree | 87728c52fe2640336184da81160a115bf95dab96 | |
| parent | 1c1cfaf867673226337a7d8d6e30a83304124e09 (diff) | |
| download | scummvm-rg350-a3a51efa807843993dc31fdfe5b5b5a6efc321fb.tar.gz scummvm-rg350-a3a51efa807843993dc31fdfe5b5b5a6efc321fb.tar.bz2 scummvm-rg350-a3a51efa807843993dc31fdfe5b5b5a6efc321fb.zip | |
GOB: Actually, draw opcode 0x90 is loadImage
Not just loadLBM. The image can be a TGA, LBM, BRC, BMP or JPEG.
svn-id: r55694
| -rw-r--r-- | engines/gob/inter.h | 2 | ||||
| -rw-r--r-- | engines/gob/inter_v7.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/engines/gob/inter.h b/engines/gob/inter.h index b93060187e..38ef872983 100644 --- a/engines/gob/inter.h +++ b/engines/gob/inter.h @@ -612,7 +612,7 @@ protected: void o7_draw0x89(); void o7_findFile(); void o7_getSystemProperty(); - void o7_loadLBM(); + void o7_loadImage(); void o7_setVolume(); void o7_zeroVar(); void o7_getINIValue(); diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp index 64173eb6ac..34159bb839 100644 --- a/engines/gob/inter_v7.cpp +++ b/engines/gob/inter_v7.cpp @@ -61,7 +61,7 @@ void Inter_v7::setupOpcodesDraw() { OPCODEDRAW(0x89, o7_draw0x89); OPCODEDRAW(0x8A, o7_findFile); OPCODEDRAW(0x8C, o7_getSystemProperty); - OPCODEDRAW(0x90, o7_loadLBM); + OPCODEDRAW(0x90, o7_loadImage); OPCODEDRAW(0x93, o7_setVolume); OPCODEDRAW(0x95, o7_zeroVar); OPCODEDRAW(0xA1, o7_getINIValue); @@ -350,10 +350,10 @@ void Inter_v7::o7_getSystemProperty() { storeValue(0); } -void Inter_v7::o7_loadLBM() { +void Inter_v7::o7_loadImage() { Common::String file = _vm->_game->_script->evalString(); if (!file.contains('.')) - file += ".LBM"; + file += ".TGA"; int16 spriteIndex = _vm->_game->_script->readValExpr(); int16 left = _vm->_game->_script->readValExpr(); @@ -364,7 +364,9 @@ void Inter_v7::o7_loadLBM() { 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)", + // Supported formats: TGA, LBM, BRC, BMP or JPEG + + warning("Addy Stub: Load image \"%s\", sprite %d, %dx%d+%d+%d @ %d+%d (%d)", file.c_str(), spriteIndex, width, height, left, top, x, y, transp); } |