[Scummvm-git-logs] scummvm master -> 4d19c379c672faa0609b4eeaf095b4e1bad9e66d
bluegr
noreply at scummvm.org
Sat Sep 7 15:01:56 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4d19c379c6 JANITORIAL: MTROPOLIS: resolve various typos
Commit: 4d19c379c672faa0609b4eeaf095b4e1bad9e66d
https://github.com/scummvm/scummvm/commit/4d19c379c672faa0609b4eeaf095b4e1bad9e66d
Author: meekee7 (michael_kuerbis at web.de)
Date: 2024-09-07T18:01:53+03:00
Commit Message:
JANITORIAL: MTROPOLIS: resolve various typos
Changed paths:
engines/mtropolis/boot.cpp
engines/mtropolis/coroutine_manager.cpp
engines/mtropolis/elements.cpp
engines/mtropolis/hacks.cpp
engines/mtropolis/plugin/ftts_data.h
engines/mtropolis/plugin/hoologic_data.h
engines/mtropolis/plugin/standard.cpp
engines/mtropolis/plugin/thereware_data.h
engines/mtropolis/runtime.cpp
engines/mtropolis/saveload.cpp
diff --git a/engines/mtropolis/boot.cpp b/engines/mtropolis/boot.cpp
index 40a3b595760..a6706f532ac 100644
--- a/engines/mtropolis/boot.cpp
+++ b/engines/mtropolis/boot.cpp
@@ -743,7 +743,7 @@ bool BootScriptParser::parseNumber(char firstChar, Common::String &outToken) {
}
if (isAlpha(ch)) {
- warning("Invalid floating point constantin boot script");
+ warning("Invalid floating point constant in boot script");
return false;
}
diff --git a/engines/mtropolis/coroutine_manager.cpp b/engines/mtropolis/coroutine_manager.cpp
index ef7e2f2a80a..a833649a338 100644
--- a/engines/mtropolis/coroutine_manager.cpp
+++ b/engines/mtropolis/coroutine_manager.cpp
@@ -521,7 +521,7 @@ void CoroutineCompiler::compileOne(CompiledCoroutine *compiledCoro, CoroutineCom
chainEndInstr[chainID] = (uint)-1;
break;
} else if (instrJumpRoot[traceInstr] == 0) {
- // Propgate jump chain
+ // Propagate jump chain
instrJumpRoot[traceInstr] = jumpRootID;
traceInstr = instr._value;
} else {
diff --git a/engines/mtropolis/elements.cpp b/engines/mtropolis/elements.cpp
index fd1504c51eb..19d21a8de78 100644
--- a/engines/mtropolis/elements.cpp
+++ b/engines/mtropolis/elements.cpp
@@ -1826,7 +1826,7 @@ MiniscriptInstructionOutcome MToonElement::scriptSetCel(MiniscriptThread *thread
int32 maxCel = _metadata->frames.size();
- // Intentially ignore play range. The cel may be set to an out-of-range cel here and will
+ // Intentionally ignore play range. The cel may be set to an out-of-range cel here and will
// in fact play from that cel even if it's out of range. The mariachi hint room near the
// Bureau booths in Obsidian depends on this behavior, since it sets the mToon cel and then
// sets the range based on the cel value.
diff --git a/engines/mtropolis/hacks.cpp b/engines/mtropolis/hacks.cpp
index faadb0e49a4..6edcc7cfc5a 100644
--- a/engines/mtropolis/hacks.cpp
+++ b/engines/mtropolis/hacks.cpp
@@ -1124,7 +1124,7 @@ void addMTIQuirks(const MTropolisGameDescription &desc, Hacks &hacks) {
hacks.mtiVariableReferencesHack = true;
// MTI returns from the menu by transitioning to a "return" scene that sends a return message to the target
- // scene, which is supposed to activate a scene transtion modifier in the scene that transitions to itself.
+ // scene, which is supposed to activate a scene transition modifier in the scene that transitions to itself.
// This doesn't work because the modifier is gone when the scene is unloaded.
hacks.mtiSceneReturnHack = true;
diff --git a/engines/mtropolis/plugin/ftts_data.h b/engines/mtropolis/plugin/ftts_data.h
index 7a7863ea17a..90507a75e50 100644
--- a/engines/mtropolis/plugin/ftts_data.h
+++ b/engines/mtropolis/plugin/ftts_data.h
@@ -32,7 +32,7 @@ namespace FTTS {
// Known Fairy Tale: A True Story - Activity Center custom modifiers:
// - Motion
-// - Sparke
+// - Sparkle
struct MotionModifier : public PlugInModifierData {
diff --git a/engines/mtropolis/plugin/hoologic_data.h b/engines/mtropolis/plugin/hoologic_data.h
index 2533ee38c3c..0f606030e30 100644
--- a/engines/mtropolis/plugin/hoologic_data.h
+++ b/engines/mtropolis/plugin/hoologic_data.h
@@ -36,7 +36,7 @@ namespace Hoologic {
// - hlCaptureBitmap: captures a screen image into a bitmap
// - hlPrintBitmap: print a bitmap
// - hlSaveBitmap: saves a bitmap as a PICT/BMP file
-// - hlImportBitamp: load a bitmap from a PICT/BMP file
+// - hlImportBitmap: load a bitmap from a PICT/BMP file
// - hlDisplayBitmap: display a bitmap
// - hlScaleBitmap: scale a bitmap
//
diff --git a/engines/mtropolis/plugin/standard.cpp b/engines/mtropolis/plugin/standard.cpp
index 391e9ad36bb..ecc73876602 100644
--- a/engines/mtropolis/plugin/standard.cpp
+++ b/engines/mtropolis/plugin/standard.cpp
@@ -1765,6 +1765,6 @@ Common::SharedPtr<PlugIn> createStandard() {
return Common::SharedPtr<PlugIn>(new Standard::StandardPlugIn());
}
-} // End of namespace MTropolis
+} // End of namespace PlugIns
} // End of namespace MTropolis
diff --git a/engines/mtropolis/plugin/thereware_data.h b/engines/mtropolis/plugin/thereware_data.h
index 21088a740c2..43b8e523a22 100644
--- a/engines/mtropolis/plugin/thereware_data.h
+++ b/engines/mtropolis/plugin/thereware_data.h
@@ -54,7 +54,7 @@ namespace Thereware {
// - EasyScroller: various detail controls for scrolling behavior
//
// * Quick Kit:
-// - Flasher: Lets objects blinko on the screen
+// - Flasher: Lets objects blink on the screen
// - Snapper: Creates an invisible grid that elements can snap onto when dragged
// - Conductor: Forward messages to all the children of an element
// - Randomizer: Use random numbers without Miniscript
diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index 22aefc4b538..934068f5b30 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -2412,7 +2412,7 @@ void MessengerSendSpec::resolveDestination(Runtime *runtime, Modifier *sender, R
void MessengerSendSpec::resolveVariableObjectType(RuntimeObject *obj, Common::WeakPtr<Structural> &outStructuralDest, Common::WeakPtr<Modifier> &outModifierDest) {
if (!obj) {
- warning("Couldn't resolve mesenger destination");
+ warning("Couldn't resolve messenger destination");
return;
}
@@ -4471,7 +4471,7 @@ Palette::Palette() {
}
void Palette::initDefaultPalette(int version) {
- // NOTE: The "V2" pallete is correct for Unit: Rebooted.
+ // NOTE: The "V2" palette is correct for Unit: Rebooted.
// Is it correct for all V2 apps?
assert(version == 1 || version == 2);
int outColorIndex = 0;
@@ -5320,7 +5320,7 @@ void Runtime::executeCloneObject(RuntimeObject *object) {
if (container)
container->appendModifier(modifierRef);
else
- error("Internal error: Cloned a modifier, but the parent isn't a modifeir container");
+ error("Internal error: Cloned a modifier, but the parent isn't a modifier container");
{
Common::SharedPtr<MessageProperties> msgProps(new MessageProperties(Event(EventIDs::kClone, 0), DynamicValue(), modifierRef));
@@ -10228,7 +10228,7 @@ bool Modifier::respondsToEvent(const Event &evt) const {
}
VThreadState Modifier::consumeMessage(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) {
- // If you're here, a message type was reported as responsive by respondsToEvent but consumeMessage wasn't overrided
+ // If you're here, a message type was reported as responsive by respondsToEvent but consumeMessage wasn't overridden
assert(false);
return kVThreadError;
}
diff --git a/engines/mtropolis/saveload.cpp b/engines/mtropolis/saveload.cpp
index fdf56393680..62410a50636 100644
--- a/engines/mtropolis/saveload.cpp
+++ b/engines/mtropolis/saveload.cpp
@@ -79,7 +79,7 @@ bool MTropolisEngine::promptSave(ISaveWriter *writer, const Graphics::Surface *s
desc = dialog->getResultString();
if (desc.empty()) {
- // create our own description for the saved game, the user didnt enter it
+ // create our own description for the saved game, the user didn't enter it
desc = dialog->createDefaultSaveDescription(slot);
}
More information about the Scummvm-git-logs
mailing list