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

[drmccoy at users.sourceforge.net]

Revision: 35385
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35385&view=rev
Author:   drmccoy
Date:     2008-12-15 16:01:39 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
Script fix. Magnifier, Memory and Save/Load, while still not working correctly, don't crash the game anymore

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter.h
    scummvm/trunk/engines/gob/inter_bargon.cpp
    scummvm/trunk/engines/gob/inter_v1.cpp
    scummvm/trunk/engines/gob/inter_v2.cpp
    scummvm/trunk/engines/gob/inter_v3.cpp
    scummvm/trunk/engines/gob/inter_v4.cpp
    scummvm/trunk/engines/gob/inter_v5.cpp
    scummvm/trunk/engines/gob/inter_v6.cpp

Modified: scummvm/trunk/engines/gob/inter.h
===================================================================
--- scummvm/trunk/engines/gob/inter.h	2008-12-15 15:36:21 UTC (rev 35384)
+++ scummvm/trunk/engines/gob/inter.h	2008-12-15 16:01:39 UTC (rev 35385)
@@ -388,7 +388,6 @@
 	bool o2_addCollision(OpFuncParams &params);
 	bool o2_freeCollision(OpFuncParams &params);
 	bool o2_goblinFunc(OpFuncParams &params);
-	bool o2_createSprite(OpFuncParams &params);
 	bool o2_stopSound(OpFuncParams &params);
 	bool o2_loadSound(OpFuncParams &params);
 	bool o2_getFreeMem(OpFuncParams &params);

Modified: scummvm/trunk/engines/gob/inter_bargon.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_bargon.cpp	2008-12-15 15:36:21 UTC (rev 35384)
+++ scummvm/trunk/engines/gob/inter_bargon.cpp	2008-12-15 16:01:39 UTC (rev 35385)
@@ -492,7 +492,7 @@
 		/* 24 */
 		OPCODE(o1_putPixel),
 		OPCODE(o2_goblinFunc),
-		OPCODE(o2_createSprite),
+		OPCODE(o1_createSprite),
 		OPCODE(o1_freeSprite),
 		/* 28 */
 		{NULL, ""},

Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp	2008-12-15 15:36:21 UTC (rev 35384)
+++ scummvm/trunk/engines/gob/inter_v1.cpp	2008-12-15 16:01:39 UTC (rev 35385)
@@ -1821,9 +1821,15 @@
 	int16 width, height;
 	int16 flag;
 
-	index = load16();
-	width = load16();
-	height = load16();
+	if (_vm->_global->_inter_execPtr[1] == 0) {
+		index = load16();
+		width = load16();
+		height = load16();
+	} else {
+		index = _vm->_parse->parseValExpr();
+		width = _vm->_parse->parseValExpr();
+		height = _vm->_parse->parseValExpr();
+	}
 
 	flag = load16();
 	_vm->_draw->initSpriteSurf(index, width, height, flag ? 2 : 0);

Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp	2008-12-15 15:36:21 UTC (rev 35384)
+++ scummvm/trunk/engines/gob/inter_v2.cpp	2008-12-15 16:01:39 UTC (rev 35385)
@@ -500,7 +500,7 @@
 		/* 24 */
 		OPCODE(o1_putPixel),
 		OPCODE(o2_goblinFunc),
-		OPCODE(o2_createSprite),
+		OPCODE(o1_createSprite),
 		OPCODE(o1_freeSprite),
 		/* 28 */
 		{NULL, ""},
@@ -1852,23 +1852,6 @@
 	return false;
 }
 
-bool Inter_v2::o2_createSprite(OpFuncParams &params) {
-	int16 index;
-	int16 width, height;
-	int16 flag;
-
-	index = load16();
-	width = load16();
-	height = load16();
-
-	_vm->_draw->adjustCoords(0, &width, &height);
-
-	flag = load16();
-	_vm->_draw->initSpriteSurf(index, width, height, flag);
-
-	return false;
-}
-
 bool Inter_v2::o2_stopSound(OpFuncParams &params) {
 	int16 expr;
 

Modified: scummvm/trunk/engines/gob/inter_v3.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v3.cpp	2008-12-15 15:36:21 UTC (rev 35384)
+++ scummvm/trunk/engines/gob/inter_v3.cpp	2008-12-15 16:01:39 UTC (rev 35385)
@@ -489,7 +489,7 @@
 		/* 24 */
 		OPCODE(o1_putPixel),
 		OPCODE(o2_goblinFunc),
-		OPCODE(o2_createSprite),
+		OPCODE(o1_createSprite),
 		OPCODE(o1_freeSprite),
 		/* 28 */
 		{NULL, ""},

Modified: scummvm/trunk/engines/gob/inter_v4.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v4.cpp	2008-12-15 15:36:21 UTC (rev 35384)
+++ scummvm/trunk/engines/gob/inter_v4.cpp	2008-12-15 16:01:39 UTC (rev 35385)
@@ -490,7 +490,7 @@
 		/* 24 */
 		OPCODE(o1_putPixel),
 		OPCODE(o2_goblinFunc),
-		OPCODE(o2_createSprite),
+		OPCODE(o1_createSprite),
 		OPCODE(o1_freeSprite),
 		/* 28 */
 		{NULL, ""},

Modified: scummvm/trunk/engines/gob/inter_v5.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v5.cpp	2008-12-15 15:36:21 UTC (rev 35384)
+++ scummvm/trunk/engines/gob/inter_v5.cpp	2008-12-15 16:01:39 UTC (rev 35385)
@@ -444,7 +444,7 @@
 		/* 24 */
 		OPCODE(o1_putPixel),
 		OPCODE(o2_goblinFunc),
-		OPCODE(o2_createSprite),
+		OPCODE(o1_createSprite),
 		OPCODE(o1_freeSprite),
 		/* 28 */
 		{NULL, ""},

Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp	2008-12-15 15:36:21 UTC (rev 35384)
+++ scummvm/trunk/engines/gob/inter_v6.cpp	2008-12-15 16:01:39 UTC (rev 35385)
@@ -423,7 +423,7 @@
 		/* 24 */
 		OPCODE(o1_putPixel),
 		OPCODE(o2_goblinFunc),
-		OPCODE(o2_createSprite),
+		OPCODE(o1_createSprite),
 		OPCODE(o1_freeSprite),
 		/* 28 */
 		{NULL, ""},


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