[Scummvm-git-logs] scummvm master -> 13807ec83d151d8b3127df163844987851fc7e76
bluegr
noreply at scummvm.org
Fri Sep 13 09:19:07 UTC 2024
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
11ecd6982e JANITORIAL: AUDIO: Fix typos
c96b045510 JANITORIAL: COMMON: Fix typos
13807ec83d JANITORIAL: DEVTOOLS: Fix typos
Commit: 11ecd6982ec4048fa91f6c0d774678c56f963c01
https://github.com/scummvm/scummvm/commit/11ecd6982ec4048fa91f6c0d774678c56f963c01
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-13T12:04:57+03:00
Commit Message:
JANITORIAL: AUDIO: Fix typos
Changed paths:
audio/decoders/flac.cpp
audio/decoders/qdm2.cpp
audio/mods/tfmx.cpp
audio/softsynth/opl/mame.cpp
diff --git a/audio/decoders/flac.cpp b/audio/decoders/flac.cpp
index c69cc7288ad..52df3d5f9cf 100644
--- a/audio/decoders/flac.cpp
+++ b/audio/decoders/flac.cpp
@@ -228,7 +228,7 @@ int FLACStream::readBuffer(int16 *buffer, const int numSamples) {
const uint numChannels = getChannels();
if (numChannels == 0) {
- warning("FLACStream: Stream not successfully initialized, cant playback");
+ warning("FLACStream: Stream not successfully initialized, can't playback");
return -1; // streaminfo wasn't read!
}
diff --git a/audio/decoders/qdm2.cpp b/audio/decoders/qdm2.cpp
index 26bdb02095e..f28d22979f9 100644
--- a/audio/decoders/qdm2.cpp
+++ b/audio/decoders/qdm2.cpp
@@ -703,7 +703,7 @@ static int allocTable(VLC *vlc, int size, int use_static) {
vlc->table_size += size;
if (vlc->table_size > vlc->table_allocated) {
if(use_static)
- error("QDM2 cant do anything, init_vlc() is used with too little memory");
+ error("QDM2 can't do anything, init_vlc() is used with too little memory");
vlc->table_allocated += (1 << vlc->bits);
temp = (int16 (*)[2])realloc(vlc->table, sizeof(int16 *) * 2 * vlc->table_allocated);
if (!temp) {
diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp
index 98877759a48..c88811c7623 100644
--- a/audio/mods/tfmx.cpp
+++ b/audio/mods/tfmx.cpp
@@ -401,7 +401,7 @@ void Tfmx::macroRun(ChannelContext &channel) {
continue;
case 0x18: { // Sampleloop. Parameters: Offset from Samplestart(W)
- // TODO: MI loads 24 bit, but thats useless?
+ // TODO: MI loads 24 bit, but that's useless?
const uint16 temp = /* ((int8)macroPtr[1] << 16) | */ READ_BE_UINT16(¯oPtr[2]);
if (macroPtr[1] || (temp & 1))
warning("Tfmx: Problematic value for sampleloop: %06X", (macroPtr[1] << 16) | temp);
@@ -985,7 +985,7 @@ const Tfmx::MdatResource *Tfmx::loadMdatFile(Common::SeekableReadStream &musicDa
resource->macroOffset[i] = musicData.readUint32BE();
// Read in mdat-file
- // TODO: we can skip everything thats already stored in the resource-structure.
+ // TODO: we can skip everything that's already stored in the resource-structure.
const int32 mdatOffset = offTrackstep ? 0x200 : 0x600; // 0x200 is very conservative
const uint32 allocSize = (uint32)mdatSize - mdatOffset;
diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index 77f7dd495fe..12111981a40 100644
--- a/audio/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
@@ -811,7 +811,7 @@ void OPLWriteReg(FM_OPL *OPL, int r, int v) {
uint block_fnum;
switch (r & 0xe0) {
- case 0x00: /* 00-1f:controll */
+ case 0x00: /* 00-1f:control */
switch (r & 0x1f) {
case 0x01:
/* wave selector enable */
@@ -1215,7 +1215,7 @@ int OPLTimerOver(FM_OPL *OPL, int c) {
OPL_STATUS_SET(OPL, 0x20);
} else { /* Timer A */
OPL_STATUS_SET(OPL, 0x40);
- /* CSM mode key,TL controll */
+ /* CSM mode key,TL control */
if (OPL->mode & 0x80) { /* CSM mode total level latch and auto key on */
int ch;
if (OPL->UpdateHandler)
Commit: c96b0455106c6540fa98e09921a6b574b50208d8
https://github.com/scummvm/scummvm/commit/c96b0455106c6540fa98e09921a6b574b50208d8
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-13T12:06:46+03:00
Commit Message:
JANITORIAL: COMMON: Fix typos
Changed paths:
common/base64.h
common/lua/lua_unpersist.cpp
diff --git a/common/base64.h b/common/base64.h
index 8b49e4c0004..d035777e9a2 100644
--- a/common/base64.h
+++ b/common/base64.h
@@ -43,7 +43,7 @@ class String;
* Validates a string to see if its a properly Base64 encoded string.
* This gets called when using the decode functions.
* @param[in] string the string to validate
- * @return true on success, false if an error occured.
+ * @return true on success, false if an error occurred.
*/
bool b64Validate(String &string);
@@ -71,7 +71,7 @@ String b64EncodeData(void *dataPtr, size_t dataSize);
/**
* Decodes a Base64 encoded string into a regular string.
* @param[in] string base64 encoded string to decode
- * @return String containing the decoded result, empty string if an error occured.
+ * @return String containing the decoded result, empty string if an error occurred.
*/
String b64DecodeString(String &string);
@@ -79,7 +79,7 @@ String b64DecodeString(String &string);
* Decodes a Base64 encoded string into a MemoryReadStream, its contents
* will be disposed when deleting the stream.
* @param[in] string base64 encoded string to decode
- * @return MemoryReadStream pointer containing the decoded result, nullptr if an error occured
+ * @return MemoryReadStream pointer containing the decoded result, nullptr if an error occurred
*/
MemoryReadStream *b64DecodeStream(String &string, uint32 outputLength);
diff --git a/common/lua/lua_unpersist.cpp b/common/lua/lua_unpersist.cpp
index 87e76d2a610..baf85276f3a 100644
--- a/common/lua/lua_unpersist.cpp
+++ b/common/lua/lua_unpersist.cpp
@@ -89,7 +89,7 @@ void unpersistLua(lua_State *luaState, Common::ReadStream *readStream) {
// Make sure there is enough room on the stack
lua_checkstack(luaState, 3);
- // Create a table to hold indexes of everything thats already been read
+ // Create a table to hold indexes of everything that's already been read
lua_newtable(luaState);
// >>>>> permTbl indexTbl
Commit: 13807ec83d151d8b3127df163844987851fc7e76
https://github.com/scummvm/scummvm/commit/13807ec83d151d8b3127df163844987851fc7e76
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-13T12:17:53+03:00
Commit Message:
JANITORIAL: DEVTOOLS: Fix typos
Changed paths:
devtools/create_achievements/gen/steam-1259140.ini
devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py
devtools/create_hugo/staticdata.h
devtools/create_kyradat/resources/eob2_amiga_english.h
devtools/create_kyradat/resources/eob2_dos_english.h
devtools/create_mm/files/mm1/strings_en.yml
devtools/create_mortdat/gametext.h
devtools/create_ultima/files/ultima6/scripts/md/actor.lua
devtools/create_ultima/files/ultima6/scripts/md/init.lua
devtools/create_ultima/files/ultima6/scripts/se/init.lua
devtools/create_ultima/files/ultima6/scripts/u6/actor.lua
devtools/tasmrecover/dreamweb/dreamweb.asm
devtools/tasmrecover/dreamweb/monitor.asm
devtools/tasmrecover/dreamweb/newplace.asm
devtools/tasmrecover/dreamweb/object.asm
devtools/tasmrecover/dreamweb/saveload.asm
devtools/tasmrecover/dreamweb/sblaster.asm
diff --git a/devtools/create_achievements/gen/steam-1259140.ini b/devtools/create_achievements/gen/steam-1259140.ini
index 21df4776ca0..1d7228ff0bd 100644
--- a/devtools/create_achievements/gen/steam-1259140.ini
+++ b/devtools/create_achievements/gen/steam-1259140.ini
@@ -121,6 +121,7 @@ item_39_title=Of blood and water.
item_39_comment=I am the Lady On The Wall.
item_40_id=ACH_ENDING_LUZIA
item_40_title=My Big Sister
+// FIXME: Typo in the original, begining should be beginning, kept for consistency
item_40_comment=Our tale is just begining.
item_41_id=ACH_ENDING_SOMBRIA
item_41_title=Another chance.
diff --git a/devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py b/devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py
index 7419d269e37..c25d690420e 100644
--- a/devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py
+++ b/devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py
@@ -312,8 +312,8 @@ class grabberFromPNG:
# self.listOfOutOfOrderGlyphs.append((u'\xf1', u'\xa5')) # spanish n (senor)
# self.listOfOutOfOrderGlyphs.append((u'\xe2', u'\xa6')) # a for (liver) pate
# self.listOfOutOfOrderGlyphs.append((u'\xe9', u'\xa7')) # e for (liver) pate
- #elif self.originalFontName == 'TAHOMA': # treat TAHOMA18 and TAHOMA24 similarily here
- if self.originalFontName == 'TAHOMA': # treat TAHOMA18 and TAHOMA24 similarily here
+ #elif self.originalFontName == 'TAHOMA': # treat TAHOMA18 and TAHOMA24 similarly here
+ if self.originalFontName == 'TAHOMA': # treat TAHOMA18 and TAHOMA24 similarly here
self.listOfOutOfOrderGlyphs.append((u'\xe9', u'\u0192')) # french e punctuated
self.listOfOutOfOrderGlyphs.append((u'\xfc', u'\u2013')) # u umlaut
if gTraceModeEnabled:
diff --git a/devtools/create_hugo/staticdata.h b/devtools/create_hugo/staticdata.h
index 6a80a9e835f..b65414ec126 100644
--- a/devtools/create_hugo/staticdata.h
+++ b/devtools/create_hugo/staticdata.h
@@ -731,6 +731,7 @@ const char *string_t_Data_1d[] = {
"From the looks of it, this\nis the kitchen. You can hear\nthe sounds of a feast or some-\nthing going on in the room to\nthe right.",
"They have a housemaid\nto do that!!",
"It probably warrants further\ninvestigation inside!",
+ // FIXME: Spelling incorrect. excercise should be exercise. Fixing changes game data and thus may cause issues
"You shinny up the tree,\nfind lots of branches\nand leaves and stuff,\nand shinny down again.\nGood excercise, huh?",
"Everything in the garden\nis as it seems!",
"You are behind the house, now,\nin what appears to be a small\nfenced in yard. To the rear\nof the garden is a little shed",
diff --git a/devtools/create_kyradat/resources/eob2_amiga_english.h b/devtools/create_kyradat/resources/eob2_amiga_english.h
index a3db76d7168..aec0e4179aa 100644
--- a/devtools/create_kyradat/resources/eob2_amiga_english.h
+++ b/devtools/create_kyradat/resources/eob2_amiga_english.h
@@ -721,6 +721,7 @@ static const char *const kEoB2SpellNamesAmigaEnglish[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_kyradat/resources/eob2_dos_english.h b/devtools/create_kyradat/resources/eob2_dos_english.h
index da06812113b..0d7958ce06b 100644
--- a/devtools/create_kyradat/resources/eob2_dos_english.h
+++ b/devtools/create_kyradat/resources/eob2_dos_english.h
@@ -721,6 +721,7 @@ static const char *const kEoB2SpellNamesDOSEnglish[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/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 315ea083701..948ce31338b 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -7,6 +7,7 @@ dialogs:
3: "--blacksmith--"
4: "--tavern--"
gold: "gold= "
+ # FIXME: Spelling incorrect. cant should be cannot. Fixing changes game data and thus may cause issues
buy: "'a'-'f' to buy\r(- = cant use)"
sell: "'a'-'f' to sell"
gather: "'g' gather gold\r'#' other char"
@@ -37,6 +38,7 @@ dialogs:
cannot_two_handed: "*** cannot with two-handed weapon ***"
have_weapon: "*** already have weapon ***"
full: "*** full ***"
+ # FIXME: Spelling incorrect. aready should be already. Fixing changes game data and thus may cause issues
have_missile: "*** aready have missile weapon ***"
wrong_alignment: "*** wrong alignment ***"
cursed: "*** cursed ***"
@@ -242,6 +244,7 @@ dialogs:
4_1: "Telgoran is in s.e. maze"
4_2: "Some items give protection"
4_3: "Dragadune holds many gems"
+ # FIXME: Spelling incorrect. judgement should be judgment. Fixing changes game data and thus may cause issues
4_4: "Donations help on judgement day"
5_1: "Agar lives behind the inn"
5_2: "Find the prisoner"
@@ -1183,6 +1186,7 @@ maps:
pit: "Jagged slime pit!"
poof: "Poof! you've been teleported..."
ranalou1: "\"I'm the wizard Ranalou. Are you here to\nuse the portals (Y/N)?\""
+ # FIXME: Spelling incorrect. judgement should be judgment. Fixing changes game data and thus may cause issues
ranalou2: "\"Good! inside this room are 6 portals,\neach of which leads to a castle. The\nstatue of judgement requires you to find\none prisoner from each of these castles\nbefore you may be found worthy.\""
ranalou3: "\"Then begone!\""
sign1: "A sign:\n\nExperiment in progress, do not enter!"
@@ -1504,6 +1508,7 @@ maps:
banner: "A banner reads:\nThe endless spiral!!!"
sign: "A sign above the door reads:\nMonster breeding grounds, keep out!"
machine: "A loud machine pulsates rhythmically."
+ # FIXME: Spelling incorrect. metalic should be metallic. Fixing changes game data and thus may cause issues
box: "A metalic box echoes:\n\"Intruder alert!\""
message1: "Scratched on the wall:\nSearch after the canine rewards you!"
message2: "Scrawled on the wall:\nFor the world is hollow and i have\ntouched the sky!"
diff --git a/devtools/create_mortdat/gametext.h b/devtools/create_mortdat/gametext.h
index 070597b95db..0286a57cd02 100644
--- a/devtools/create_mortdat/gametext.h
+++ b/devtools/create_mortdat/gametext.h
@@ -56,6 +56,7 @@ const char *gameDataEn[] = {
"The coat of arms$",
"$",
"Max, the servant, welcomes you and shows you to your room$",
+ // FIXME: Spelling incorrect. apropriate should be appropriate. Fixing changes game data and thus may cause issues
"Mortville 6/2/51@ My dear Jerome at Regarding my telegram, I must tell you the reason for my wor- at ries. A year ago, Murielle, my lady companion, disappeared. The de at part may have had something to do at with the financial success of themanor, or... A silence hard to un at derstand for my son Guy. Not ha at ving been able to see the light of day over this affair, I count @on you to sort things out. If my state of health doesn't improve, @take the decisions that you feel @are apropriate.@ Kind regards, Julia DEFRANCK$",
"Later, Guy will inform you of Leo's suicide after a at heavy bet at the races$",
"F3: AGAIN F8: STOP$",
diff --git a/devtools/create_ultima/files/ultima6/scripts/md/actor.lua b/devtools/create_ultima/files/ultima6/scripts/md/actor.lua
index afd1a44a559..2d3e442ab9c 100644
--- a/devtools/create_ultima/files/ultima6/scripts/md/actor.lua
+++ b/devtools/create_ultima/files/ultima6/scripts/md/actor.lua
@@ -937,7 +937,7 @@ function actor_update_all()
perform_worktype(selected_actor)
party_update()
if selected_actor.wt > 1 and selected_actor.wt < 0x1b then
- --FIXME targetting?? do *(&bjlist_unk_19f1_ptr + actor_num) = actor_num
+ --FIXME targeting?? do *(&bjlist_unk_19f1_ptr + actor_num) = actor_num
end
end
diff --git a/devtools/create_ultima/files/ultima6/scripts/md/init.lua b/devtools/create_ultima/files/ultima6/scripts/md/init.lua
index 82a3d5a2aa4..364626d1e7e 100644
--- a/devtools/create_ultima/files/ultima6/scripts/md/init.lua
+++ b/devtools/create_ultima/files/ultima6/scripts/md/init.lua
@@ -272,7 +272,7 @@ local g_readiable_objs_tbl = {
[531] = 2, --duster
[532] = 2, --wool overcoat
[533] = 2, --sheepskin jacket
-[534] = 2, --artic parka
+[534] = 2, --arctic parka
[608] = 2, --electric belt
-- 3 = shield hand
[630] = 3, --torch
diff --git a/devtools/create_ultima/files/ultima6/scripts/se/init.lua b/devtools/create_ultima/files/ultima6/scripts/se/init.lua
index 4cf67b7dbaf..4b86dcca180 100644
--- a/devtools/create_ultima/files/ultima6/scripts/se/init.lua
+++ b/devtools/create_ultima/files/ultima6/scripts/se/init.lua
@@ -133,7 +133,7 @@ local g_readiable_objs_tbl = {
[526] = 3, --stegosaurus shield
[606] = 3, --kotl shield
-- 7 = feet
--- 4 = two handed - FIXME: guns (561, 571, 572) can't be equiped by natives
+-- 4 = two handed - FIXME: guns (561, 571, 572) can't be equipped by natives
[552] = 4, --bow
[553] = 4, --blowgun
[553] = 4, --two handed hammer
diff --git a/devtools/create_ultima/files/ultima6/scripts/u6/actor.lua b/devtools/create_ultima/files/ultima6/scripts/u6/actor.lua
index 08d9823737f..741641e395c 100644
--- a/devtools/create_ultima/files/ultima6/scripts/u6/actor.lua
+++ b/devtools/create_ultima/files/ultima6/scripts/u6/actor.lua
@@ -1936,7 +1936,7 @@ function actor_update_all()
perform_worktype(selected_actor)
--sub_1C34A() --update map window??
if selected_actor.wt > 1 and selected_actor.wt < 0x10 then
- --FIXME targetting?? do *(&objlist_ptr_unk_18f1 + actor_num) = actor_num
+ --FIXME targeting?? do *(&objlist_ptr_unk_18f1 + actor_num) = actor_num
end
end
diff --git a/devtools/tasmrecover/dreamweb/dreamweb.asm b/devtools/tasmrecover/dreamweb/dreamweb.asm
index 0ffcda9e2ad..a982134ed83 100644
--- a/devtools/tasmrecover/dreamweb/dreamweb.asm
+++ b/devtools/tasmrecover/dreamweb/dreamweb.asm
@@ -5840,7 +5840,7 @@ Resetkeyboard proc near
cmp oldint9add,-1
jz noreset
- mov dx,oldint9add ;Restore old interupt vector
+ mov dx,oldint9add ;Restore old interrupt vector
mov ax,oldint9seg ;for keys
mov ds,ax
mov ah,25h
diff --git a/devtools/tasmrecover/dreamweb/monitor.asm b/devtools/tasmrecover/dreamweb/monitor.asm
index 9cee3b58447..210b69e431d 100644
--- a/devtools/tasmrecover/dreamweb/monitor.asm
+++ b/devtools/tasmrecover/dreamweb/monitor.asm
@@ -173,7 +173,7 @@ foundpersonal: call openfile
Loadnews proc near ;textfile2 holds information
- ;accessable by anyone
+ ;accessible by anyone
mov al,newsitem
mov dx,offset cs:monitorfile10
cmp al,0
diff --git a/devtools/tasmrecover/dreamweb/newplace.asm b/devtools/tasmrecover/dreamweb/newplace.asm
index 924d292a197..4a9095c3f28 100644
--- a/devtools/tasmrecover/dreamweb/newplace.asm
+++ b/devtools/tasmrecover/dreamweb/newplace.asm
@@ -485,7 +485,7 @@ Getlocation proc near
endp
-Setlocation proc near ;makes a location accessable
+Setlocation proc near ;makes a location accessible
mov ah,0
mov bx,ax
@@ -500,7 +500,7 @@ Setlocation proc near ;makes a location accessable
-Resetlocation proc near ;makes a location inaccessable
+Resetlocation proc near ;makes a location inaccessible
push ax
cmp al,5
diff --git a/devtools/tasmrecover/dreamweb/object.asm b/devtools/tasmrecover/dreamweb/object.asm
index bd291c17a48..45cf290391f 100644
--- a/devtools/tasmrecover/dreamweb/object.asm
+++ b/devtools/tasmrecover/dreamweb/object.asm
@@ -1329,7 +1329,7 @@ doplace: call delpointer
Deletetaken proc near ;gets rid of objects that were
- ;transfered to exlist ages ago
+ ;transferred to exlist ages ago
mov es,freedat
mov ah,reallocation
mov ds,extras
diff --git a/devtools/tasmrecover/dreamweb/saveload.asm b/devtools/tasmrecover/dreamweb/saveload.asm
index e4838bd8b6b..41f723920d8 100644
--- a/devtools/tasmrecover/dreamweb/saveload.asm
+++ b/devtools/tasmrecover/dreamweb/saveload.asm
@@ -1035,7 +1035,7 @@ gameerror5: db 13,10,13,10
db 24h
gameerror6: db 13,10,13,10
db "Dreamweb has an Error:",13,10
- db "Sound Blaster not found on interupt "
+ db "Sound Blaster not found on interrupt "
error6patch: db "0"
db 13,10,13,10
db 24h
diff --git a/devtools/tasmrecover/dreamweb/sblaster.asm b/devtools/tasmrecover/dreamweb/sblaster.asm
index 96966b0ad77..df1a1e7b3ac 100644
--- a/devtools/tasmrecover/dreamweb/sblaster.asm
+++ b/devtools/tasmrecover/dreamweb/sblaster.asm
@@ -10,8 +10,8 @@
;These drivers are not stand alone. We had them as an integral part of the
;game.
;
-;Put interupt no. into SOUNDINT, base address (eg 220h) into SOUNDBASEADD.
-;If interupt is 255 then no card is assumed.
+;Put interrupt no. into SOUNDINT, base address (eg 220h) into SOUNDBASEADD.
+;If interrupt is 255 then no card is assumed.
;
;Call soundstartup at beginning of program to test card and initialise.
;
@@ -481,7 +481,7 @@ Checksoundint proc near
mov dx,oldsoundintseg
mov ds,dx
- mov dx,oldsoundintadd ;Restore old interupt vector
+ mov dx,oldsoundintadd ;Restore old interrupt vector
mov ah,25h
mov al,soundint
add al,8
@@ -489,7 +489,7 @@ Checksoundint proc near
cmp testresult,1
jz interuptworked
- mov gameerror,6 ;interupt wrong
+ mov gameerror,6 ;interrupt wrong
jmp quickquit ;exit to DOS with error
interuptworked: ret
@@ -562,7 +562,7 @@ Soundend proc near
call disablesoundint
mov ds,oldsoundintseg ;for keys
- mov dx,oldsoundintadd ;Restore old interupt vector
+ mov dx,oldsoundintadd ;Restore old interrupt vector
mov ah,25h
mov al,soundint
add al,8
More information about the Scummvm-git-logs
mailing list