Skip to content

JANITORIAL: Fix a bunch of typos #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f9170eb
JANITORIAL: Fix availiable typo in p12explore.py
raziel- Mar 2, 2025
3d0b43b
JANITORIAL: Fix compability typo in scummsys.h
raziel- Mar 2, 2025
00686e8
JANITORIAL: Fix continous typo in main.cpp
raziel- Mar 2, 2025
361ba42
JANITORIAL: Fix convertion typo in convert_dxa.bat
raziel- Mar 2, 2025
0a9a84b
JANITORIAL: Fix excercise typo in util.h
raziel- Mar 2, 2025
ad9944d
JANITORIAL: Fix extremly typo in descumm.h
raziel- Mar 2, 2025
cee33e8
JANITORIAL: Fix inbetween typo in compress_sci.cpp
raziel- Mar 2, 2025
111f0c3
JANITORIAL: Fix infomation typo in pack_prince.cpp
raziel- Mar 2, 2025
cbef731
JANITORIAL: Fix lenght typos in ResidualVM-Patch.txt
raziel- Mar 2, 2025
432a77c
JANITORIAL: Fix managment typo in str.h
raziel- Mar 2, 2025
fc0dfb0
JANITORIAL: Fix proces typo in version.cpp
raziel- Mar 2, 2025
fafaa4d
JANITORIAL: Fix refered typo in scummvm-tools.nsi
raziel- Mar 2, 2025
5eb0144
JANITORIAL: Fix refered typo in scummvm-tools.nsi.in
raziel- Mar 2, 2025
d5344fc
JANITORIAL: Fix refered typo in p12explore.py
raziel- Mar 2, 2025
9683616
JANITORIAL: Fix refered typo in engine.py
raziel- Mar 2, 2025
7b476c2
JANITORIAL: Fix refering typo in ptr.h
raziel- Mar 2, 2025
b98714d
JANITORIAL: Fix seeked typo in stream.cpp
raziel- Mar 2, 2025
04e861e
JANITORIAL: Fix seperating typo in main.h
raziel- Mar 2, 2025
35ca09b
JANITORIAL: Fix substract typo in create_sjisfnt.cpp
raziel- Mar 2, 2025
a239014
JANITORIAL: Fix unfortunatly typo in descumm6.cpp
raziel- Mar 2, 2025
5799b90
JANITORIAL: Fix unkown typos in qtvr.hexpat
raziel- Mar 2, 2025
d10cd25
JANITORIAL: Fix thats typo in compress_sci.cpp
raziel- Mar 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/ptr.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class SharedPtr : public SafeBool<SharedPtr<T> > {
}

/**
* 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.
*/
Expand Down
2 changes: 1 addition & 1 deletion common/scummsys.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion common/str.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion common/stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion convert_dxa.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion create_sjisfnt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions dists/win32/scummvm-tools.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ 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
#########################################################################################
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
Expand Down
4 changes: 2 additions & 2 deletions dists/win32/scummvm-tools.nsi.in
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ 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
#########################################################################################
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
Expand Down
4 changes: 2 additions & 2 deletions engines/director/patterns/qtvr.hexpat
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions engines/grim/docs/ResidualVM-Patch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions engines/petka/p12explore.py
Original file line number Diff line number Diff line change
Expand Up @@ -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())))
Expand Down Expand Up @@ -837,7 +837,7 @@ def path_objs_scenes(self, path):
# references / backreferences
if isobj:
# search where object used
self.add_info("\n<b>Refered by scenes</b>:\n")
self.add_info("\n<b>Referred by scenes</b>:\n")
for scn in self.sim.scenes:
for ref in scn.refs:
if ref[0].idx == rec.idx:
Expand Down
2 changes: 1 addition & 1 deletion engines/petka/petka/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion engines/prince/pack_prince.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion engines/sci/attic/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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{\
Expand Down
4 changes: 2 additions & 2 deletions engines/sci/compress_sci.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion engines/scumm/descumm.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
typedef unsigned int uint;

/**
* Extremly simple fixed size stack class.
* Extremely simple fixed size stack class.
*/
template <class T, int MAX_SIZE = 10>
class FixedStack {
Expand Down
2 changes: 1 addition & 1 deletion engines/scumm/descumm6.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
2 changes: 1 addition & 1 deletion gui/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ void ScummToolsFrame::onIdle(wxIdleEvent &evt) {
if (_pages.back()->onIdle(dynamic_cast<wxPanel *>(_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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion gui/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.).
*/
Expand Down