diff options
Diffstat (limited to 'engines/mutationofjb/commands')
-rw-r--r-- | engines/mutationofjb/commands/callmacrocommand.cpp | 3 | ||||
-rw-r--r-- | engines/mutationofjb/commands/changecommand.cpp | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/conditionalcommand.cpp | 3 | ||||
-rw-r--r-- | engines/mutationofjb/commands/endblockcommand.cpp | 7 | ||||
-rw-r--r-- | engines/mutationofjb/commands/ifcommand.cpp | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/ifitemcommand.cpp | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/ifpiggycommand.cpp | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/randomcommand.cpp | 7 | ||||
-rw-r--r-- | engines/mutationofjb/commands/seqcommand.cpp | 5 |
9 files changed, 11 insertions, 18 deletions
diff --git a/engines/mutationofjb/commands/callmacrocommand.cpp b/engines/mutationofjb/commands/callmacrocommand.cpp index 01470f2ba1..c2ed50f69d 100644 --- a/engines/mutationofjb/commands/callmacrocommand.cpp +++ b/engines/mutationofjb/commands/callmacrocommand.cpp @@ -23,7 +23,6 @@ #include "mutationofjb/commands/callmacrocommand.h" #include "mutationofjb/script.h" #include "mutationofjb/game.h" -#include "common/translation.h" /** @file * "_" <name> @@ -45,7 +44,7 @@ bool CallMacroCommandParser::parse(const Common::String &line, ScriptParseContex void CallMacroCommandParser::transition(ScriptParseContext &, Command *oldCommand, Command *newCommand, CommandParser *) { if (!oldCommand || !newCommand) { - warning(_("Unexpected empty command in transition")); + warning("Unexpected empty command in transition"); return; } diff --git a/engines/mutationofjb/commands/changecommand.cpp b/engines/mutationofjb/commands/changecommand.cpp index e3c8a993c5..73c5357947 100644 --- a/engines/mutationofjb/commands/changecommand.cpp +++ b/engines/mutationofjb/commands/changecommand.cpp @@ -23,7 +23,6 @@ #include "mutationofjb/commands/changecommand.h" #include "mutationofjb/script.h" #include "mutationofjb/gamedata.h" -#include "common/translation.h" /** @file * "CHANGE" <entity> " " <register> " " <sceneId> " " <entityId> " " <value> diff --git a/engines/mutationofjb/commands/conditionalcommand.cpp b/engines/mutationofjb/commands/conditionalcommand.cpp index 2a6b36a979..56cc2bf9c2 100644 --- a/engines/mutationofjb/commands/conditionalcommand.cpp +++ b/engines/mutationofjb/commands/conditionalcommand.cpp @@ -23,13 +23,12 @@ #include "mutationofjb/commands/conditionalcommand.h" #include "mutationofjb/script.h" #include "common/scummsys.h" -#include "common/translation.h" namespace MutationOfJB { void ConditionalCommandParser::transition(ScriptParseContext &parseContext, Command *oldCommand, Command *newCommand, CommandParser *) { if (!oldCommand || !newCommand) { - warning(_("Unexpected empty command in transition")); + warning("Unexpected empty command in transition"); return; } diff --git a/engines/mutationofjb/commands/endblockcommand.cpp b/engines/mutationofjb/commands/endblockcommand.cpp index 8ad11f8946..ae8ad918d5 100644 --- a/engines/mutationofjb/commands/endblockcommand.cpp +++ b/engines/mutationofjb/commands/endblockcommand.cpp @@ -25,7 +25,6 @@ #include "mutationofjb/commands/conditionalcommand.h" #include "common/str.h" #include "common/debug.h" -#include "common/translation.h" /** @file * <look> | <walk> | <talk> | <pickup> | <use> | <else> | <macro> | <extra> | <endRandom> @@ -171,7 +170,7 @@ void EndBlockCommandParser::transition(ScriptParseContext &parseCtx, Command *ol if (!parseCtx._macros.contains(it->_name)) { parseCtx._macros[it->_name] = newCommand; } else { - warning(_("Macro '%s' already exists"), it->_name.c_str()); + warning("Macro '%s' already exists", it->_name.c_str()); } it = _foundMacros.erase(it); } @@ -188,7 +187,7 @@ void EndBlockCommandParser::transition(ScriptParseContext &parseCtx, Command *ol if (!parseCtx._startups.contains(it->_id)) { parseCtx._startups[it->_id] = newCommand; } else { - warning(_("Startup %u already exists"), (unsigned int) it->_id); + warning("Startup %u already exists", (unsigned int) it->_id); } it = _foundStartups.erase(it); } @@ -205,7 +204,7 @@ void EndBlockCommandParser::transition(ScriptParseContext &parseCtx, Command *ol if (!parseCtx._extras.contains(it->_name)) { parseCtx._extras[it->_name] = newCommand; } else { - warning(_("Extra '%s' already exists"), it->_name.c_str()); + warning("Extra '%s' already exists", it->_name.c_str()); } it = _foundExtras.erase(it); } diff --git a/engines/mutationofjb/commands/ifcommand.cpp b/engines/mutationofjb/commands/ifcommand.cpp index 9c435881b7..47e06f3309 100644 --- a/engines/mutationofjb/commands/ifcommand.cpp +++ b/engines/mutationofjb/commands/ifcommand.cpp @@ -24,7 +24,6 @@ #include "mutationofjb/gamedata.h" #include "mutationofjb/script.h" #include "common/str.h" -#include "common/translation.h" /** @file * "IF" <tag> <sceneId> <objectId> <value> ["!"] diff --git a/engines/mutationofjb/commands/ifitemcommand.cpp b/engines/mutationofjb/commands/ifitemcommand.cpp index ccbf09e8af..9695172369 100644 --- a/engines/mutationofjb/commands/ifitemcommand.cpp +++ b/engines/mutationofjb/commands/ifitemcommand.cpp @@ -25,7 +25,6 @@ #include "mutationofjb/script.h" #include "mutationofjb/util.h" #include "common/str.h" -#include "common/translation.h" /** @file * "IFITEM " <item> [ "!" ] diff --git a/engines/mutationofjb/commands/ifpiggycommand.cpp b/engines/mutationofjb/commands/ifpiggycommand.cpp index d500b4adf2..4df1deb34a 100644 --- a/engines/mutationofjb/commands/ifpiggycommand.cpp +++ b/engines/mutationofjb/commands/ifpiggycommand.cpp @@ -25,7 +25,6 @@ #include "mutationofjb/script.h" #include "mutationofjb/util.h" #include "common/str.h" -#include "common/translation.h" /** @file * "IFPIGGY" diff --git a/engines/mutationofjb/commands/randomcommand.cpp b/engines/mutationofjb/commands/randomcommand.cpp index 260fd3a812..ab0f3048bc 100644 --- a/engines/mutationofjb/commands/randomcommand.cpp +++ b/engines/mutationofjb/commands/randomcommand.cpp @@ -26,7 +26,6 @@ #include "mutationofjb/script.h" #include "common/debug.h" #include "common/random.h" -#include "common/translation.h" /** @file * "RANDOM " <numChoices> @@ -49,13 +48,13 @@ bool RandomCommandParser::parse(const Common::String &line, ScriptParseContext & int numChoices = atoi(line.c_str() + 7); if (parseCtx._pendingRandomCommand) { // Nested RANDOM commands are unused and not properly supported by the original game. - warning(_("Ignoring nested RANDOM command.")); + warning("Ignoring nested RANDOM command."); } else if (numChoices >= 1) { RandomCommand *randomCommand = new RandomCommand(static_cast<uint>(numChoices)); parseCtx._pendingRandomCommand = randomCommand; command = randomCommand; } else { - warning(_("Ignoring malformed RANDOM command with %d choices."), numChoices); + warning("Ignoring malformed RANDOM command with %d choices.", numChoices); } return true; @@ -68,7 +67,7 @@ bool RandomBlockStartParser::parse(const Common::String &line, ScriptParseContex } if (!parseCtx._pendingRandomCommand) { - warning(_("Unexpected start of RANDOM block")); + warning("Unexpected start of RANDOM block"); } return true; diff --git a/engines/mutationofjb/commands/seqcommand.cpp b/engines/mutationofjb/commands/seqcommand.cpp index 4836d0357f..635698645a 100644 --- a/engines/mutationofjb/commands/seqcommand.cpp +++ b/engines/mutationofjb/commands/seqcommand.cpp @@ -21,13 +21,14 @@ */ #include "mutationofjb/commands/seqcommand.h" -#include "common/translation.h" + +#include "common/textconsole.h" namespace MutationOfJB { void SeqCommandParser::transition(ScriptParseContext &, Command *oldCommand, Command *newCommand, CommandParser *) { if (!oldCommand || !newCommand) { - warning(_("Unexpected empty command in transition")); + warning("Unexpected empty command in transition"); return; } |