[Scummvm-git-logs] scummvm master -> 34523aba7ea5c89b6fa899914af75311fd9f1d7f
sev-
sev at scummvm.org
Wed Aug 4 13:43:18 UTC 2021
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:
34523aba7e JANITORIAL: Fix some typos
Commit: 34523aba7ea5c89b6fa899914af75311fd9f1d7f
https://github.com/scummvm/scummvm/commit/34523aba7ea5c89b6fa899914af75311fd9f1d7f
Author: Max Horn (max at quendi.de)
Date: 2021-08-04T15:43:15+02:00
Commit Message:
JANITORIAL: Fix some typos
Changed paths:
README.md
audio/adlib_ms.cpp
backends/platform/sdl/macosx/appmenu_osx.mm
backends/platform/sdl/macosx/macosx.cpp
backends/platform/sdl/macosx/macosx_wrapper.mm
configure
engines/ags/shared/font/fonts.cpp
engines/glk/archetype/id_table.h
diff --git a/README.md b/README.md
index bc17a395f0..980b7eaa2e 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ For the impatient among you, here is how to get ScummVM running in five simple s
To report a bug, go to the ScummVM [Issue Tracker](https://bugs.scummvm.org/) and log in with your GitHub account.
-Please make sure the bug is reproducible, and still occurs in the latest git/Daily build version. Also check the [compatibility list](https://www.scummvm.org/compatibility/) for that game, to ensure the issue is not already known. Please do not report bugs for games that are not listed as completeable on the [Supported Games](https://wiki.scummvm.org/index.php?title=Category:Supported_Games>) wiki page, or on the compatibility list. We already know those games have bugs!
+Please make sure the bug is reproducible, and still occurs in the latest git/Daily build version. Also check the [compatibility list](https://www.scummvm.org/compatibility/) for that game, to ensure the issue is not already known. Please do not report bugs for games that are not listed as completable on the [Supported Games](https://wiki.scummvm.org/index.php?title=Category:Supported_Games>) wiki page, or on the compatibility list. We already know those games have bugs!
Please include the following information in the bug report:
diff --git a/audio/adlib_ms.cpp b/audio/adlib_ms.cpp
index b6588d3c69..92ffac3402 100644
--- a/audio/adlib_ms.cpp
+++ b/audio/adlib_ms.cpp
@@ -1098,7 +1098,7 @@ uint8 MidiDriver_ADLIB_Multisource::allocateOplChannel(uint8 channel, uint8 sour
uint8 allocatedChannel = 0xFF;
if (_allocationMode == ALLOCATION_MODE_DYNAMIC) {
// In dynamic channel allocation mode, each note is allocated a new
- // OPL channel. The following criterea are used, in this order:
+ // OPL channel. The following criteria are used, in this order:
// - The channel with the lowest number that has not yet been used to
// play a note (note counter value is 0).
// - The channel with the lowest note counter value that is not
diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 914b3e5dea..48ab5479e7 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -43,8 +43,8 @@
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
typedef unsigned long NSUInteger;
-// Those are not defined in the 10.4 SDK, but they are defined when targetting
-// Mac OS X 10.4 or above in the 10.5 SDK. So hopfully that means it works with 10.4 as well.
+// Those are not defined in the 10.4 SDK, but they are defined when targeting
+// Mac OS X 10.4 or above in the 10.5 SDK. So hopefully that means it works with 10.4 as well.
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
enum {
NSUTF32StringEncoding = 0x8c000100,
@@ -84,7 +84,7 @@ static void openFromBundle(NSString *file) {
if (path) {
// RTF and HTML files are widely recognized and we can rely on the default
// file association working for those. For the other ones this might not be
- // the case so we explicitely indicate they should be open with TextEdit.
+ // the case so we explicitly indicate they should be open with TextEdit.
if ([path hasSuffix:@".html"] || [path hasSuffix:@".rtf"])
[[NSWorkspace sharedWorkspace] openFile:path];
else
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 793473c5a6..281bdbc2ec 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -91,7 +91,7 @@ void OSystem_MacOSX::init() {
void OSystem_MacOSX::initBackend() {
#ifdef USE_TRANSLATION
- // We need to initialize the translataion manager here for the following
+ // We need to initialize the translation manager here for the following
// call to replaceApplicationMenuItems() work correctly
TransMan.setLanguage(ConfMan.get("gui_language").c_str());
#endif // USE_TRANSLATION
@@ -216,7 +216,7 @@ Common::String OSystem_MacOSX::getSystemLanguage() const {
}
}
- // Falback to POSIX implementation
+ // Fallback to POSIX implementation
return OSystem_POSIX::getSystemLanguage();
#else // USE_DETECTLANG
return OSystem_POSIX::getSystemLanguage();
diff --git a/backends/platform/sdl/macosx/macosx_wrapper.mm b/backends/platform/sdl/macosx/macosx_wrapper.mm
index 0b328848b4..cf7964e209 100644
--- a/backends/platform/sdl/macosx/macosx_wrapper.mm
+++ b/backends/platform/sdl/macosx/macosx_wrapper.mm
@@ -35,8 +35,8 @@
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
typedef unsigned long NSUInteger;
-// Those are not defined in the 10.4 SDK, but they are defined when targetting
-// Mac OS X 10.4 or above in the 10.5 SDK. So hopfully that means it works with 10.4 as well.
+// Those are not defined in the 10.4 SDK, but they are defined when targeting
+// Mac OS X 10.4 or above in the 10.5 SDK. So hopefully that means it works with 10.4 as well.
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
enum {
NSUTF32StringEncoding = 0x8c000100,
@@ -53,7 +53,7 @@ bool hasTextInClipboardMacOSX() {
Common::U32String getTextFromClipboardMacOSX() {
if (!hasTextInClipboardMacOSX())
return Common::U32String();
- // Note: on OS X 10.6 and above it is recommanded to use NSPasteboardTypeString rather than NSStringPboardType.
+ // Note: on OS X 10.6 and above it is recommended to use NSPasteboardTypeString rather than NSStringPboardType.
// But since we still target older version use NSStringPboardType.
NSPasteboard *pb = [NSPasteboard generalPasteboard];
NSString *str = [pb stringForType:NSStringPboardType];
@@ -96,7 +96,7 @@ bool setTextInClipboardMacOSX(const Common::U32String &text) {
}
Common::String getDesktopPathMacOSX() {
- // The recommanded method is to use NSFileManager.
+ // The recommended method is to use NSFileManager.
// NSUrl *url = [[[NSFileManager defaultManager] URLsForDirectory:NSDesktopDirectory inDomains:NSUserDomainMask] firstObject];
// However it is only available in OS X 10.6+. So use NSSearchPathForDirectoriesInDomains instead (available since OS X 10.0)
// [NSArray firstObject] is also only available in OS X 10.6+. So we need to use [NSArray count] and [NSArray objectAtIndex:]
diff --git a/configure b/configure
index ac609d4d01..0312be044f 100755
--- a/configure
+++ b/configure
@@ -2046,7 +2046,7 @@ if test "$have_icc" = yes; then
add_line_to_config_mk 'HAVE_ICC = 1'
# Make ICC error out on unknown command line options instead of printing
- # a warning. This is for example required to make the -Wglobal-destructors
+ # a warning. This is for example required to make the -Wglobal-constructors
# detection work correctly.
append_var CXXFLAGS "-diag-error 10006,10148"
diff --git a/engines/ags/shared/font/fonts.cpp b/engines/ags/shared/font/fonts.cpp
index eec9f88bcd..56f5009f04 100644
--- a/engines/ags/shared/font/fonts.cpp
+++ b/engines/ags/shared/font/fonts.cpp
@@ -209,8 +209,8 @@ void unescape_script_string(const char *cstr, std::vector<char> &out) {
// Break up the text into lines
size_t split_lines(const char *todis, SplitLines &lines, int wii, int fonnt, size_t max_lines) {
- // NOTE: following hack accomodates for the legacy math mistake in split_lines.
- // It's hard to tell how cruicial it is for the game looks, so research may be needed.
+ // NOTE: following hack accommodates for the legacy math mistake in split_lines.
+ // It's hard to tell how crucial it is for the game looks, so research may be needed.
// TODO: IMHO this should rely not on game format, but script API level, because it
// defines necessary adjustments to game scripts. If you want to fix this, find a way to
// pass this flag here all the way from game.options[OPT_BASESCRIPTAPI] (or game format).
diff --git a/engines/glk/archetype/id_table.h b/engines/glk/archetype/id_table.h
index 4202e390d7..30f2211d5a 100644
--- a/engines/glk/archetype/id_table.h
+++ b/engines/glk/archetype/id_table.h
@@ -27,14 +27,14 @@
#include "glk/archetype/string.h"
/**
- * Contains the necessary data structures andfunctions for adding to andreferring
+ * Contains the necessary data structures and functions for adding to and referring
* to the ID table(a very busy little structure).
*
* The ID table is a 27-element hash table with one bucket for each letter; identifiers
* are hashed according to their first letter. The last bucket is for identifiers beginning with
* an underscore. The ID table is cross_indexed by an xarray containing pointers to id_records.
* The ID table is complex enough that it should probably not be accessed directly but rather
- * only through its procedures.In this way the data type, its primary instantiation, andassociated
+ * only through its procedures. In this way the data type, its primary instantiation, and associated
* code comprise one stand-alone module which must be "used" by any module wishing to modify or
* query the table.
*/
@@ -57,7 +57,7 @@ typedef IdRecType *IdRecPtr;
// Public methods
/**
- * Adds the given identifier to the ID table, andreturns its index. There are no duplications;
+ * Adds the given identifier to the ID table, and returns its index. There are no duplications;
* if the identifier already exists, its existing index is returned.
* @param id_str String containing identifier name
* @returns The index of the identifier
More information about the Scummvm-git-logs
mailing list