aboutsummaryrefslogtreecommitdiff
path: root/engines/mutationofjb
diff options
context:
space:
mode:
Diffstat (limited to 'engines/mutationofjb')
-rw-r--r--engines/mutationofjb/animationdecoder.cpp3
-rw-r--r--engines/mutationofjb/commands/callmacrocommand.cpp3
-rw-r--r--engines/mutationofjb/commands/changecommand.cpp1
-rw-r--r--engines/mutationofjb/commands/conditionalcommand.cpp3
-rw-r--r--engines/mutationofjb/commands/endblockcommand.cpp7
-rw-r--r--engines/mutationofjb/commands/ifcommand.cpp1
-rw-r--r--engines/mutationofjb/commands/ifitemcommand.cpp1
-rw-r--r--engines/mutationofjb/commands/ifpiggycommand.cpp1
-rw-r--r--engines/mutationofjb/commands/randomcommand.cpp7
-rw-r--r--engines/mutationofjb/commands/seqcommand.cpp5
-rw-r--r--engines/mutationofjb/debug.cpp57
-rw-r--r--engines/mutationofjb/game.cpp3
-rw-r--r--engines/mutationofjb/gamedata.cpp9
-rw-r--r--engines/mutationofjb/room.cpp1
-rw-r--r--engines/mutationofjb/script.cpp3
-rw-r--r--engines/mutationofjb/tasks/conversationtask.cpp4
-rw-r--r--engines/mutationofjb/tasks/taskmanager.cpp4
17 files changed, 48 insertions, 65 deletions
diff --git a/engines/mutationofjb/animationdecoder.cpp b/engines/mutationofjb/animationdecoder.cpp
index 712cb42c97..43590a92c3 100644
--- a/engines/mutationofjb/animationdecoder.cpp
+++ b/engines/mutationofjb/animationdecoder.cpp
@@ -24,7 +24,6 @@
#include "mutationofjb/encryptedfile.h"
#include "mutationofjb/util.h"
#include "common/debug.h"
-#include "common/translation.h"
namespace MutationOfJB {
@@ -88,7 +87,7 @@ bool AnimationDecoder::decode(AnimationDecoderCallback *callback) {
callback->onFrame(frameNo, _surface);
}
} else {
- debug(_("Unsupported record type %02X."), type);
+ debug("Unsupported record type %02X.", type);
file.seek(subLength - 6, SEEK_CUR);
}
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;
}
diff --git a/engines/mutationofjb/debug.cpp b/engines/mutationofjb/debug.cpp
index f7b074a10b..b5b49cd6fc 100644
--- a/engines/mutationofjb/debug.cpp
+++ b/engines/mutationofjb/debug.cpp
@@ -32,7 +32,6 @@
#include "mutationofjb/commands/callmacrocommand.h"
#include "mutationofjb/commands/randomcommand.h"
#include "common/debug-channels.h"
-#include "common/translation.h"
#include "common/scummsys.h"
namespace MutationOfJB {
@@ -84,7 +83,7 @@ bool Console::cmd_showallcommands(int argc, const char **argv) {
}
}
} else {
- debugPrintf(_("showallcommands <G|L>\n"));
+ debugPrintf("showallcommands <G|L>\n");
}
return true;
@@ -98,21 +97,21 @@ bool Console::cmd_listsections(int argc, const char **argv) {
const char *word = nullptr;
if (strcmp(argv[2], "L") == 0) {
action = ActionInfo::Look;
- word = _("Look");
+ word = "Look";
} else if (strcmp(argv[2], "W") == 0) {
action = ActionInfo::Walk;
- word = _("Walk");
+ word = "Walk";
} else if (strcmp(argv[2], "T") == 0) {
action = ActionInfo::Talk;
- word = _("Talk");
+ word = "Talk";
} else if (strcmp(argv[2], "U") == 0) {
action = ActionInfo::Use;
- word = _("Use");
+ word = "Use";
} else if (strcmp(argv[2], "P") == 0) {
action = ActionInfo::PickUp;
- word = _("Pick up");
+ word = "Pick up";
} else {
- debugPrintf(_("Choose 'L' (look), 'W' (walk), 'T' (talk), 'U' (use) or 'P' (pick up).\n"));
+ debugPrintf("Choose 'L' (look), 'W' (walk), 'T' (talk), 'U' (use) or 'P' (pick up).\n");
}
if (word) {
const ActionInfos &actionInfos = script->getActionInfos(action);
@@ -127,7 +126,7 @@ bool Console::cmd_listsections(int argc, const char **argv) {
}
}
} else {
- debugPrintf(_("listsections <G|L> <L|W|T|U|P>\n"));
+ debugPrintf("listsections <G|L> <L|W|T|U|P>\n");
}
return true;
}
@@ -187,7 +186,7 @@ bool Console::cmd_showsection(int argc, const char **argv) {
} else if (strcmp(argv[2], "P") == 0) {
action = ActionInfo::PickUp;
} else {
- debugPrintf(_("Choose 'L' (look), 'W' (walk), 'T' (talk), 'U' (use) or 'P' (pick up).\n"));
+ debugPrintf("Choose 'L' (look), 'W' (walk), 'T' (talk), 'U' (use) or 'P' (pick up).\n");
correctAction = false;
}
@@ -212,7 +211,7 @@ bool Console::cmd_showsection(int argc, const char **argv) {
}
}
} else {
- debugPrintf(_("showsection <G|L> <L|W|T|U|P> <sectionname>\n"));
+ debugPrintf("showsection <G|L> <L|W|T|U|P> <sectionname>\n");
}
return true;
@@ -228,7 +227,7 @@ bool Console::cmd_listmacros(int argc, const char **argv) {
}
}
} else {
- debugPrintf(_("listmacros <G|L>\n"));
+ debugPrintf("listmacros <G|L>\n");
}
return true;
@@ -243,7 +242,7 @@ bool Console::cmd_showmacro(int argc, const char **argv) {
script = _vm->getGame().getLocalScript();
}
if (!script) {
- debugPrintf(_("Choose 'G' (global) or 'L' (local) script.\n"));
+ debugPrintf("Choose 'G' (global) or 'L' (local) script.\n");
} else {
const Macros &macros = script->getMacros();
Macros::const_iterator itMacro = macros.find(argv[2]);
@@ -256,7 +255,7 @@ bool Console::cmd_showmacro(int argc, const char **argv) {
}
}
} else {
- debugPrintf(_("showmacro <G|L> <macroname>\n"));
+ debugPrintf("showmacro <G|L> <macroname>\n");
}
return true;
@@ -272,7 +271,7 @@ bool Console::cmd_liststartups(int argc, const char **argv) {
}
}
} else {
- debugPrintf(_("liststartups <G|L>\n"));
+ debugPrintf("liststartups <G|L>\n");
}
return true;
@@ -293,7 +292,7 @@ bool Console::cmd_showstartup(int argc, const char **argv) {
}
}
} else {
- debugPrintf(_("showstartup <G|L> <startupid>\n"));
+ debugPrintf("showstartup <G|L> <startupid>\n");
}
return true;
@@ -306,7 +305,7 @@ bool Console::cmd_changescene(int argc, const char **argv) {
_vm->getGame().changeScene(sceneId, partB);
} else {
- debugPrintf(_("changescene <scenename>\n"));
+ debugPrintf("changescene <scenename>\n");
}
return true;
@@ -327,10 +326,10 @@ bool Console::cmd_dumpsceneinfo(int argc, const char **argv) {
debugPrintf("PalRotLast: %u\n", (unsigned int) scene->_palRotLast);
debugPrintf("PalRotDelay: %u\n", (unsigned int) scene->_palRotDelay);
} else {
- debugPrintf(_("Scene %u not found.\n"), (unsigned int) sceneId);
+ debugPrintf("Scene %u not found.\n", (unsigned int) sceneId);
}
} else {
- debugPrintf(_("dumpsceneinfo <sceneid>\n"));
+ debugPrintf("dumpsceneinfo <sceneid>\n");
}
return true;
@@ -357,13 +356,13 @@ bool Console::cmd_dumpdoorinfo(int argc, const char **argv) {
debugPrintf("WalkToY: %u\n", (unsigned int) door->_walkToY);
debugPrintf("SP: %u\n", (unsigned int) door->_SP);
} else {
- debugPrintf(_("Door %u not found.\n"), (unsigned int) doorId);
+ debugPrintf("Door %u not found.\n", (unsigned int) doorId);
}
} else {
- debugPrintf(_("Scene %u not found.\n"), (unsigned int) sceneId);
+ debugPrintf("Scene %u not found.\n", (unsigned int) sceneId);
}
} else {
- debugPrintf(_("dumpdoorinfo <sceneid> <doorid>\n"));
+ debugPrintf("dumpdoorinfo <sceneid> <doorid>\n");
}
return true;
@@ -392,13 +391,13 @@ bool Console::cmd_dumpobjectinfo(int argc, const char **argv) {
debugPrintf("WY: %u\n", (unsigned int) object->_roomFrameMSB);
debugPrintf("SP: %u\n", (unsigned int) object->_SP);
} else {
- debugPrintf(_("Object %u not found.\n"), (unsigned int) objectId);
+ debugPrintf("Object %u not found.\n", (unsigned int) objectId);
}
} else {
- debugPrintf(_("Scene %u not found.\n"), (unsigned int) sceneId);
+ debugPrintf("Scene %u not found.\n", (unsigned int) sceneId);
}
} else {
- debugPrintf(_("dumpobjectinfo <sceneid> <objectid>\n"));
+ debugPrintf("dumpobjectinfo <sceneid> <objectid>\n");
}
return true;
@@ -423,13 +422,13 @@ bool Console::cmd_dumpstaticinfo(int argc, const char **argv) {
debugPrintf("WalkToY: %u\n", (unsigned int) stat->_walkToX);
debugPrintf("WalkToFrame: %u\n", (unsigned int) stat->_walkToFrame);
} else {
- debugPrintf(_("Static %u not found.\n"), (unsigned int) staticId);
+ debugPrintf("Static %u not found.\n", (unsigned int) staticId);
}
} else {
- debugPrintf(_("Scene %u not found.\n"), (unsigned int) sceneId);
+ debugPrintf("Scene %u not found.\n", (unsigned int) sceneId);
}
} else {
- debugPrintf(_("dumpstaticinfo <sceneid> <staticid>\n"));
+ debugPrintf("dumpstaticinfo <sceneid> <staticid>\n");
}
return true;
@@ -443,7 +442,7 @@ Script *Console::getScriptFromArg(const char *arg) {
script = _vm->getGame().getLocalScript();
}
if (!script) {
- debugPrintf(_("Choose 'G' (global) or 'L' (local) script.\n"));
+ debugPrintf("Choose 'G' (global) or 'L' (local) script.\n");
}
return script;
diff --git a/engines/mutationofjb/game.cpp b/engines/mutationofjb/game.cpp
index 2843ad943d..27def7dd1f 100644
--- a/engines/mutationofjb/game.cpp
+++ b/engines/mutationofjb/game.cpp
@@ -32,7 +32,6 @@
#include "mutationofjb/util.h"
#include "common/str.h"
-#include "common/translation.h"
#include "common/util.h"
namespace MutationOfJB {
@@ -232,7 +231,7 @@ uint8 Game::colorFromString(const char *colorStr) {
return static_cast<uint8>(atoi(colorStr + 1));
}
- warning(_("Color not found"));
+ warning("Color not found");
return 0x00;
}
diff --git a/engines/mutationofjb/gamedata.cpp b/engines/mutationofjb/gamedata.cpp
index d91c0fbd8c..fc006dc87d 100644
--- a/engines/mutationofjb/gamedata.cpp
+++ b/engines/mutationofjb/gamedata.cpp
@@ -23,7 +23,6 @@
#include "mutationofjb/gamedata.h"
#include "common/stream.h"
#include "common/util.h"
-#include "common/translation.h"
namespace MutationOfJB {
@@ -147,7 +146,7 @@ bool Scene::loadFromStream(Common::ReadStream &stream) {
Door *Scene::getDoor(uint8 doorId) {
if (doorId == 0 || doorId > _noDoors) {
- warning(_("Door %d does not exist"), doorId);
+ warning("Door %d does not exist", doorId);
return nullptr;
}
@@ -156,7 +155,7 @@ Door *Scene::getDoor(uint8 doorId) {
Object *Scene::getObject(uint8 objectId, bool ignoreNo) {
if (objectId == 0 || objectId > getNoObjects(ignoreNo)) {
- warning(_("Object %d does not exist"), objectId);
+ warning("Object %d does not exist", objectId);
return nullptr;
}
@@ -165,7 +164,7 @@ Object *Scene::getObject(uint8 objectId, bool ignoreNo) {
Static *Scene::getStatic(uint8 staticId, bool ignoreNo) {
if (staticId == 0 || staticId > (!ignoreNo ? MIN(_noStatics, (uint8) ARRAYSIZE(_statics)) : ARRAYSIZE(_statics))) {
- warning(_("Static %d does not exist"), staticId);
+ warning("Static %d does not exist", staticId);
return nullptr;
}
@@ -252,7 +251,7 @@ GameData::GameData()
Scene *GameData::getScene(uint8 sceneId) {
if (sceneId == 0 || sceneId > ARRAYSIZE(_scenes)) {
- warning(_("Scene %d does not exist"), sceneId);
+ warning("Scene %d does not exist", sceneId);
return nullptr;
}
diff --git a/engines/mutationofjb/room.cpp b/engines/mutationofjb/room.cpp
index a396a64828..783edae268 100644
--- a/engines/mutationofjb/room.cpp
+++ b/engines/mutationofjb/room.cpp
@@ -30,7 +30,6 @@
#include "common/rect.h"
#include "common/str.h"
-#include "common/translation.h"
#include "graphics/screen.h"
diff --git a/engines/mutationofjb/script.cpp b/engines/mutationofjb/script.cpp
index 01aef2c481..7538017199 100644
--- a/engines/mutationofjb/script.cpp
+++ b/engines/mutationofjb/script.cpp
@@ -26,7 +26,6 @@
#include "common/hash-str.h"
#include "common/stream.h"
#include "common/debug.h"
-#include "common/translation.h"
#include "mutationofjb/commands/command.h"
#include "mutationofjb/commands/ifcommand.h"
#include "mutationofjb/commands/ifitemcommand.h"
@@ -152,7 +151,7 @@ Command::ExecuteResult ScriptExecutionContext::runActiveCommand() {
Command::ExecuteResult ScriptExecutionContext::startCommand(Command *cmd) {
if (_activeCommand) {
- warning(_("Trying to start command while another one is running."));
+ warning("Trying to start command while another one is running.");
return Command::Finished;
}
getGameData()._color = WHITE; // The original game resets the color to WHITE beforing running script sections.
diff --git a/engines/mutationofjb/tasks/conversationtask.cpp b/engines/mutationofjb/tasks/conversationtask.cpp
index 3b1dcc5246..6e5d0202e3 100644
--- a/engines/mutationofjb/tasks/conversationtask.cpp
+++ b/engines/mutationofjb/tasks/conversationtask.cpp
@@ -33,8 +33,6 @@
#include "mutationofjb/util.h"
#include "mutationofjb/widgets/conversationwidget.h"
-#include "common/translation.h"
-
namespace MutationOfJB {
void ConversationTask::start() {
@@ -238,7 +236,7 @@ void ConversationTask::startExtra() {
_innerExecCtx = nullptr;
}
} else {
- warning(_("Extra '%s' not found"), line->_extra.c_str());
+ warning("Extra '%s' not found", line->_extra.c_str());
delete _innerExecCtx;
_innerExecCtx = nullptr;
}
diff --git a/engines/mutationofjb/tasks/taskmanager.cpp b/engines/mutationofjb/tasks/taskmanager.cpp
index a6d4dc1e84..6d860d41be 100644
--- a/engines/mutationofjb/tasks/taskmanager.cpp
+++ b/engines/mutationofjb/tasks/taskmanager.cpp
@@ -24,8 +24,6 @@
#include "mutationofjb/tasks/task.h"
-#include "common/translation.h"
-
namespace MutationOfJB {
void TaskManager::startTask(const TaskPtr &task) {
@@ -37,7 +35,7 @@ void TaskManager::startTask(const TaskPtr &task) {
void TaskManager::stopTask(const TaskPtr &task) {
TaskPtrs::iterator it = Common::find(_tasks.begin(), _tasks.end(), task);
if (it == _tasks.end()) {
- warning(_("Task is not registered in TaskManager."));
+ warning("Task is not registered in TaskManager");
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 01:46:31 +0000