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

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Wed Feb 2 17:50:23 CET 2011


Revision: 55731
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55731&view=rev
Author:   drmccoy
Date:     2011-02-02 16:50:23 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
GOB: o7_draw0xA4 is o7_loadLBMPalette

Stubbing that one 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-02-02 16:49:49 UTC (rev 55730)
+++ scummvm/trunk/engines/gob/inter.h	2011-02-02 16:50:23 UTC (rev 55731)
@@ -617,7 +617,7 @@
 	void o7_zeroVar();
 	void o7_getINIValue();
 	void o7_setINIValue();
-	void o7_draw0xA4();
+	void o7_loadLBMPalette();
 	void o7_opendBase();
 	void o7_closedBase();
 	void o7_getDBString();

Modified: scummvm/trunk/engines/gob/inter_v7.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v7.cpp	2011-02-02 16:49:49 UTC (rev 55730)
+++ scummvm/trunk/engines/gob/inter_v7.cpp	2011-02-02 16:50:23 UTC (rev 55731)
@@ -67,7 +67,7 @@
 	OPCODEDRAW(0x95, o7_zeroVar);
 	OPCODEDRAW(0xA1, o7_getINIValue);
 	OPCODEDRAW(0xA2, o7_setINIValue);
-	OPCODEDRAW(0xA4, o7_draw0xA4);
+	OPCODEDRAW(0xA4, o7_loadLBMPalette);
 	OPCODEDRAW(0xC4, o7_opendBase);
 	OPCODEDRAW(0xC5, o7_closedBase);
 	OPCODEDRAW(0xC6, o7_getDBString);
@@ -431,15 +431,18 @@
 	_inis.setValue(file, section, key, value);
 }
 
-void Inter_v7::o7_draw0xA4() {
+void Inter_v7::o7_loadLBMPalette() {
 	Common::String file = _vm->_game->_script->evalString();
 	if (!file.contains('.'))
 		file += ".LBM";
 
-	int16 expr0 = _vm->_game->_script->readValExpr();
-	int16 expr1 = _vm->_game->_script->readValExpr();
+	int16 startIndex = CLIP<int16>(_vm->_game->_script->readValExpr(), 0, 255);
+	int16 stopIndex  = CLIP<int16>(_vm->_game->_script->readValExpr(), 0, 255);
 
-	warning("Addy Stub Draw 0xA4: \"%s\", %d, %d", file.c_str(), expr0, expr1);
+	if (startIndex > stopIndex)
+		SWAP(startIndex, stopIndex);
+
+	warning("Addy Stub: Load LBM palette: \"%s\", %d-%d", file.c_str(), startIndex, stopIndex);
 }
 
 void Inter_v7::o7_opendBase() {


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