Minor cleanup

svn-id: r24158

3 files changed, 42 insertions, 42 deletions

diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp
index 205457ae98..8a59f13481 100644
--- a/engines/agos/debug.cpp
+++ b/engines/agos/debug.cpp
@@ -49,21 +49,21 @@ const byte *AGOSEngine::dumpOpcode(const byte *p) {
 	}
 
 	if (getGameType() == GType_PP) {
-		st = s = puzzlepack_opcode_name_table[opcode];
+		st = s = puzzlepack_opcodeNameTable[opcode];
 	} else if (getGameType() == GType_FF) {
-		st = s = feeblefiles_opcode_name_table[opcode];
+		st = s = feeblefiles_opcodeNameTable[opcode];
 	} else if (getGameType() == GType_SIMON2 && getFeatures() & GF_TALKIE) {
-		st = s = simon2talkie_opcode_name_table[opcode];
+		st = s = simon2talkie_opcodeNameTable[opcode];
 	} else if (getFeatures() & GF_TALKIE) {
-		st = s = simon1talkie_opcode_name_table[opcode];
+		st = s = simon1talkie_opcodeNameTable[opcode];
 	} else if (getGameType() == GType_SIMON2) {
-		st = s = simon2dos_opcode_name_table[opcode];
+		st = s = simon2dos_opcodeNameTable[opcode];
 	} else if (getGameType() == GType_SIMON1) {
-		st = s = simon1dos_opcode_name_table[opcode];
+		st = s = simon1dos_opcodeNameTable[opcode];
 	} else if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) {
-		st = s = ww_opcode_name_table[opcode];
+		st = s = waxworks_opcodeNameTable[opcode];
 	} else {
-		st = s = elvira1_opcode_name_table[opcode];
+		st = s = elvira1_opcodeNameTable[opcode];
 	}
 
 	if (s == NULL) {
@@ -213,15 +213,15 @@ void AGOSEngine::dumpVideoScript(const byte *src, bool one_opcode_only) {
 		}
 
 		if (getGameType() == GType_FF || getGameType() == GType_PP) {
-			strn = str = feeblefiles_video_opcode_name_table[opcode];
+			strn = str = feeblefiles_videoOpcodeNameTable[opcode];
 		} else if (getGameType() == GType_SIMON2) {
-			strn = str = simon2_video_opcode_name_table[opcode];
+			strn = str = simon2_videoOpcodeNameTable[opcode];
 		} else if (getGameType() == GType_SIMON1) {
-			strn = str = simon1_video_opcode_name_table[opcode];
+			strn = str = simon1_videoOpcodeNameTable[opcode];
 		} else if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) {
-			strn = str = ww_video_opcode_name_table[opcode];
+			strn = str = ww_videoOpcodeNameTable[opcode];
 		} else {
-			strn = str = elvira1_video_opcode_name_table[opcode];
+			strn = str = elvira1_videoOpcodeNameTable[opcode];
 		}
 
 		if (strn == NULL) {
diff --git a/engines/agos/debug.h b/engines/agos/debug.h
index 1c1145c550..6bedf95c72 100644
--- a/engines/agos/debug.h
+++ b/engines/agos/debug.h
@@ -26,7 +26,7 @@
 
 namespace AGOS {
 
-static const char *const elvira1_opcode_name_table[300] = {
+static const char *const elvira1_opcodeNameTable[300] = {
 	/* 0 */
 	"IJ|AT",
 	"IJ|NOT_AT",
@@ -384,7 +384,7 @@ static const char *const elvira1_opcode_name_table[300] = {
 	"WJ|IS_BOX",
 };
 
-static const char *const ww_opcode_name_table[256] = {
+static const char *const waxworks_opcodeNameTable[256] = {
 	/* 0 */
 	"|NOT",
 	"IJ|AT",
@@ -626,7 +626,7 @@ static const char *const ww_opcode_name_table[256] = {
 	"|UNLOCK_ZONES",
 };
 
-static const char *const simon1dos_opcode_name_table[256] = {
+static const char *const simon1dos_opcodeNameTable[256] = {
 	/* 0 */
 	"|NOT",
 	"IJ|AT",
@@ -864,7 +864,7 @@ static const char *const simon1dos_opcode_name_table[256] = {
 	"|FADE_TO_BLACK",
 };
 
-static const char *const simon1talkie_opcode_name_table[256] = {
+static const char *const simon1talkie_opcodeNameTable[256] = {
 	/* 0 */
 	"|NOT",
 	"IJ|AT",
@@ -1102,7 +1102,7 @@ static const char *const simon1talkie_opcode_name_table[256] = {
 	"|FADE_TO_BLACK",
 };
 
-static const char *const simon2dos_opcode_name_table[256] = {
+static const char *const simon2dos_opcodeNameTable[256] = {
 	/* 0 */
 	"|NOT",
 	"IJ|AT",
@@ -1344,7 +1344,7 @@ static const char *const simon2dos_opcode_name_table[256] = {
 	"B|WAIT_FOR_MARK",
 };
 
-static const char *const simon2talkie_opcode_name_table[256] = {
+static const char *const simon2talkie_opcodeNameTable[256] = {
 	/* 0 */
 	"|NOT",
 	"IJ|AT",
@@ -1586,7 +1586,7 @@ static const char *const simon2talkie_opcode_name_table[256] = {
 	"B|WAIT_FOR_MARK",
 };
 
-static const char *const feeblefiles_opcode_name_table[256] = {
+static const char *const feeblefiles_opcodeNameTable[256] = {
 	/* 0 */
 	"|NOT",
 	"IJ|AT",
@@ -1839,7 +1839,7 @@ static const char *const feeblefiles_opcode_name_table[256] = {
 	"B|B3_NOT_ZERO",
 };
 
-static const char *const puzzlepack_opcode_name_table[256] = {
+static const char *const puzzlepack_opcodeNameTable[256] = {
 	/* 0 */
 	"|NOT",
 	"IJ|AT",
@@ -2087,7 +2087,7 @@ static const char *const puzzlepack_opcode_name_table[256] = {
 	"BBBB|SET_COLOR",
 };
 
-const char *const elvira1_video_opcode_name_table[] = {
+const char *const elvira1_videoOpcodeNameTable[] = {
 	/* 0 */
 	"x|RET",
 	"ddd|FADEOUT",
@@ -2161,7 +2161,7 @@ const char *const elvira1_video_opcode_name_table[] = {
 	"dd|VC_56",
 };
 
-const char *const ww_video_opcode_name_table[] = {
+const char *const ww_videoOpcodeNameTable[] = {
 	/* 0 */
 	"x|RET",
 	"ddd|FADEOUT",
@@ -2244,7 +2244,7 @@ const char *const ww_video_opcode_name_table[] = {
 	"|FASTFADEIN",
 };
 
-const char *const simon1_video_opcode_name_table[] = {
+const char *const simon1_videoOpcodeNameTable[] = {
 	/* 0 */
 	"x|RET",
 	"ddd|FADEOUT",
@@ -2327,7 +2327,7 @@ const char *const simon1_video_opcode_name_table[] = {
 	"|FASTFADEIN",
 };
 
-const char *const simon2_video_opcode_name_table[] = {
+const char *const simon2_videoOpcodeNameTable[] = {
 	/* 0 */
 	"x|RET",
 	"ddd|FADEOUT",
@@ -2424,7 +2424,7 @@ const char *const simon2_video_opcode_name_table[] = {
 	"bb|CLEAR_MARK",
 };
 
-const char *const feeblefiles_video_opcode_name_table[] = {
+const char *const feeblefiles_videoOpcodeNameTable[] = {
 	/* 0 */
 	"x|RET",
 	"ddd|FADEOUT",
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index 3ebff9dc5e..16036032cc 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -31,7 +31,7 @@ using Common::File;
 namespace AGOS {
 
 // Script opcodes to load into memory
-static const char *const opcode_arg_table_elvira1[300] = {
+static const char *const opcodeArgTable_elvira1[300] = {
 	"I ", "I ", "I ", "I ", "I ", "I ", "I ", "I ",	 "II ",	"II ", "II ", "II ", "F ", "F ", "FN ",
 	"FN ", "FN ", "FN ", "FF ", "FF ", "FF ", "FF ", "II ", "II ", "a ", "a ", "n ", "n ", "p ",
 	"N ", "I ", "I ", "I ",	 "I ",	"IN ",	"IB ", "IB ", "II ", "IB ", "N ", " ", " ", " ", "I ",
@@ -55,7 +55,7 @@ static const char *const opcode_arg_table_elvira1[300] = {
 	" ", "NI ","N ",
 };
 
-static const char *const opcode_arg_table_waxworks[256] = {
+static const char *const opcodeArgTable_waxworks[256] = {
 	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
 	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
 	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
@@ -72,7 +72,7 @@ static const char *const opcode_arg_table_waxworks[256] = {
 	"T ", "B ", " ", "I ", " ", " "
 };
 
-static const char *const opcode_arg_table_simon1win[256] = {
+static const char *const opcodeArgTable_simon1talkie[256] = {
 	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
 	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
 	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
@@ -89,7 +89,7 @@ static const char *const opcode_arg_table_simon1win[256] = {
 	" ",
 };
 
-static const char *const opcode_arg_table_simon1dos[256] = {
+static const char *const opcodeArgTable_simon1dos[256] = {
 	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
 	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
 	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
@@ -106,7 +106,7 @@ static const char *const opcode_arg_table_simon1dos[256] = {
 	" ",
 };
 
-static const char *const opcode_arg_table_simon2win[256] = {
+static const char *const opcodeArgTable_simon2talkie[256] = {
 	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
 	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
 	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
@@ -123,7 +123,7 @@ static const char *const opcode_arg_table_simon2win[256] = {
 	" ", " ", "BT ", " ", "B "
 };
 
-static const char *const opcode_arg_table_simon2dos[256] = {
+static const char *const opcodeArgTable_simon2dos[256] = {
 	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
 	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
 	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
@@ -140,7 +140,7 @@ static const char *const opcode_arg_table_simon2dos[256] = {
 	" ", " ", "BT ", " ", "B "
 };
 
-static const char *const opcode_arg_table_feeblefiles[256] = {
+static const char *const opcodeArgTable_feeblefiles[256] = {
 	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
 	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
 	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
@@ -157,7 +157,7 @@ static const char *const opcode_arg_table_feeblefiles[256] = {
 	" ", " ", "BT ", " ", "B ", " ", "BBBB ", " ", " ", "BBBB ", "B ", "B ", "B ", "B "
 };
 
-static const char *const opcode_arg_table_puzzlepack[256] = {
+static const char *const opcodeArgTable_puzzlepack[256] = {
 	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "N ", "N ", "NN ", "NN ",
 	"NN ", "NN ", "NN ", "NN ", "NN ", "NN ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
 	"II ", "I ", "I ", "II ", "II ", "IBN ", "NIB ", "NN ", "B ", "BI ", "IN ", "N ", "N ", "NN ",
@@ -625,21 +625,21 @@ byte *AGOSEngine::readSingleOpcode(Common::File *in, byte *ptr) {
 	const char *const *table;
 
 	if (getGameType() == GType_PP)
-		table = opcode_arg_table_puzzlepack;
+		table = opcodeArgTable_puzzlepack;
 	else if (getGameType() == GType_FF)
-		table = opcode_arg_table_feeblefiles;
+		table = opcodeArgTable_feeblefiles;
 	else if (getGameType() == GType_SIMON2 && (getFeatures() & GF_TALKIE))
-		table = opcode_arg_table_simon2win;
+		table = opcodeArgTable_simon2talkie;
 	else if (getGameType() == GType_SIMON2)
-		table = opcode_arg_table_simon2dos;
+		table = opcodeArgTable_simon2dos;
 	else if (getGameType() == GType_SIMON1 && (getFeatures() & GF_TALKIE))
-		table = opcode_arg_table_simon1win;
+		table = opcodeArgTable_simon1talkie;
 	else if (getGameType() == GType_SIMON1)
-		table = opcode_arg_table_simon1dos;
+		table = opcodeArgTable_simon1dos;
 	else if (getGameType() == GType_WW || getGameType() == GType_ELVIRA2)
-		table = opcode_arg_table_waxworks;
+		table = opcodeArgTable_waxworks;
 	else
-		table = opcode_arg_table_elvira1;
+		table = opcodeArgTable_elvira1;
 
 	i = 0;
 	if (getGameType() == GType_ELVIRA1) {