[Scummvm-git-logs] scummvm master -> 3aca967665a01df81b4c40596edfdccb8b35b76f
bluegr
noreply at scummvm.org
Wed Aug 7 07:10:24 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:
3aca967665 JANITORIAL: GRIM: Fix typos in comments
Commit: 3aca967665a01df81b4c40596edfdccb8b35b76f
https://github.com/scummvm/scummvm/commit/3aca967665a01df81b4c40596edfdccb8b35b76f
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-08-07T10:10:21+03:00
Commit Message:
JANITORIAL: GRIM: Fix typos in comments
Changed paths:
engines/grim/actor.h
engines/grim/costume/model_component.cpp
engines/grim/emi/modelemi.cpp
engines/grim/emi/sound/vimatrack.cpp
engines/grim/imuse/imuse_sndmgr.h
engines/grim/lua/lmem.cpp
engines/grim/lua/lstrlib.cpp
engines/grim/lua_v1.cpp
engines/grim/lua_v1_sound.cpp
engines/grim/movie/movie.cpp
engines/grim/movie/movie.h
engines/grim/movie/smush.cpp
diff --git a/engines/grim/actor.h b/engines/grim/actor.h
index 76ea1525ec8..bfe2f2f33a2 100644
--- a/engines/grim/actor.h
+++ b/engines/grim/actor.h
@@ -406,7 +406,7 @@ public:
void setLooking(bool lookingMode) { _lookingMode = lookingMode; }
/**
- * Makes the actor move forward, the lenght of the movement based
+ * Makes the actor move forward, the length of the movement based
* on the walk rate.
* If it is following boxes it will not go into not walkable areas.
*
diff --git a/engines/grim/costume/model_component.cpp b/engines/grim/costume/model_component.cpp
index 93afe2214b4..1b1ffe4f067 100644
--- a/engines/grim/costume/model_component.cpp
+++ b/engines/grim/costume/model_component.cpp
@@ -93,7 +93,7 @@ void ModelComponent::init() {
Debug::warning(Debug::Costumes, "Parent of model %s wasn't a mesh", _name.c_str());
}
- // Use parent availablity to decide whether to default the
+ // Use parent availability to decide whether to default the
// component to being visible
if (_parent)
setKey(0);
diff --git a/engines/grim/emi/modelemi.cpp b/engines/grim/emi/modelemi.cpp
index d1dc40aaeec..6c428d0230e 100644
--- a/engines/grim/emi/modelemi.cpp
+++ b/engines/grim/emi/modelemi.cpp
@@ -97,7 +97,7 @@ void EMIModel::setTex(uint32 index) {
}
void EMIModel::loadMesh(Common::SeekableReadStream *data) {
- //int strLength = 0; // Usefull for PS2-strings
+ //int strLength = 0; // Useful for PS2-strings
Common::String nameString = readLAString(data);
diff --git a/engines/grim/emi/sound/vimatrack.cpp b/engines/grim/emi/sound/vimatrack.cpp
index 29958bd9720..347a43503a5 100644
--- a/engines/grim/emi/sound/vimatrack.cpp
+++ b/engines/grim/emi/sound/vimatrack.cpp
@@ -36,7 +36,7 @@ namespace Grim {
struct Region {
int32 offset; // offset of region
- int32 length; // lenght of region
+ int32 length; // length of region
};
struct SoundDesc {
diff --git a/engines/grim/imuse/imuse_sndmgr.h b/engines/grim/imuse/imuse_sndmgr.h
index 0a27fec08d1..58ad566aa8c 100644
--- a/engines/grim/imuse/imuse_sndmgr.h
+++ b/engines/grim/imuse/imuse_sndmgr.h
@@ -47,7 +47,7 @@ public:
private:
struct Region {
int32 offset; // offset of region
- int32 length; // lenght of region
+ int32 length; // length of region
};
struct Jump {
diff --git a/engines/grim/lua/lmem.cpp b/engines/grim/lua/lmem.cpp
index 5b3b5cfa809..70e0c3e75bf 100644
--- a/engines/grim/lua/lmem.cpp
+++ b/engines/grim/lua/lmem.cpp
@@ -63,7 +63,7 @@ void *luaM_realloc(void *block, int32 size) {
int32 realsize = sizeof(int32) + size + sizeof(char);
if (realsize != (size_t)realsize)
lua_error("Allocation Error: Block too big");
- if (size == 0) { // ANSI dosen't need this, but some machines...
+ if (size == 0) { // ANSI doesn't need this, but some machines...
if (block) {
memset(block, -1, *((int32 *)block - 1)); // erase block
block = checkblock(block);
diff --git a/engines/grim/lua/lstrlib.cpp b/engines/grim/lua/lstrlib.cpp
index e4302f1cd9a..d7875a315d0 100644
--- a/engines/grim/lua/lstrlib.cpp
+++ b/engines/grim/lua/lstrlib.cpp
@@ -443,7 +443,7 @@ static void str_format() {
initf += 2; // skip the 'n$'
}
arg++;
- strncpy(form+1, initf, strfrmt - initf + 1); // +1 to include convertion
+ strncpy(form+1, initf, strfrmt - initf + 1); // +1 to include conversion
form[strfrmt-initf + 2] = 0;
buff = luaL_openspace(1000); // to store the formatted value
switch (*strfrmt++) {
diff --git a/engines/grim/lua_v1.cpp b/engines/grim/lua_v1.cpp
index a24bfaf5fa6..8b80aa1f47e 100644
--- a/engines/grim/lua_v1.cpp
+++ b/engines/grim/lua_v1.cpp
@@ -513,7 +513,7 @@ void Lua_V1::GetControlState() {
if (num >= KEYCODE_AXIS_JOY1_X && num <= KEYCODE_AXIS_MOUSE_Z)
lua_pushnumber(g_grim->getControlAxis(num));
else {
- pushbool(g_grim->getControlState(num)); // key down, originaly it push number if key down
+ pushbool(g_grim->getControlState(num)); // key down, originally it push number if key down
// pushnil or number, what is is ?
}
}
diff --git a/engines/grim/lua_v1_sound.cpp b/engines/grim/lua_v1_sound.cpp
index 9d7725aa66b..eae50f4326c 100644
--- a/engines/grim/lua_v1_sound.cpp
+++ b/engines/grim/lua_v1_sound.cpp
@@ -317,7 +317,7 @@ void Lua_V1::PlaySoundAt() {
}
void Lua_V1::LoadBundle() {
- // loading grimdemo.mus is allready handled
+ // loading grimdemo.mus is already handled
}
void Lua_V1::PlaySound() {
diff --git a/engines/grim/movie/movie.cpp b/engines/grim/movie/movie.cpp
index d805092f13c..a9b911de933 100644
--- a/engines/grim/movie/movie.cpp
+++ b/engines/grim/movie/movie.cpp
@@ -238,7 +238,7 @@ void MoviePlayer::restoreState(SaveGame *state) {
#define NEED_NULLPLAYER
#endif
-// Fallback for when USE_MPEG2 / USE_BINK isnt defined
+// Fallback for when USE_MPEG2 / USE_BINK isn't defined
#ifdef NEED_NULLPLAYER
class NullPlayer : public MoviePlayer {
diff --git a/engines/grim/movie/movie.h b/engines/grim/movie/movie.h
index a4f61111a96..058d47e3a1a 100644
--- a/engines/grim/movie/movie.h
+++ b/engines/grim/movie/movie.h
@@ -94,7 +94,7 @@ protected:
* Handles basic stuff per frame, like copying the latest frame to
* _externalBuffer, and updating the frame-counters.
*
- * @return false if a frame wasnt drawn to _externalBuffer, true otherwise.
+ * @return false if a frame wasn't drawn to _externalBuffer, true otherwise.
* @see handleFrame
*/
virtual bool prepareFrame();
diff --git a/engines/grim/movie/smush.cpp b/engines/grim/movie/smush.cpp
index 8434e2427e5..41b269345d4 100644
--- a/engines/grim/movie/smush.cpp
+++ b/engines/grim/movie/smush.cpp
@@ -103,7 +103,7 @@ void SmushPlayer::handleFrame() {
return;
} else {
if (!_currentVideoIsTheora) {
- _smushDecoder->rewind(); // This doesnt handle if looping fails.
+ _smushDecoder->rewind(); // This doesn't handle if looping fails.
_smushDecoder->start();
}
}
More information about the Scummvm-git-logs
mailing list