[Scummvm-cvs-logs] SF.net SVN: scummvm:[46368] tools/trunk

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Sun Dec 13 22:44:57 CET 2009 

Revision: 46368
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46368&view=rev
Author:   strangerke
Date:     2009-12-13 21:44:57 +0000 (Sun, 13 Dec 2009)

Log Message:
-----------
degob - rename some opcodes functions, as it was done in the GSOC branch

Modified Paths:
--------------
    tools/trunk/degob_script.h
    tools/trunk/degob_script_bargon.cpp
    tools/trunk/degob_script_v1.cpp
    tools/trunk/degob_script_v2.cpp
    tools/trunk/degob_script_v3.cpp
    tools/trunk/degob_script_v4.cpp
    tools/trunk/degob_script_v5.cpp
    tools/trunk/degob_script_v6.cpp

Modified: tools/trunk/degob_script.h
===================================================================
--- tools/trunk/degob_script.h	2009-12-13 21:42:01 UTC (rev 46367)
+++ tools/trunk/degob_script.h	2009-12-13 21:44:57 UTC (rev 46368)
@@ -232,7 +232,7 @@
 	void o1_return(FuncParams &params);
 	void o1_returnTo(FuncParams &params);
 	void o1_setcmdCount(FuncParams &params);
-	void o1_evaluateStore(FuncParams &params);
+	void o1_assign(FuncParams &params);
 
 	void o1_palLoad(FuncParams &params);
 	void o1_loadSpriteToPos(FuncParams &params);
@@ -288,7 +288,7 @@
 	void o2_goblinFunc(FuncParams &params);
 
 	void o2_totSub(FuncParams &params);
-	void o2_evaluateStore(FuncParams &params);
+	void o2_assign(FuncParams &params);
 	void o2_pushVars(FuncParams &params);
 	void o2_popVars(FuncParams &params);
 
@@ -500,7 +500,7 @@
 	virtual void goblinOpcode(int i, FuncParams &params);
 
 	void o6_loadCursor(FuncParams &params);
-	void o6_evaluateStore(FuncParams &params);
+	void o6_assign(FuncParams &params);
 	void o6_createSprite(FuncParams &params);
 };
 

Modified: tools/trunk/degob_script_bargon.cpp
===================================================================
--- tools/trunk/degob_script_bargon.cpp	2009-12-13 21:42:01 UTC (rev 46367)
+++ tools/trunk/degob_script_bargon.cpp	2009-12-13 21:44:57 UTC (rev 46368)
@@ -446,7 +446,7 @@
 		{OPCODEF(o1_whileDo), {PARAM_NONE}},
 		/* 08 */
 		{OPCODEF(o1_if), {PARAM_NONE}},
-		{OPCODEF(o2_evaluateStore), {PARAM_NONE}},
+		{OPCODEF(o2_assign), {PARAM_NONE}},
 		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 0C */
@@ -465,8 +465,8 @@
 		{OPCODET(o1_capturePop), {PARAM_NONE}},
 		{OPCODET(o2_animPalInit), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR}},
 		/* 18 */
-		{OPCODET(o2_addCollision), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
-		{OPCODET(o2_freeCollision), {PARAM_EXPR}},
+		{OPCODET(o2_addHotspot), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_removeHotspot), {PARAM_EXPR}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 1C */

Modified: tools/trunk/degob_script_v1.cpp
===================================================================
--- tools/trunk/degob_script_v1.cpp	2009-12-13 21:42:01 UTC (rev 46367)
+++ tools/trunk/degob_script_v1.cpp	2009-12-13 21:44:57 UTC (rev 46368)
@@ -447,7 +447,7 @@
 		{OPCODEF(o1_whileDo), {PARAM_NONE}},
 		/* 08 */
 		{OPCODEF(o1_if), {PARAM_NONE}},
-		{OPCODEF(o1_evaluateStore), {PARAM_NONE}},
+		{OPCODEF(o1_assign), {PARAM_NONE}},
 		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 0C */
@@ -517,7 +517,7 @@
 		{OPCODET(o1_checkData), {PARAM_EXPR, PARAM_VARINDEX}},
 		/* 40 */
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o1_prepareStr), {PARAM_VARINDEX}},
+		{OPCODET(o1_cleanupStr), {PARAM_VARINDEX}},
 		{OPCODET(o1_insertStr), {PARAM_VARINDEX, PARAM_EXPR}},
 		{OPCODET(o1_cutStr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
 		/* 44 */
@@ -886,7 +886,7 @@
 	params.counter = 0;
 }
 
-void Script_v1::o1_evaluateStore(FuncParams &params) {
+void Script_v1::o1_assign(FuncParams &params) {
 	printIndent();
 	std::string varIndex = readVarIndex();
 	std::string expr = readExpr();

Modified: tools/trunk/degob_script_v2.cpp
===================================================================
--- tools/trunk/degob_script_v2.cpp	2009-12-13 21:42:01 UTC (rev 46367)
+++ tools/trunk/degob_script_v2.cpp	2009-12-13 21:44:57 UTC (rev 46368)
@@ -447,7 +447,7 @@
 		{OPCODEF(o1_whileDo), {PARAM_NONE}},
 		/* 08 */
 		{OPCODEF(o1_if), {PARAM_NONE}},
-		{OPCODEF(o2_evaluateStore), {PARAM_NONE}},
+		{OPCODEF(o2_assign), {PARAM_NONE}},
 		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 0C */
@@ -466,8 +466,8 @@
 		{OPCODET(o1_capturePop), {PARAM_NONE}},
 		{OPCODET(o2_animPalInit), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR}},
 		/* 18 */
-		{OPCODET(o2_addCollision), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
-		{OPCODET(o2_freeCollision), {PARAM_EXPR}},
+		{OPCODET(o2_addHotspot), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_removeHotspot), {PARAM_EXPR}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 1C */
@@ -517,7 +517,7 @@
 		{OPCODET(o2_checkData), {PARAM_EXPR, PARAM_VARINDEX}},
 		/* 40 */
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o1_prepareStr), {PARAM_VARINDEX}},
+		{OPCODET(o1_cleanupStr), {PARAM_VARINDEX}},
 		{OPCODET(o1_insertStr), {PARAM_VARINDEX, PARAM_EXPR}},
 		{OPCODET(o1_cutStr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
 		/* 44 */
@@ -723,7 +723,7 @@
 	endFunc();
 }
 
-void Script_v2::o2_evaluateStore(FuncParams &params) {
+void Script_v2::o2_assign(FuncParams &params) {
 	uint8 type = peekUint8();
 	std::string varIndex = readVarIndex();
 

Modified: tools/trunk/degob_script_v3.cpp
===================================================================
--- tools/trunk/degob_script_v3.cpp	2009-12-13 21:42:01 UTC (rev 46367)
+++ tools/trunk/degob_script_v3.cpp	2009-12-13 21:44:57 UTC (rev 46368)
@@ -447,7 +447,7 @@
 		{OPCODEF(o1_whileDo), {PARAM_NONE}},
 		/* 08 */
 		{OPCODEF(o1_if), {PARAM_NONE}},
-		{OPCODEF(o2_evaluateStore), {PARAM_NONE}},
+		{OPCODEF(o2_assign), {PARAM_NONE}},
 		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 0C */
@@ -466,8 +466,8 @@
 		{OPCODET(o1_capturePop), {PARAM_NONE}},
 		{OPCODET(o2_animPalInit), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR}},
 		/* 18 */
-		{OPCODET(o2_addCollision), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
-		{OPCODET(o2_freeCollision), {PARAM_EXPR}},
+		{OPCODET(o2_addHotspot), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_removeHotspot), {PARAM_EXPR}},
 		{OPCODET(o3_getTotTextItemPart), {PARAM_UINT16, PARAM_VARINDEX, PARAM_EXPR}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 1C */
@@ -517,7 +517,7 @@
 		{OPCODET(o2_checkData), {PARAM_EXPR, PARAM_VARINDEX}},
 		/* 40 */
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o1_prepareStr), {PARAM_VARINDEX}},
+		{OPCODET(o1_cleanupStr), {PARAM_VARINDEX}},
 		{OPCODET(o1_insertStr), {PARAM_VARINDEX, PARAM_EXPR}},
 		{OPCODET(o1_cutStr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
 		/* 44 */

Modified: tools/trunk/degob_script_v4.cpp
===================================================================
--- tools/trunk/degob_script_v4.cpp	2009-12-13 21:42:01 UTC (rev 46367)
+++ tools/trunk/degob_script_v4.cpp	2009-12-13 21:44:57 UTC (rev 46368)
@@ -447,7 +447,7 @@
 		{OPCODEF(o1_whileDo), {PARAM_NONE}},
 		/* 08 */
 		{OPCODEF(o1_if), {PARAM_NONE}},
-		{OPCODEF(o2_evaluateStore), {PARAM_NONE}},
+		{OPCODEF(o2_assign), {PARAM_NONE}},
 		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 0C */
@@ -466,8 +466,8 @@
 		{OPCODET(o1_capturePop), {PARAM_NONE}},
 		{OPCODET(o2_animPalInit), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR}},
 		/* 18 */
-		{OPCODET(o2_addCollision), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
-		{OPCODET(o2_freeCollision), {PARAM_EXPR}},
+		{OPCODET(o2_addHotspot), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_removeHotspot), {PARAM_EXPR}},
 		{OPCODET(o3_getTotTextItemPart), {PARAM_UINT16, PARAM_VARINDEX, PARAM_EXPR}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 1C */
@@ -517,7 +517,7 @@
 		{OPCODET(o2_checkData), {PARAM_EXPR, PARAM_VARINDEX}},
 		/* 40 */
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o1_prepareStr), {PARAM_VARINDEX}},
+		{OPCODET(o1_cleanupStr), {PARAM_VARINDEX}},
 		{OPCODET(o1_insertStr), {PARAM_VARINDEX, PARAM_EXPR}},
 		{OPCODET(o1_cutStr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
 		/* 44 */

Modified: tools/trunk/degob_script_v5.cpp
===================================================================
--- tools/trunk/degob_script_v5.cpp	2009-12-13 21:42:01 UTC (rev 46367)
+++ tools/trunk/degob_script_v5.cpp	2009-12-13 21:44:57 UTC (rev 46368)
@@ -447,7 +447,7 @@
 		{OPCODEF(o1_whileDo), {PARAM_NONE}},
 		/* 08 */
 		{OPCODEF(o1_if), {PARAM_NONE}},
-		{OPCODEF(o2_evaluateStore), {PARAM_NONE}},
+		{OPCODEF(o2_assign), {PARAM_NONE}},
 		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 0C */
@@ -466,8 +466,8 @@
 		{OPCODET(o1_capturePop), {PARAM_NONE}},
 		{OPCODET(o2_animPalInit), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR}},
 		/* 18 */
-		{OPCODET(o2_addCollision), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
-		{OPCODET(o2_freeCollision), {PARAM_EXPR}},
+		{OPCODET(o2_addHotspot), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_removeHotspot), {PARAM_EXPR}},
 		{OPCODET(o3_getTotTextItemPart), {PARAM_UINT16, PARAM_VARINDEX, PARAM_EXPR}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 1C */
@@ -517,7 +517,7 @@
 		{OPCODET(o2_checkData), {PARAM_EXPR, PARAM_VARINDEX}},
 		/* 40 */
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o1_prepareStr), {PARAM_VARINDEX}},
+		{OPCODET(o1_cleanupStr), {PARAM_VARINDEX}},
 		{OPCODET(o1_insertStr), {PARAM_VARINDEX, PARAM_EXPR}},
 		{OPCODET(o1_cutStr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
 		/* 44 */

Modified: tools/trunk/degob_script_v6.cpp
===================================================================
--- tools/trunk/degob_script_v6.cpp	2009-12-13 21:42:01 UTC (rev 46367)
+++ tools/trunk/degob_script_v6.cpp	2009-12-13 21:44:57 UTC (rev 46368)
@@ -447,7 +447,7 @@
 		{OPCODEF(o1_whileDo), {PARAM_NONE}},
 		/* 08 */
 		{OPCODEF(o1_if), {PARAM_NONE}},
-		{OPCODEF(o6_evaluateStore), {PARAM_NONE}},
+		{OPCODEF(o6_assign), {PARAM_NONE}},
 		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 0C */
@@ -466,8 +466,8 @@
 		{OPCODET(o1_capturePop), {PARAM_NONE}},
 		{OPCODET(o2_animPalInit), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR}},
 		/* 18 */
-		{OPCODET(o2_addCollision), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
-		{OPCODET(o2_freeCollision), {PARAM_EXPR}},
+		{OPCODET(o2_addHotspot), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_removeHotspot), {PARAM_EXPR}},
 		{OPCODET(o3_getTotTextItemPart), {PARAM_UINT16, PARAM_VARINDEX, PARAM_EXPR}},
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
 		/* 1C */
@@ -517,7 +517,7 @@
 		{OPCODET(o2_checkData), {PARAM_EXPR, PARAM_VARINDEX}},
 		/* 40 */
 		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o1_prepareStr), {PARAM_VARINDEX}},
+		{OPCODET(o1_cleanupStr), {PARAM_VARINDEX}},
 		{OPCODET(o1_insertStr), {PARAM_VARINDEX, PARAM_EXPR}},
 		{OPCODET(o1_cutStr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
 		/* 44 */
@@ -741,7 +741,7 @@
 	endFunc();
 }
 
-void Script_v6::o6_evaluateStore(FuncParams &params) {
+void Script_v6::o6_assign(FuncParams &params) {
 	uint8 type = peekUint8();
 	uint16 var_0, var_4;
 	std::string varIndex = readVarIndex(&var_0, &var_4);


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