From f9170ebbe43f53b39f358bdda8c4a63e51bdcb28 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:11:08 +0100 Subject: [PATCH 01/22] JANITORIAL: Fix availiable typo in p12explore.py --- engines/petka/p12explore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/petka/p12explore.py b/engines/petka/p12explore.py index fda5cf16..e089cd2e 100755 --- a/engines/petka/p12explore.py +++ b/engines/petka/p12explore.py @@ -632,7 +632,7 @@ def path_res_open(self, pref, res_id, mode): format(flc.width, flc.height, \ flc.frame_num, flc.delay)) else: - self.add_info("No information availiable") + self.add_info("No information available") except: self.add_info("Error loading {} - \"{}\" \n\n{}".\ format(res_id, hlesc(fn), hlesc(traceback.format_exc()))) From 3d0b43bf3dcc28e9307f840606a708e274b03e23 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:12:57 +0100 Subject: [PATCH 02/22] JANITORIAL: Fix compability typo in scummsys.h --- common/scummsys.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/scummsys.h b/common/scummsys.h index dcf7c8c6..f951996d 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -196,7 +196,7 @@ // This is done for two reasons // a) uint is already defined by Symbians libc component // b) Symbian is using its "own" datatyping, and the Scummvm port - // should follow this to ensure the best compability possible. + // should follow this to ensure the best compatibility possible. #define SCUMMVM_DONT_DEFINE_TYPES typedef unsigned char byte; From 00686e875d499f80f818518f34f54a21e1940e60 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:14:12 +0100 Subject: [PATCH 03/22] JANITORIAL: Fix continous typo in main.cpp --- gui/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/main.cpp b/gui/main.cpp index 446c4f19..8508ebec 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -378,7 +378,7 @@ void ScummToolsFrame::onIdle(wxIdleEvent &evt) { if (_pages.back()->onIdle(dynamic_cast(_wizardpane->FindWindow(wxT("Wizard Page"))))) { // We want more! evt.RequestMore(true); - // This way we don't freeze the OS with continous events + // This way we don't freeze the OS with continuous events wxMilliSleep(10); } } From 361ba4249bd82067b20cf0931aeb169ac2e953f7 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:15:21 +0100 Subject: [PATCH 04/22] JANITORIAL: Fix convertion typo in convert_dxa.bat --- convert_dxa.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/convert_dxa.bat b/convert_dxa.bat index 57d2c1b2..f5ee0864 100755 --- a/convert_dxa.bat +++ b/convert_dxa.bat @@ -35,7 +35,7 @@ goto :eof :check_bink if exist "%BINK_PATH%\binkconv.exe" goto :preencode echo. -echo Bink convertion tool cannot be found! +echo Bink conversion tool cannot be found! goto :eof :preencode From 0a9a84b9cf54c66b6e0b1f26930299e339193980 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:16:20 +0100 Subject: [PATCH 05/22] JANITORIAL: Fix excercise typo in util.h --- engines/sci/attic/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/sci/attic/util.h b/engines/sci/attic/util.h index fc2c7f2e..fff521cf 100644 --- a/engines/sci/attic/util.h +++ b/engines/sci/attic/util.h @@ -24,7 +24,7 @@ #include "common/scummsys.h" -/* An excercise in bloated macro writing ;-)*/ +/* An exercise in bloated macro writing ;-)*/ /*Declare a flexarray type*/ #define FLEXARRAY(type, extra) struct{\ From ad9944d5b48a102f8c561b99608f45dcc49f97cb Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:17:12 +0100 Subject: [PATCH 06/22] JANITORIAL: Fix extremly typo in descumm.h --- engines/scumm/descumm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/scumm/descumm.h b/engines/scumm/descumm.h index 5412c5c2..22de3fd1 100644 --- a/engines/scumm/descumm.h +++ b/engines/scumm/descumm.h @@ -31,7 +31,7 @@ typedef unsigned int uint; /** - * Extremly simple fixed size stack class. + * Extremely simple fixed size stack class. */ template class FixedStack { From cee33e890bde1def922d74c16cfe452a73035cdb Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:19:04 +0100 Subject: [PATCH 07/22] JANITORIAL: Fix inbetween typo in compress_sci.cpp --- engines/sci/compress_sci.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/sci/compress_sci.cpp b/engines/sci/compress_sci.cpp index 684b673b..c11d9503 100644 --- a/engines/sci/compress_sci.cpp +++ b/engines/sci/compress_sci.cpp @@ -98,7 +98,7 @@ SciResourceDataType CompressSci::detectData(byte *header, bool compressMode) { if (memcmp(buffer, "\x8d\x0bSOL\x00", 6) == 0) { // SOL files begin with // 0x8D 0x0B/0x0C "SOL" 0x00 [samplerate:WORD] [flags:BYTE] [size of following data after header:DWORD] - // 0x0C variant have an additional byte inbetween data and [size of] + // 0x0C variant have an additional byte in between data and [size of] _input.read_throwsOnError(&buffer[6], 7); dataSize = READ_LE_UINT32(buffer + 9); _inputEndOffset = _inputOffset + 13 + dataSize; From 111f0c3bf3f74590a212ba18488f0adfa66c8497 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:19:47 +0100 Subject: [PATCH 08/22] JANITORIAL: Fix infomation typo in pack_prince.cpp --- engines/prince/pack_prince.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/prince/pack_prince.cpp b/engines/prince/pack_prince.cpp index 83d393de..eaffb3cd 100644 --- a/engines/prince/pack_prince.cpp +++ b/engines/prince/pack_prince.cpp @@ -57,7 +57,7 @@ void PackPrince::execute() { _fFiles.print("credits_translate.dat\n"); - // Export files infomation + // Export files information int posOfFilesInformation = _fFiles.pos(); FileEntry filesInfo[5]; int fileNr = 0; From cbef731c7ce7644f78ce979075a1c1040110a290 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:23:53 +0100 Subject: [PATCH 09/22] JANITORIAL: Fix lenght typos in ResidualVM-Patch.txt --- engines/grim/docs/ResidualVM-Patch.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/grim/docs/ResidualVM-Patch.txt b/engines/grim/docs/ResidualVM-Patch.txt index 8ee0d3be..9399d3ec 100644 --- a/engines/grim/docs/ResidualVM-Patch.txt +++ b/engines/grim/docs/ResidualVM-Patch.txt @@ -59,8 +59,8 @@ Offset Size Var 6 2 VersionMinor <= 0 8 4 flags 12 16 md5sum of old file -28 4 lenght of old file -32 4 lenght of new file +28 4 length of old file +32 4 length of new file 36 4 length of gzipped ctrl block (x) 40 4 length of gzipped diff block (y) 44 4 length of gzipped extra block (z) (if zero the extra block is missing or mixed with diff block) From 432a77c64b55e4cb838487a357bea26675293501 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:29:05 +0100 Subject: [PATCH 10/22] JANITORIAL: Fix managment typo in str.h --- common/str.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/str.h b/common/str.h index b0de146d..76736e55 100644 --- a/common/str.h +++ b/common/str.h @@ -34,7 +34,7 @@ namespace Common { /** - * Simple string class for ScummVM. Provides automatic storage managment, + * Simple string class for ScummVM. Provides automatic storage management, * and overloads several operators in a 'natural' fashion, mimicking * the std::string class. Even provides simple iterators. * From fc0dfb03e58e960c9484b147ac9891f0504208f1 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:30:12 +0100 Subject: [PATCH 11/22] JANITORIAL: Fix proces typo in version.cpp --- version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cpp b/version.cpp index fafcb123..6dc88635 100644 --- a/version.cpp +++ b/version.cpp @@ -48,7 +48,7 @@ * header file, analog to internal_version.h, maybe called svn_rev.h or so.) * * Drawback: This only works on systems which can run suitable scripts as part - * of the build proces (so I guess Visual C++ would be out of the game here? + * of the build process (so I guess Visual C++ would be out of the game here? * I don't know VC enough to be sure). And of course it must be robust enough * to properly work in exports (i.e. release tar balls etc.). */ From fafaa4d514f67a9fa534f7b8a75a31b3be29ad48 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:32:12 +0100 Subject: [PATCH 12/22] JANITORIAL: Fix refered typo in scummvm-tools.nsi --- dists/win32/scummvm-tools.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dists/win32/scummvm-tools.nsi b/dists/win32/scummvm-tools.nsi index d7e5cb00..f87807e5 100644 --- a/dists/win32/scummvm-tools.nsi +++ b/dists/win32/scummvm-tools.nsi @@ -64,7 +64,7 @@ Name "ScummVM Tools" !define COMPANY "ScummVM Team" !define URL "https://www.scummvm.org/" !define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!" -!define COPYRIGHT "Copyright © 2001-2023 The ScummVM Team" +!define COPYRIGHT "Copyright © 2001-2023 The ScummVM Team" ######################################################################################### # Installer configuration @@ -72,7 +72,7 @@ Name "ScummVM Tools" OutFile ${build_dir}\scummvm-tools-${VERSION}-${ARCH}.exe InstallDir $PROGRAMFILES\ScummVM\tools ; Default installation folder InstallDirRegKey HKCU "Software\ScummVM\ScummVM Tools" "InstallPath" ; Get installation folder from registry if available - ; The application name needs to be refered directly instead of through ${REGKEY} + ; The application name needs to be referred directly instead of through ${REGKEY} ; because lang strings aren't initialized at the point InstallDirRegKey is called CRCCheck on From 5eb014446dddfa551d7fcafdf14bc0f7058118bf Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:32:39 +0100 Subject: [PATCH 13/22] JANITORIAL: Fix refered typo in scummvm-tools.nsi.in --- dists/win32/scummvm-tools.nsi.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dists/win32/scummvm-tools.nsi.in b/dists/win32/scummvm-tools.nsi.in index aee684c9..1c251743 100644 --- a/dists/win32/scummvm-tools.nsi.in +++ b/dists/win32/scummvm-tools.nsi.in @@ -64,7 +64,7 @@ Name "ScummVM Tools" !define COMPANY "ScummVM Team" !define URL "https://www.scummvm.org/" !define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!" -!define COPYRIGHT "Copyright © 2001-2023 The ScummVM Team" +!define COPYRIGHT "Copyright © 2001-2023 The ScummVM Team" ######################################################################################### # Installer configuration @@ -72,7 +72,7 @@ Name "ScummVM Tools" OutFile ${build_dir}\scummvm-tools-${VERSION}-${ARCH}.exe InstallDir $PROGRAMFILES\ScummVM\tools ; Default installation folder InstallDirRegKey HKCU "Software\ScummVM\ScummVM Tools" "InstallPath" ; Get installation folder from registry if available - ; The application name needs to be refered directly instead of through ${REGKEY} + ; The application name needs to be referred directly instead of through ${REGKEY} ; because lang strings aren't initialized at the point InstallDirRegKey is called CRCCheck on From d5344fca2a647553cb65e1aab6455257acad4a4a Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:34:09 +0100 Subject: [PATCH 14/22] JANITORIAL: Fix refered typo in p12explore.py --- engines/petka/p12explore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/petka/p12explore.py b/engines/petka/p12explore.py index e089cd2e..99207f10 100755 --- a/engines/petka/p12explore.py +++ b/engines/petka/p12explore.py @@ -837,7 +837,7 @@ def path_objs_scenes(self, path): # references / backreferences if isobj: # search where object used - self.add_info("\nRefered by scenes:\n") + self.add_info("\nReferred by scenes:\n") for scn in self.sim.scenes: for ref in scn.refs: if ref[0].idx == rec.idx: From 96836167740f4b5c62058a20954013ecbc994f90 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:35:21 +0100 Subject: [PATCH 15/22] JANITORIAL: Fix refered typo in engine.py --- engines/petka/petka/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/petka/petka/engine.py b/engines/petka/petka/engine.py index 18d524af..d852fc89 100644 --- a/engines/petka/petka/engine.py +++ b/engines/petka/petka/engine.py @@ -588,7 +588,7 @@ def load_dialogs(self, fixname = None, lodname = None, noobjref = False): act.num_dlgs = num_dlgs if not noobjref: if ref not in self.obj_idx: - raise EngineError("Dialog group 0x{:x} refered "\ + raise EngineError("Dialog group 0x{:x} referred "\ "to unexisted object 0x{:x}".format( grp.idx, ref)) act.obj = self.obj_idx[act.ref] From 7b476c2a495c9be9e39185a41a604233e6458f33 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:36:14 +0100 Subject: [PATCH 16/22] JANITORIAL: Fix refering typo in ptr.h --- common/ptr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/ptr.h b/common/ptr.h index 9193b9b1..fa3b741e 100644 --- a/common/ptr.h +++ b/common/ptr.h @@ -264,7 +264,7 @@ class SharedPtr : public SafeBool > { } /** - * Checks if the object is the only object refering + * Checks if the object is the only object referring * to the assigned pointer. This should just be used for * debugging purposes. */ From b98714d4f4469584854ff404cbe55bb9845728cc Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:37:13 +0100 Subject: [PATCH 17/22] JANITORIAL: Fix seeked typo in stream.cpp --- common/stream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/stream.cpp b/common/stream.cpp index aae006b3..d3d0863e 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -423,7 +423,7 @@ bool BufferedSeekableReadStream::seek(int64 offset, int whence) { if (whence == SEEK_CUR) offset -= (_bufSize - _pos); // We invalidate the buffer here. This assures that successive seeks - // do not have the chance to incorrectly think they seeked back into + // do not have the chance to incorrectly think they seek'd back into // the buffer. // Note: This does not take full advantage of the buffer. But it is // a simple way to prevent nasty errors. It would be possible to take From 04e861e5311ffe9e8c9556ab36e4571ff32be4cd Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:37:57 +0100 Subject: [PATCH 18/22] JANITORIAL: Fix seperating typo in main.h --- gui/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/main.h b/gui/main.h index 175c877f..01a9f8db 100644 --- a/gui/main.h +++ b/gui/main.h @@ -221,7 +221,7 @@ class WizardButtons : public wxPanel { wxButton *_prefs; /** 'Cancel' button. */ wxButton *_cancel; - /** The static text on the line seperating the page area and the buttons. */ + /** The static text on the line separating the page area and the buttons. */ wxStaticText *_linetext; /** Current page, required for dumping events to it. */ WizardPage *_currentPage; From 35ca09b34216a71b5a092f0ee1b982f75999f285 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:38:54 +0100 Subject: [PATCH 19/22] JANITORIAL: Fix substract typo in create_sjisfnt.cpp --- create_sjisfnt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create_sjisfnt.cpp b/create_sjisfnt.cpp index 61ebdc4f..328a7df8 100644 --- a/create_sjisfnt.cpp +++ b/create_sjisfnt.cpp @@ -557,7 +557,7 @@ void Glyph::convertChar16x16(uint8 *dst) const { } void fixYOffset(GlyphList &glyphs) { - // We try to find the minimum y offset here so we can substract it to make it 0 in the end. + // We try to find the minimum y offset here so we can subtract it to make it 0 in the end. // We need to do this, since otherwise the characters will take up too much vertical space. int minYOffset = 0xFFFF; From a239014452910069ac5ec8d5f191c9c8f51aa28c Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:39:57 +0100 Subject: [PATCH 20/22] JANITORIAL: Fix unfortunatly typo in descumm6.cpp --- engines/scumm/descumm6.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/scumm/descumm6.cpp b/engines/scumm/descumm6.cpp index e7fdf698..bb22dad7 100644 --- a/engines/scumm/descumm6.cpp +++ b/engines/scumm/descumm6.cpp @@ -52,7 +52,7 @@ jump if false AFTER: -Unfortunatly, in reality it is somewhat more complicated. E.g. in script 55, +Unfortunately, in reality it is somewhat more complicated. E.g. in script 55, in some cases the "jump AFTER" instead jumps into the middle of some other case. Maybe they did have some sort of code optimized after all? From 5799b909c223a336996de1277a30dbd180d7c8ff Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:41:16 +0100 Subject: [PATCH 21/22] JANITORIAL: Fix unkown typos in qtvr.hexpat --- engines/director/patterns/qtvr.hexpat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/director/patterns/qtvr.hexpat b/engines/director/patterns/qtvr.hexpat index b5ecd587..e725abbd 100644 --- a/engines/director/patterns/qtvr.hexpat +++ b/engines/director/patterns/qtvr.hexpat @@ -161,7 +161,7 @@ struct UnknownAtomSelector { Atom atom_header [[hidden]]; $ = addressof(this); UnknownAtom unknown [[name(atom_header.box_type)]]; - std::print("unkown: " + atom_header.box_type); + std::print("unknown: " + atom_header.box_type); } [[inline]]; struct UnknownAtom : Atom { @@ -184,7 +184,7 @@ struct UnknownAtom : Atom { } else { $ = next_offset; } - std::print("unkown atom: {}: {}", box_type, $); + std::print("unknown atom: {}: {}", box_type, $); } [[format("format_box_type")]]; fn format_box_type(auto box) { From d10cd253c226fc4dd2762907eb9456af65733595 Mon Sep 17 00:00:00 2001 From: Hubert Maier Date: Sun, 2 Mar 2025 11:42:04 +0100 Subject: [PATCH 22/22] JANITORIAL: Fix thats typo in compress_sci.cpp --- engines/sci/compress_sci.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/sci/compress_sci.cpp b/engines/sci/compress_sci.cpp index c11d9503..8c340248 100644 --- a/engines/sci/compress_sci.cpp +++ b/engines/sci/compress_sci.cpp @@ -72,7 +72,7 @@ SciResourceDataType CompressSci::detectData(byte *header, bool compressMode) { } byte buffer[20]; memcpy(&buffer, header, 6); - // Fixup for pharkas resource.sfx, several WAVE files contain a size thats not right (-1 byte) + // Fixup for pharkas resource.sfx, several WAVE files contain a size that's not right (-1 byte) int offset = 0; if (memcmp(buffer + 1, "RIFF", 4) == 0) { offset = 5;