[Scummvm-cvs-logs] SF.net SVN: scummvm:[55694] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 55694
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55694&view=rev
Author:   drmccoy
Date:     2011-01-31 21:01:50 +0000 (Mon, 31 Jan 2011)

Log Message:
-----------
GOB: Actually, draw opcode 0x90 is loadImage

Not just loadLBM. The image can be a TGA, LBM, BRC, BMP or JPEG.

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-31 20:43:04 UTC (rev 55693)
+++ scummvm/trunk/engines/gob/inter.h	2011-01-31 21:01:50 UTC (rev 55694)
@@ -612,7 +612,7 @@
 	void o7_draw0x89();
 	void o7_findFile();
 	void o7_getSystemProperty();
-	void o7_loadLBM();
+	void o7_loadImage();
 	void o7_setVolume();
 	void o7_zeroVar();
 	void o7_getINIValue();

Modified: scummvm/trunk/engines/gob/inter_v7.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v7.cpp	2011-01-31 20:43:04 UTC (rev 55693)
+++ scummvm/trunk/engines/gob/inter_v7.cpp	2011-01-31 21:01:50 UTC (rev 55694)
@@ -61,7 +61,7 @@
 	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 @@
 	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 @@
 	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);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.