[Scummvm-cvs-logs] SF.net SVN: scummvm:[40031] scummvm/trunk/engines/sci/engine

[fingolfin at users.sourceforge.net]

Revision: 40031
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40031&view=rev
Author:   fingolfin
Date:     2009-04-20 19:28:33 +0000 (Mon, 20 Apr 2009)

Log Message:
-----------
SCI: Renamed global array 'formats' to the slightly more descriptive g_opcode_formats

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script.cpp
    scummvm/trunk/engines/sci/engine/script.h
    scummvm/trunk/engines/sci/engine/scriptdebug.cpp
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2009-04-20 19:28:08 UTC (rev 40030)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2009-04-20 19:28:33 UTC (rev 40031)
@@ -33,7 +33,7 @@
 
 #define END Script_None
 
-opcode_format formats[128][4] = {
+opcode_format g_opcode_formats[128][4] = {
 	/*00*/
 	{Script_None}, {Script_None}, {Script_None}, {Script_None},
 	/*04*/
@@ -99,8 +99,8 @@
 	case SCI_VERSION_1_EARLY:
 	case SCI_VERSION_1_LATE:
 	case SCI_VERSION_1_1:
-		formats[op_lofsa][0] = Script_Offset;
-		formats[op_lofss][0] = Script_Offset;
+		g_opcode_formats[op_lofsa][0] = Script_Offset;
+		g_opcode_formats[op_lofss][0] = Script_Offset;
 		break;
 	default:
 		sciprintf("script_adjust_opcode_formats(): Unknown script version %d\n", res_version);

Modified: scummvm/trunk/engines/sci/engine/script.h
===================================================================
--- scummvm/trunk/engines/sci/engine/script.h	2009-04-20 19:28:08 UTC (rev 40030)
+++ scummvm/trunk/engines/sci/engine/script.h	2009-04-20 19:28:33 UTC (rev 40031)
@@ -209,7 +209,7 @@
 	op_minusspi
 };
 
-extern opcode_format formats[128][4];
+extern opcode_format g_opcode_formats[128][4];
 
 void script_adjust_opcode_formats(int res_version);
 

Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-04-20 19:28:08 UTC (rev 40030)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-04-20 19:28:33 UTC (rev 40031)
@@ -1262,8 +1262,8 @@
 	sciprintf(PREG": ", PRINT_REG(pos));
 
 	if (print_bytecode) {
-		while (formats[opcode][i]) {
-			switch (formats[opcode][i++]) {
+		while (g_opcode_formats[opcode][i]) {
+			switch (g_opcode_formats[opcode][i++]) {
 
 			case Script_SByte:
 			case Script_Byte:
@@ -1311,8 +1311,8 @@
 	sciprintf("%s", s->opcodes[opcode].name);
 
 	i = 0;
-	while (formats[opcode][i]) {
-		switch (formats[opcode][i++]) {
+	while (g_opcode_formats[opcode][i]) {
+		switch (g_opcode_formats[opcode][i++]) {
 		case Script_Invalid:
 			sciprintf("-Invalid operation-");
 			break;

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-04-20 19:28:08 UTC (rev 40030)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-04-20 19:28:33 UTC (rev 40031)
@@ -737,8 +737,8 @@
 
 		opnumber = opcode >> 1;
 
-		for (temp = 0; formats[opnumber][temp]; temp++)
-			switch (formats[opnumber][temp]) {
+		for (temp = 0; g_opcode_formats[opnumber][temp]; temp++)
+			switch (g_opcode_formats[opnumber][temp]) {
 
 			case Script_Byte:
 				opparams[temp] = GET_OP_BYTE();


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