[Scummvm-cvs-logs] SF.net SVN: scummvm: [23857] scummvm/trunk/engines/scumm

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Sep 9 20:31:41 CEST 2006


Revision: 23857
          http://svn.sourceforge.net/scummvm/?rev=23857&view=rev
Author:   fingolfin
Date:     2006-09-09 11:31:32 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
Renamed o6_getActorAnimCounter1 to o6_getActorAnimCounter

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/script_v60he.cpp
    scummvm/trunk/engines/scumm/he/script_v70he.cpp
    scummvm/trunk/engines/scumm/he/script_v72he.cpp
    scummvm/trunk/engines/scumm/he/script_v80he.cpp
    scummvm/trunk/engines/scumm/intern.h
    scummvm/trunk/engines/scumm/script_v6.cpp

Modified: scummvm/trunk/engines/scumm/he/script_v60he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v60he.cpp	2006-09-09 18:20:28 UTC (rev 23856)
+++ scummvm/trunk/engines/scumm/he/script_v60he.cpp	2006-09-09 18:31:32 UTC (rev 23857)
@@ -279,7 +279,7 @@
 		OPCODE(o6_getActorWidth),
 		OPCODE(o6_wait),
 		OPCODE(o6_getActorScaleX),
-		OPCODE(o6_getActorAnimCounter1),
+		OPCODE(o6_getActorAnimCounter),
 		/* AC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_isAnyOf),

Modified: scummvm/trunk/engines/scumm/he/script_v70he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v70he.cpp	2006-09-09 18:20:28 UTC (rev 23856)
+++ scummvm/trunk/engines/scumm/he/script_v70he.cpp	2006-09-09 18:31:32 UTC (rev 23857)
@@ -256,7 +256,7 @@
 		OPCODE(o6_getActorWidth),
 		OPCODE(o6_wait),
 		OPCODE(o6_getActorScaleX),
-		OPCODE(o6_getActorAnimCounter1),
+		OPCODE(o6_getActorAnimCounter),
 		/* AC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_isAnyOf),

Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp	2006-09-09 18:20:28 UTC (rev 23856)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp	2006-09-09 18:31:32 UTC (rev 23857)
@@ -259,7 +259,7 @@
 		OPCODE(o6_getActorWidth),
 		OPCODE(o6_wait),
 		OPCODE(o6_getActorScaleX),
-		OPCODE(o6_getActorAnimCounter1),
+		OPCODE(o6_getActorAnimCounter),
 		/* AC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_isAnyOf),

Modified: scummvm/trunk/engines/scumm/he/script_v80he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v80he.cpp	2006-09-09 18:20:28 UTC (rev 23856)
+++ scummvm/trunk/engines/scumm/he/script_v80he.cpp	2006-09-09 18:31:32 UTC (rev 23857)
@@ -256,7 +256,7 @@
 		OPCODE(o6_getActorWidth),
 		OPCODE(o6_wait),
 		OPCODE(o6_getActorScaleX),
-		OPCODE(o6_getActorAnimCounter1),
+		OPCODE(o6_getActorAnimCounter),
 		/* AC */
 		OPCODE(o80_drawWizPolygon),
 		OPCODE(o6_isAnyOf),

Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h	2006-09-09 18:20:28 UTC (rev 23856)
+++ scummvm/trunk/engines/scumm/intern.h	2006-09-09 18:31:32 UTC (rev 23857)
@@ -750,7 +750,7 @@
 	void o6_getActorWidth();
 	void o6_wait();
 	void o6_getActorScaleX();
-	void o6_getActorAnimCounter1();
+	void o6_getActorAnimCounter();
 	void o6_soundKludge();
 	void o6_isAnyOf();
 	void o6_systemOps();

Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp	2006-09-09 18:20:28 UTC (rev 23856)
+++ scummvm/trunk/engines/scumm/script_v6.cpp	2006-09-09 18:31:32 UTC (rev 23857)
@@ -263,7 +263,7 @@
 		OPCODE(o6_getActorWidth),
 		OPCODE(o6_wait),
 		OPCODE(o6_getActorScaleX),
-		OPCODE(o6_getActorAnimCounter1),
+		OPCODE(o6_getActorAnimCounter),
 		/* AC */
 		OPCODE(o6_soundKludge),
 		OPCODE(o6_isAnyOf),
@@ -1434,11 +1434,11 @@
 }
 
 void ScummEngine_v6::o6_getActorScaleX() {
-	Actor *a = derefActor(pop(), "o6_getActorScale");
+	Actor *a = derefActor(pop(), "o6_getActorScaleX");
 	push(a->_scalex);
 }
 
-void ScummEngine_v6::o6_getActorAnimCounter1() {
+void ScummEngine_v6::o6_getActorAnimCounter() {
 	Actor *a = derefActor(pop(), "o6_getActorAnimCounter");
 	push(a->_cost.animCounter);
 }


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