[Scummvm-cvs-logs] SF.net SVN: scummvm:[46299] scummvm/trunk/engines/draci

[lordhoto at users.sourceforge.net]

Revision: 46299
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46299&view=rev
Author:   lordhoto
Date:     2009-12-08 22:07:17 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
Attempt to fix MSVC warning C4121.

Modified Paths:
--------------
    scummvm/trunk/engines/draci/script.cpp
    scummvm/trunk/engines/draci/script.h

Modified: scummvm/trunk/engines/draci/script.cpp
===================================================================
--- scummvm/trunk/engines/draci/script.cpp	2009-12-08 22:05:11 UTC (rev 46298)
+++ scummvm/trunk/engines/draci/script.cpp	2009-12-08 22:07:17 UTC (rev 46299)
@@ -100,44 +100,44 @@
 
 	/** Operators used by the mathematical evaluator */
 	static const GPL2Operator gplOperators[] = {
-		{"&", 	&Script::operAnd 		},
-		{"|",	&Script::operOr 		},
-		{"^", 	&Script::operXor 		},
-		{"==",	&Script::operEqual 		},
-		{"!=", 	&Script::operNotEqual		},
-		{"<", 	&Script::operLess		},
-		{">", 	&Script::operGreater		},
-		{"<=",	&Script::operLessOrEqual	},
-		{">=",	&Script::operGreaterOrEqual	},
-		{"*",	&Script::operMul		},
-		{"/", 	&Script::operDiv		},
-		{"%",	&Script::operMod		},
-		{"+", 	&Script::operAdd		},
-		{"-",	&Script::operSub		}
+		{ &Script::operAnd,            "&" },
+		{ &Script::operOr,             "|" },
+		{ &Script::operXor,            "^" },
+		{ &Script::operEqual,          "==" },
+		{ &Script::operNotEqual,       "!=" },
+		{ &Script::operLess,           "<" },
+		{ &Script::operGreater,        ">" },
+		{ &Script::operLessOrEqual,    "<=" },
+		{ &Script::operGreaterOrEqual, ">=" },
+		{ &Script::operMul,            "*" },
+		{ &Script::operDiv,            "/" },
+		{ &Script::operMod,            "%" },
+		{ &Script::operAdd,            "+" },
+		{ &Script::operSub,            "-" }
 	};
 
 	/** Functions used by the mathematical evaluator */
 	static const GPL2Function gplFunctions[] = {
-		{ "Not", 		&Script::funcNot },
-		{ "Random", 	&Script::funcRandom },
-		{ "IsIcoOn", 	&Script::funcIsIcoOn },
-		{ "IsIcoAct", 	&Script::funcIsIcoAct },
-		{ "IcoStat", 	&Script::funcIcoStat },
-		{ "ActIco", 	&Script::funcActIco },
-		{ "IsObjOn", 	&Script::funcIsObjOn },
-		{ "IsObjOff", 	&Script::funcIsObjOff },
-		{ "IsObjAway", 	&Script::funcIsObjAway },
-		{ "ObjStat", 	&Script::funcObjStat },
-		{ "LastBlock", 	&Script::funcLastBlock },
-		{ "AtBegin", 	&Script::funcAtBegin },
-		{ "BlockVar", 	&Script::funcBlockVar },
-		{ "HasBeen", 	&Script::funcHasBeen },
-		{ "MaxLine", 	&Script::funcMaxLine },
-		{ "ActPhase", 	&Script::funcActPhase },
+		{ &Script::funcNot,       "Not" },
+		{ &Script::funcRandom,    "Random" },
+		{ &Script::funcIsIcoOn,   "IsIcoOn" },
+		{ &Script::funcIsIcoAct,  "IsIcoAct" },
+		{ &Script::funcIcoStat,   "IcoStat" },
+		{ &Script::funcActIco,    "ActIco" },
+		{ &Script::funcIsObjOn,   "IsObjOn" },
+		{ &Script::funcIsObjOff,  "IsObjOff" },
+		{ &Script::funcIsObjAway, "IsObjAway" },
+		{ &Script::funcObjStat,   "ObjStat" },
+		{ &Script::funcLastBlock, "LastBlock" },
+		{ &Script::funcAtBegin,   "AtBegin" },
+		{ &Script::funcBlockVar,  "BlockVar" },
+		{ &Script::funcHasBeen,   "HasBeen" },
+		{ &Script::funcMaxLine,   "MaxLine" },
+		{ &Script::funcActPhase,  "ActPhase" },
 		// The following function is not even defined in the game
 		// sources, but its number is allocated for internal purposes
 		// of the old player.
-		{ "Cheat",  	NULL },
+		{ NULL, "Cheat" },
 	};
 
 	_commandList = gplCommands;

Modified: scummvm/trunk/engines/draci/script.h
===================================================================
--- scummvm/trunk/engines/draci/script.h	2009-12-08 22:05:11 UTC (rev 46298)
+++ scummvm/trunk/engines/draci/script.h	2009-12-08 22:07:17 UTC (rev 46299)
@@ -69,13 +69,13 @@
 };
 
 struct GPL2Operator {
+	GPLOperatorHandler _handler;
 	const char *_name;
-	GPLOperatorHandler _handler;
 };
 
 struct GPL2Function {
+	GPLFunctionHandler _handler;
 	const char *_name;
-	GPLFunctionHandler _handler;
 };
 
 /**


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