[Scummvm-git-logs] scummvm master -> f54fd81b4f6d9850b55ea8a33352ee8e374e2239
bluegr
noreply at scummvm.org
Wed Dec 25 14:57:38 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:
f54fd81b4f JANITORIAL: Fix typos in general files
Commit: f54fd81b4f6d9850b55ea8a33352ee8e374e2239
https://github.com/scummvm/scummvm/commit/f54fd81b4f6d9850b55ea8a33352ee8e374e2239
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-12-25T16:57:34+02:00
Commit Message:
JANITORIAL: Fix typos in general files
Changed paths:
audio/mods/tfmx.cpp
audio/softsynth/opl/mame.cpp
backends/fs/stdiostream.h
configure
devtools/create_drascula/staticdata.h
devtools/create_kyradat/resources/eob1_dos_english.h
devtools/create_kyradat/resources/eob1_segacd_english.h
devtools/create_kyradat/resources/eob2_amiga_english.h
devtools/create_kyradat/resources/eob2_dos_english.h
devtools/create_kyradat/resources/eob2_pc98_japanese.h
devtools/create_mm/create_xeen/en_constants.h
devtools/create_mm/files/mm1/strings_en.yml
devtools/create_teenagent/static_tables.h
devtools/create_titanic/create_titanic_dat.cpp
graphics/sjis.cpp
diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp
index c88811c7623..609d83057bd 100644
--- a/audio/mods/tfmx.cpp
+++ b/audio/mods/tfmx.cpp
@@ -880,7 +880,7 @@ const int8 *Tfmx::loadSampleFile(uint32 &sampleLen, Common::SeekableReadStream &
const int32 sampleSize = sampleStream.size();
if (sampleSize < 4) {
- warning("Tfmx: Cant load Samplefile");
+ warning("Tfmx: Can't load Samplefile");
return nullptr;
}
diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index dd7d1142738..e2ac8891b4b 100644
--- a/audio/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
@@ -769,7 +769,7 @@ static void OPLCloseTable(void) {
free(ENV_CURVE);
}
-/* CSM Key Controll */
+/* CSM Key Control */
inline void CSMKeyControll(OPL_CH *CH) {
OPL_SLOT *slot1 = &CH->SLOT[SLOT1];
OPL_SLOT *slot2 = &CH->SLOT[SLOT2];
diff --git a/backends/fs/stdiostream.h b/backends/fs/stdiostream.h
index 041b6d8382d..e8183697203 100644
--- a/backends/fs/stdiostream.h
+++ b/backends/fs/stdiostream.h
@@ -90,7 +90,7 @@ private:
* @param src The file to move
* @param dst The path where the file is to be moved.
*
- * @returns Wether the renaming succeeded or not.
+ * @returns Whether the renaming succeeded or not.
*/
bool moveFile(const Common::String &src, const Common::String &dst);
};
diff --git a/configure b/configure
index 55692e82ef7..4efb2bbdb64 100755
--- a/configure
+++ b/configure
@@ -1880,7 +1880,7 @@ sailfish)
docdir='/usr/share/org.scummvm.scummvm/doc/scummvm'
# Use static libraries on Sailfish. Sailfish limits our
# ability to link with libraries from other packages. And if we ship
- # dynamic library but always load it and noone else uses it, then we're
+ # dynamic library but always load it and no one else uses it, then we're
# no better off than using static libraries. Additionally shipping
# libraries is a hassle.
if [ -n "$JPEG_PREFIX" ]; then
diff --git a/devtools/create_drascula/staticdata.h b/devtools/create_drascula/staticdata.h
index 68f9d843d55..509a662131f 100644
--- a/devtools/create_drascula/staticdata.h
+++ b/devtools/create_drascula/staticdata.h
@@ -1167,6 +1167,7 @@ const char *_text[NUM_LANGS][NUM_TEXT] = {
// 205
"YOU...PIANIST...!!!!",
"BEAUTIFUL NIGHT",
+ // FIXME: Spelling incorrect. cant should be can't. Fixing changes game data and thus may cause issues
"AND IT'S NOT EVEN COLD OR ANYTHING, BY THE WAY, CANT YOU PLAY A DIFFERENT SONG?",
"ALL RIGHT, I'LL JUST LET YOU GO ON PLAYING",
"WELL THEN",
diff --git a/devtools/create_kyradat/resources/eob1_dos_english.h b/devtools/create_kyradat/resources/eob1_dos_english.h
index d5222bf4fe7..7f23d567488 100644
--- a/devtools/create_kyradat/resources/eob1_dos_english.h
+++ b/devtools/create_kyradat/resources/eob1_dos_english.h
@@ -321,6 +321,7 @@ static const char *const kEoB1ValidateArmorStringDOSEnglish[1] = {
static const StringListProvider kEoB1ValidateArmorStringDOSEnglishProvider = { ARRAYSIZE(kEoB1ValidateArmorStringDOSEnglish), kEoB1ValidateArmorStringDOSEnglish };
static const char *const kEoB1ValidateNoDropStringDOSEnglish[1] = {
+ // FIXME: Spelling incorrect. cant should be can't. Fixing changes game data and thus may cause issues
"You cant put that item there.\r"
};
diff --git a/devtools/create_kyradat/resources/eob1_segacd_english.h b/devtools/create_kyradat/resources/eob1_segacd_english.h
index 4f83bc10d9b..5489efec3e5 100644
--- a/devtools/create_kyradat/resources/eob1_segacd_english.h
+++ b/devtools/create_kyradat/resources/eob1_segacd_english.h
@@ -498,6 +498,7 @@ static const char *const kEoB1ValidateArmorStringSegaCDEnglish[1] = {
static const StringListProvider kEoB1ValidateArmorStringSegaCDEnglishProvider = { ARRAYSIZE(kEoB1ValidateArmorStringSegaCDEnglish), kEoB1ValidateArmorStringSegaCDEnglish };
static const char *const kEoB1ValidateNoDropStringSegaCDEnglish[1] = {
+ // FIXME: Spelling incorrect. cant should be can't. Fixing changes game data and thus may cause issues
"You cant put that item there.\r"
};
diff --git a/devtools/create_kyradat/resources/eob2_amiga_english.h b/devtools/create_kyradat/resources/eob2_amiga_english.h
index aec0e4179aa..1f371edf05c 100644
--- a/devtools/create_kyradat/resources/eob2_amiga_english.h
+++ b/devtools/create_kyradat/resources/eob2_amiga_english.h
@@ -655,6 +655,7 @@ static const char *const kEoB2ClericSpellsListAmigaEnglish[30] = {
"True Seeing",
"Harm",
"Heal",
+ // FIXME: Spelling incorrect. ressurection should be resurrection. Fixing changes game data and thus may cause issues
"Ressurection",
"Lay on Hands",
"Turn undead"
diff --git a/devtools/create_kyradat/resources/eob2_dos_english.h b/devtools/create_kyradat/resources/eob2_dos_english.h
index 0d7958ce06b..95e3a30659e 100644
--- a/devtools/create_kyradat/resources/eob2_dos_english.h
+++ b/devtools/create_kyradat/resources/eob2_dos_english.h
@@ -655,6 +655,7 @@ static const char *const kEoB2ClericSpellsListDOSEnglish[30] = {
"True Seeing",
"Harm",
"Heal",
+ // FIXME: Spelling incorrect. ressurection should be resurrection. Fixing changes game data and thus may cause issues
"Ressurection",
"Lay on Hands",
"Turn undead"
diff --git a/devtools/create_kyradat/resources/eob2_pc98_japanese.h b/devtools/create_kyradat/resources/eob2_pc98_japanese.h
index 4067a2677f2..c6e54dd853d 100644
--- a/devtools/create_kyradat/resources/eob2_pc98_japanese.h
+++ b/devtools/create_kyradat/resources/eob2_pc98_japanese.h
@@ -655,6 +655,7 @@ static const char *const kEoB2ClericSpellsListPC98Japanese[30] = {
"True Seeing",
"Harm",
"Heal",
+ // FIXME: Spelling incorrect. ressurection should be resurrection. Fixing changes game data and thus may cause issues
"Ressurection",
"Lay on Hands",
"Turn undead"
@@ -721,6 +722,7 @@ static const char *const kEoB2SpellNamesPC98Japanese[68] = {
"True Seeing",
"Harm",
"Heal",
+ // FIXME: Spelling incorrect. ressurection should be resurrection. Fixing changes game data and thus may cause issues
"Ressurection",
"Lay on Hands",
"Turn Undead",
diff --git a/devtools/create_mm/create_xeen/en_constants.h b/devtools/create_mm/create_xeen/en_constants.h
index c6111fdc380..e133d804c36 100644
--- a/devtools/create_mm/create_xeen/en_constants.h
+++ b/devtools/create_mm/create_xeen/en_constants.h
@@ -522,6 +522,7 @@ public:
"077";
}
+ // FIXME: Spelling incorrect. Withdrawl should be Withdrawal. Fixing changes game data and thus may cause issues
const char **DEPOSIT_WITHDRAWL() {
static const char *_depositWithdrawl[] = { "Deposit", "Withdrawl" };
return _depositWithdrawl;
@@ -781,6 +782,7 @@ public:
"Nonexistant", "Very Poor", "Poor", "Very Low", "Low", "Average", "Good",
"Very Good", "High", "Very High", "Great", "Super", "Amazing", "Incredible",
"Gigantic", "Fantastic", "Astoundig", "Astonishing", "Monumental", "Tremendous",
+ // FIXME: Spelling incorrect. Collosal should be Colossal. Fixing changes game data and thus may cause issues
"Collosal", "Awesome", "Awe Inspiring", "Ultimate"
};
return _ratingText;
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 948ce31338b..f7d7226b698 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -832,6 +832,7 @@ spells:
42: "Divine Intervention"
43: "Holy Word"
44: "Prot. From Elements"
+ // FIXME: Spelling incorrect. ressurection should be resurrection. Fixing changes game data and thus may cause issues
45: "Ressurection"
46: "Sun Ray"
wizard:
diff --git a/devtools/create_teenagent/static_tables.h b/devtools/create_teenagent/static_tables.h
index 5d7c0b64428..55653ad20f5 100644
--- a/devtools/create_teenagent/static_tables.h
+++ b/devtools/create_teenagent/static_tables.h
@@ -13652,6 +13652,7 @@ const static char* dialog_82[] = {
DISPLAY_MESSAGE,
"No police...",
DISPLAY_MESSAGE,
+ // FIXME: Spelling incorrect. noone should be no one. Fixing changes game data and thus may cause issues
"Noone will hear their screams...",
DISPLAY_MESSAGE,
ANIM_WAIT,
@@ -13782,6 +13783,7 @@ const static char* dialog_88[] = {
NEW_LINE,
"and pick up the banknote.",
DISPLAY_MESSAGE,
+ // FIXME: Spelling incorrect. noone should be no one. Fixing changes game data and thus may cause issues
"Noone has to know...",
DISPLAY_MESSAGE,
"Good bye, my friend.",
diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 0c93a6ce302..ddc843b4912 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -303,6 +303,7 @@ static const CommonPhrase BELLBOT_COMMON_PHRASES_EN[] = {
{ "no help", 0x30D6F, 0x6D, 0 },
{ "sorry", 0x30D76, 0x6D, 0 },
{ "not mean that", 0x30D76, 0x6D, 0 },
+ // FIXME: Spelling incorrect. didnt should be didn't. Fixing changes game data and thus may cause issues
{ "didnt mean that", 0x30D76, 0x6D, 0 },
{ "apologise", 0x30D76, 0x6D, 0 },
{ "play golf", 0x313B6, 0x00, 0 },
diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index 980bda6f472..c4a33f10af3 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -499,7 +499,7 @@ bool FontPC98::loadBMPData() {
}
if (data->readUint16LE() != 1) {
- warning("font.bmp needs to be single-planed");
+ warning("font.bmp needs to be single-plane'd");
return false;
}
More information about the Scummvm-git-logs
mailing list