aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/main.cpp2
-rw-r--r--common/unzip.cpp2
-rw-r--r--engines/advancedDetector.cpp2
-rw-r--r--engines/cruise/dataLoader.cpp2
-rw-r--r--engines/lure/debugger.cpp2
-rw-r--r--engines/saga/introproc_ite.cpp8
-rw-r--r--engines/scumm/debugger.cpp2
-rw-r--r--engines/scumm/insane/insane_ben.cpp2
-rw-r--r--engines/scumm/insane/insane_enemy.cpp2
-rw-r--r--graphics/video/flic_decoder.cpp4
-rw-r--r--sound/decoders/flac.cpp2
-rw-r--r--sound/mods/tfmx.cpp4
-rw-r--r--sound/softsynth/cms.cpp2
13 files changed, 18 insertions, 18 deletions
diff --git a/base/main.cpp b/base/main.cpp
index dff9a0d564..a44f7a337a 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -310,7 +310,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
Common::StringMap settings;
command = Base::parseCommandLine(settings, argc, argv);
- // Load the config file (possibly overriden via command line):
+ // Load the config file (possibly overridden via command line):
if (settings.contains("config")) {
ConfMan.loadConfigFile(settings["config"]);
settings.erase("config");
diff --git a/common/unzip.cpp b/common/unzip.cpp
index e0ddb8f286..3f084ad861 100644
--- a/common/unzip.cpp
+++ b/common/unzip.cpp
@@ -401,7 +401,7 @@ typedef struct {
/* ===========================================================================
Read a byte from a gz_stream; update next_in and avail_in. Return EOF
for end of file.
- IN assertion: the stream s has been sucessfully opened for reading.
+ IN assertion: the stream s has been successfully opened for reading.
*/
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 22212675c7..d31330b69e 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -622,7 +622,7 @@ static ADGameDescList detectGameFilebased(const FileMap &allFiles, const ADParam
matchedDesc = agdesc;
maxNumMatchedFiles = numMatchedFiles;
- debug(4, "and overriden");
+ debug(4, "and overridden");
}
}
}
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index b2ac7a2fd6..b48240b30e 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -55,7 +55,7 @@ void decodeGfxUnified(dataFileEntry *pCurrentFileEntry, int16 format) {
break;
default:
- error("Unkown gfx format %d", format);
+ error("Unknown gfx format %d", format);
}
uint8 *buffer = (uint8 *)MemAlloc(spriteSize);
diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp
index 1cfe0804e4..5fbe124919 100644
--- a/engines/lure/debugger.cpp
+++ b/engines/lure/debugger.cpp
@@ -323,7 +323,7 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) {
if (h != NULL) {
DebugPrintf("Frame Number = %d of %d\n", h->frameNumber(), h->numFrames());
- DebugPrintf("Persistant = %s\n", h->persistant() ? "true" : "false");
+ DebugPrintf("Persistent = %s\n", h->persistant() ? "true" : "false");
}
} else if (strcmp(argv[2], "actions") == 0) {
diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
index 73b7e353d5..dc2e2fca79 100644
--- a/engines/saga/introproc_ite.cpp
+++ b/engines/saga/introproc_ite.cpp
@@ -485,7 +485,7 @@ int Scene::ITEIntroCave1Proc(int param) {
break;
default:
- warning("Illegal scene procedure paramater");
+ warning("Illegal scene procedure parameter");
break;
}
@@ -589,7 +589,7 @@ int Scene::ITEIntroCave2Proc(int param) {
case SCENE_END:
break;
default:
- warning("Illegal scene procedure paramater");
+ warning("Illegal scene procedure parameter");
break;
}
@@ -694,7 +694,7 @@ int Scene::ITEIntroCave3Proc(int param) {
case SCENE_END:
break;
default:
- warning("Illegal scene procedure paramater");
+ warning("Illegal scene procedure parameter");
break;
}
@@ -812,7 +812,7 @@ int Scene::ITEIntroCave4Proc(int param) {
case SCENE_END:
break;
default:
- warning("Illegal scene procedure paramater");
+ warning("Illegal scene procedure parameter");
break;
}
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 45a407629b..61a2a38a3f 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -529,7 +529,7 @@ bool ScummDebugger::Cmd_Debug(int argc, const char **argv) {
} else {
DebugPrintf("Usage: debug [+CHANNEL|-CHANNEL]\n");
DebugPrintf("Enables or disables the given debug channel.\n");
- DebugPrintf("When used without parameters, lists all avaiable debug channels and their status.\n");
+ DebugPrintf("When used without parameters, lists all available debug channels and their status.\n");
}
return true;
diff --git a/engines/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp
index 9ddb4c6670..05775f1585 100644
--- a/engines/scumm/insane/insane_ben.cpp
+++ b/engines/scumm/insane/insane_ben.cpp
@@ -1163,7 +1163,7 @@ void Insane::actor02Reaction(int32 buttons) {
setBenState();
_actor[0].act[2].tilt = 0;
// for some reason there is no break at this
- // place, so tilt gets overriden on next line
+ // place, so tilt gets overridden on next line
}
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
break;
diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index 23415bd332..e8d97d3875 100644
--- a/engines/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
@@ -2072,7 +2072,7 @@ void Insane::actor12Reaction(int32 buttons) {
setEnemyState();
_actor[1].act[2].tilt = 0;
// for some reason there is no break at this
- // place, so tilt gets overriden on next line
+ // place, so tilt gets overridden on next line
}
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
break;
diff --git a/graphics/video/flic_decoder.cpp b/graphics/video/flic_decoder.cpp
index 843d3ee093..f55a74f4f3 100644
--- a/graphics/video/flic_decoder.cpp
+++ b/graphics/video/flic_decoder.cpp
@@ -70,7 +70,7 @@ bool FlicDecoder::load(Common::SeekableReadStream *stream) {
}
_fileStream->readUint16LE(); // flags
- // Note: The normal delay is a 32-bit integer (dword), whereas the overriden delay is a 16-bit integer (word)
+ // Note: The normal delay is a 32-bit integer (dword), whereas the overridden delay is a 16-bit integer (word)
// the frame delay is the FLIC "speed", in milliseconds.
_frameRate = Common::Rational(1000, _fileStream->readUint32LE());
@@ -207,7 +207,7 @@ Surface *FlicDecoder::decodeNextFrame() {
// this properly.
chunkCount = _fileStream->readUint16LE();
- // Note: The overriden delay is a 16-bit integer (word), whereas the normal delay is a 32-bit integer (dword)
+ // Note: The overridden delay is a 16-bit integer (word), whereas the normal delay is a 32-bit integer (dword)
// the frame delay is the FLIC "speed", in milliseconds.
uint16 newFrameDelay = _fileStream->readUint16LE(); // "speed", in milliseconds
if (newFrameDelay > 0)
diff --git a/sound/decoders/flac.cpp b/sound/decoders/flac.cpp
index 1264e869ad..d01e0d0a79 100644
--- a/sound/decoders/flac.cpp
+++ b/sound/decoders/flac.cpp
@@ -303,7 +303,7 @@ int FLACStream::readBuffer(int16 *buffer, const int numSamples) {
const uint numChannels = getChannels();
if (numChannels == 0) {
- warning("FLACStream: Stream not sucessfully initialised, cant playback");
+ warning("FLACStream: Stream not successfully initialised, cant playback");
return -1; // streaminfo wasnt read!
}
diff --git a/sound/mods/tfmx.cpp b/sound/mods/tfmx.cpp
index b65a998e82..6ed1abcfb5 100644
--- a/sound/mods/tfmx.cpp
+++ b/sound/mods/tfmx.cpp
@@ -281,7 +281,7 @@ void Tfmx::macroRun(ChannelContext &channel) {
continue;
case 0x04: // Wait. Parameters: Ticks to wait(W).
- // TODO: some unkown Parameter? (macroPtr[1] & 1)
+ // TODO: some unknown Parameter? (macroPtr[1] & 1)
channel.macroWait = READ_BE_UINT16(&macroPtr[2]);
break;
@@ -1154,7 +1154,7 @@ void displayMacroStep(const void * const vptr) {
if (macroData[0] < ARRAYSIZE(tableMacros))
debug("%s %02X%02X%02X", tableMacros[macroData[0]], macroData[1], macroData[2], macroData[3]);
else
- debug("Unkown Macro #%02X %02X%02X%02X", macroData[0], macroData[1], macroData[2], macroData[3]);
+ debug("Unknown Macro #%02X %02X%02X%02X", macroData[0], macroData[1], macroData[2], macroData[3]);
}
void displayPatternstep(const void * const vptr) {
diff --git a/sound/softsynth/cms.cpp b/sound/softsynth/cms.cpp
index 88f04a1ab9..bcce7688d0 100644
--- a/sound/softsynth/cms.cpp
+++ b/sound/softsynth/cms.cpp
@@ -342,7 +342,7 @@ void CMSEmulator::portWriteIntern(int chip, int offset, int data) {
default:
// The CMS allows all registers to be written, so we just output some debug
// message here
- debug(5, "CMS Unkown write to reg %x with %x",reg, data);
+ debug(5, "CMS Unknown write to reg %x with %x",reg, data);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 15:13:32 +0000