thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt to fix MSVC warning C4121.

Browse source 
svn-id: r46299
This commit is contained in:
Johannes Schickel 2009-12-08 22:07:17 +00:00
parent 5de8c46963
commit e3d1d914ac
2 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

62
engines/draci/script.cpp
View file

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

4
engines/draci/script.h
View file

@ -69,13 +69,13 @@ struct GPL2Command {
}; };
struct GPL2Operator { struct GPL2Operator {
const char *_name;
GPLOperatorHandler _handler; GPLOperatorHandler _handler;
const char *_name;
}; };
struct GPL2Function { struct GPL2Function {
const char *_name;
GPLFunctionHandler _handler; GPLFunctionHandler _handler;
const char *_name;
}; };
/** /**