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

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Thu Jun 24 13:50:25 CEST 2010


Revision: 50209
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50209&view=rev
Author:   strangerke
Date:     2010-06-24 11:50:25 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
Initialize properly paramCount in gob1. This fixes several valgrind errors, and the unknown opcodes are now skipped as expected. (related to bug #3018918, only partially solved)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter_v1.cpp

Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp	2010-06-24 11:29:26 UTC (rev 50208)
+++ scummvm/trunk/engines/gob/inter_v1.cpp	2010-06-24 11:50:25 UTC (rev 50209)
@@ -1331,7 +1331,8 @@
 	gobParams.retVarPtr.set(*_variables, 236);
 
 	cmd = _vm->_game->_script->readInt16();
-	_vm->_game->_script->skip(2);
+	gobParams.paramCount = _vm->_game->_script->readInt16();
+
 	if ((cmd > 0) && (cmd < 17)) {
 		objDescSet = true;
 		gobParams.extraData = _vm->_game->_script->readInt16();


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