[Scummvm-cvs-logs] SF.net SVN: scummvm:[39656] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Tue Mar 24 10:01:44 CET 2009
Revision: 39656
http://scummvm.svn.sourceforge.net/scummvm/?rev=39656&view=rev
Author: peres001
Date: 2009-03-24 09:01:44 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
Removed paranoia check.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/parser.h
scummvm/trunk/engines/parallaction/parser_ns.cpp
Modified: scummvm/trunk/engines/parallaction/parser.h
===================================================================
--- scummvm/trunk/engines/parallaction/parser.h 2009-03-24 08:33:24 UTC (rev 39655)
+++ scummvm/trunk/engines/parallaction/parser.h 2009-03-24 09:01:44 UTC (rev 39656)
@@ -203,7 +203,7 @@
void parseAnimation(AnimationList &list, char *name);
void parseCommands(CommandList&);
void parseCommandFlags();
- void parseCommandFlag(CommandPtr cmd, const char *flag, Table *table, bool checkTrap);
+ void parseCommandFlag(CommandPtr cmd, const char *flag, Table *table);
void saveCommandForward(const char *name, CommandPtr cmd);
void resolveCommandForwards();
void createCommand(uint id);
Modified: scummvm/trunk/engines/parallaction/parser_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_ns.cpp 2009-03-24 08:33:24 UTC (rev 39655)
+++ scummvm/trunk/engines/parallaction/parser_ns.cpp 2009-03-24 09:01:44 UTC (rev 39656)
@@ -713,18 +713,18 @@
ctxt.endcommands = true;
}
-void LocationParser_ns::parseCommandFlag(CommandPtr cmd, const char *flag, Table *table, bool checkTrap) {
+void LocationParser_ns::parseCommandFlag(CommandPtr cmd, const char *flag, Table *table) {
if (!scumm_stricmp(flag, "exit")) {
cmd->_flagsOn |= kFlagsExit;
} else
- if (checkTrap && !scumm_stricmp(flag, "exittrap")) {
+ if (!scumm_stricmp(flag, "exittrap")) {
cmd->_flagsOn |= kFlagsExit;
} else
if (!scumm_stricmp(flag, "enter")) {
cmd->_flagsOn |= kFlagsEnter;
} else
- if (checkTrap && !scumm_stricmp(flag, "entertrap")) {
+ if (!scumm_stricmp(flag, "entertrap")) {
cmd->_flagsOn |= kFlagsEnter;
} else
if (!scumm_strnicmp(flag, "no", 2)) {
@@ -752,7 +752,7 @@
if (!scumm_stricmp(_tokens[_si], "flags")) {
do {
_si++;
- parseCommandFlag(cmd, _tokens[_si], _vm->_localFlagNames, true);
+ parseCommandFlag(cmd, _tokens[_si], _vm->_localFlagNames);
_si++;
} while (!scumm_stricmp(_tokens[_si], "|"));
}
@@ -760,7 +760,7 @@
if (!scumm_stricmp(_tokens[_si], "gflags")) {
do {
_si++;
- parseCommandFlag(cmd, _tokens[_si], _vm->_globalFlagsNames, false);
+ parseCommandFlag(cmd, _tokens[_si], _vm->_globalFlagsNames);
_si++;
} while (!scumm_stricmp(_tokens[_si], "|"));
cmd->_flagsOn |= kFlagsGlobal;
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