[Scummvm-git-logs] scummvm master -> c1d8af18f175886281bc8f2f330179be87fe811b

bluegr noreply at scummvm.org
Mon Sep 16 21:40:23 UTC 2024 

This automated email contains information about 10 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
35dd3cba4b JANITORIAL: DISTS: Fix typos
563860ed6d JANITORIAL: TEENAGENT: Fix typos
97c8a13536 JANITORIAL: TESTBED: Fix typos
9040364cfb JANITORIAL: TETRAEDGE: Fix typos
cd291a35ea JANITORIAL: TINSEL: Fix typos
77722844c5 JANITORIAL: TITANIC: Fix typos
dc4315e1a5 JANITORIAL: TOON: Fix typos
49ea85a081 JANITORIAL: TSAGE: Fix typos
1260bbfffe JANITORIAL: TWINE: Fix typos
c1d8af18f1 JANITORIAL: TWP: Fix typos


Commit: 35dd3cba4b3978c3fd34c6c3b901a0f624b1c056
    https://github.com/scummvm/scummvm/commit/35dd3cba4b3978c3fd34c6c3b901a0f624b1c056
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:47+03:00

Commit Message:
JANITORIAL: DISTS: Fix typos

Changed paths:
    dists/debian/changelog
    dists/emscripten/assets/scummvm_fs.js
    dists/gcw0/opk_make.sh
    dists/maemo/scummvm.servicewrapper
    dists/opendingux/make-opk.sh
    dists/openpandora/pnd_make.sh
    dists/samsungtv/README-SamsungTV
    dists/wii/READMII


diff --git a/dists/debian/changelog b/dists/debian/changelog
index 0459da9f075..5cddd05d0d7 100644
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -300,7 +300,7 @@ scummvm (0.13.0-1) unstable; urgency=low
   * New upstream release (Closes: #499849)
   * Move maintainer to Debian Games Team, add myself and David as
     uploaders
-  * Fix link to compability matrix in package description
+  * Fix link to compatibility matrix in package description
     (Closes: #508894)
 
  -- Moritz Muehlenhoff <jmm at debian.org>  Sat, 07 Mar 2009 01:18:12 +0100
@@ -404,7 +404,7 @@ scummvm (0.7.1-2) unstable; urgency=low
       - Compile the package with GCC 3.4.
 
   * debian/prepare (new):
-      - Added a script that prepares the debian/ tree for building developement
+      - Added a script that prepares the debian/ tree for building development
         snapshots of ScummVM.
 
   * debian/control:
@@ -498,7 +498,7 @@ scummvm (0.6.0-2) unstable; urgency=low
         I really wish this would be fixed in the upstream sources.
 
   * debian/control:
-      - Correct the compability chart link in the package description.
+      - Correct the compatibility chart link in the package description.
       - Update package description so it is clear that Flight of The Amazon
         Queen and Beneath a Steel Sky is available in Debian, closes: #245356.
 
@@ -596,7 +596,7 @@ scummvm (0.4.1-1) unstable; urgency=low
   * Added debian/patches/00buildopts, which makes it possible
     for environment variables to override the compiler flags.
   * Better handling of $DEB_BUILD_OPTIONS.
-  * Declare the debhelper compability level in debian/compat instead
+  * Declare the debhelper compatibility level in debian/compat instead
     of debian/rules.
 
  -- Tore Anderson <tore at linpro.no>  Thu, 29 May 2003 15:15:55 +0200
diff --git a/dists/emscripten/assets/scummvm_fs.js b/dists/emscripten/assets/scummvm_fs.js
index fc184cedb99..7539cb2f447 100644
--- a/dists/emscripten/assets/scummvm_fs.js
+++ b/dists/emscripten/assets/scummvm_fs.js
@@ -208,7 +208,7 @@ export class ScummvmFS {
                         // the UTF16 characters into 2 bytes and prepend the stripped BOM again,  but it turned out that there were other 
                         // issues how browsers handle UTF16 (e.g. 0xDFC3, 0xDFAD, 0xDFFB, 0xDF5B all somehow getting converted to 0xFFFD 
                         // - i.e. "REPLACEMENT CHARACTER") so this now just reruns shifts the start of the download. 
-                        // That's wasting some data, but it's a rare enough occurance
+                        // That's wasting some data, but it's a rare enough occurrence
                         //
                         // TODO: The only proper fix for this is to implement a asynchronous filesystem for emscripten. Something which currently
                         // isn't possible
@@ -493,4 +493,4 @@ function Uint8Array2hex(byteArray) {
     return Array.prototype.map.call(byteArray, function (byte) {
         return ('0' + (byte & 0xFF).toString(16)).slice(-2).toUpperCase();
     }).join(' ');
-}
\ No newline at end of file
+}
diff --git a/dists/gcw0/opk_make.sh b/dists/gcw0/opk_make.sh
index b1bfd03efb3..bbe603e2baa 100755
--- a/dists/gcw0/opk_make.sh
+++ b/dists/gcw0/opk_make.sh
@@ -3,7 +3,7 @@
 # opk_make.sh
 #
 # This script is meant to ease generation of a opk file. Please consult the output
-# when running --help for a list of available parameters and an explaination of
+# when running --help for a list of available parameters and an explanation of
 # those.
 #
 # Required tools when running the script:
diff --git a/dists/maemo/scummvm.servicewrapper b/dists/maemo/scummvm.servicewrapper
index 733f6db6f31..5dac9c9c82f 100644
--- a/dists/maemo/scummvm.servicewrapper
+++ b/dists/maemo/scummvm.servicewrapper
@@ -5,7 +5,7 @@ BASENAME=`basename $0`
 export SDL_VIDEO_X11_WMCLASS=${BASENAME}
 export SCUMMVM_MAEMO_DEVICE=$(awk '/^product/ { print $2;}' /proc/component_version)
 # no exec, we are really not a d-bus service
-# we need to run scummvm with diferent pid so hildon-desktop will kill the wrapper, not scummvm
+# we need to run scummvm with a different pid so hildon-desktop will kill the wrapper, not scummvm
 [ -x ${0}.bin ] && ${0}.bin "$@"
 # optified binary
 [ -x /opt/scummvm/bin/scummvm ] && /opt/scummvm/bin/scummvm "$@"
diff --git a/dists/opendingux/make-opk.sh b/dists/opendingux/make-opk.sh
index 35ad0e1e1d3..c07bf5765fa 100755
--- a/dists/opendingux/make-opk.sh
+++ b/dists/opendingux/make-opk.sh
@@ -3,7 +3,7 @@
 # opk_make.sh
 #
 # This script is meant to ease generation of a opk file. Please consult the output
-# when running --help for a list of available parameters and an explaination of
+# when running --help for a list of available parameters and an explanation of
 # those.
 #
 # Required tools when running the script:
diff --git a/dists/openpandora/pnd_make.sh b/dists/openpandora/pnd_make.sh
index f1630f1aba7..f3b389a240d 100755
--- a/dists/openpandora/pnd_make.sh
+++ b/dists/openpandora/pnd_make.sh
@@ -3,7 +3,7 @@
 # pnd_make.sh
 #
 # This script is meant to ease generation of a pnd file. Please consult the output
-# when running --help for a list of available parameters and an explaination of
+# when running --help for a list of available parameters and an explanation of
 # those.
 #
 # Required tools when running the script:
diff --git a/dists/samsungtv/README-SamsungTV b/dists/samsungtv/README-SamsungTV
index 7c171747dc8..552f3cae9c7 100644
--- a/dists/samsungtv/README-SamsungTV
+++ b/dists/samsungtv/README-SamsungTV
@@ -7,7 +7,7 @@ Notes:
 - Buttons on remote controler: EXIT, SOURCE, P+, P-, TV, POWER, CONTENT - cause immediately exit from ScummVM
 - Config file is in /mtd_rwarea/.scummvmrc
 - Saves are stored in '/mtd_wiselink/scummvm savegames' directory
-- Audio is delayed a upto one second, it's TV software issue :/
+- Audio is delayed up to one second, it's a TV software issue :/
 - Do not use 3x scalers, they are not fit in TV display frame buffer and you get gfx glitches
 
 Remote Controler buttons:
diff --git a/dists/wii/READMII b/dists/wii/READMII
index 44c45f9ea7a..08dfdcd879e 100644
--- a/dists/wii/READMII
+++ b/dists/wii/READMII
@@ -103,6 +103,6 @@ DISPLAY SETUP
 
 THANKS
 
-  shagkur and WinterMute, for devkitppc/libogc and the coorperation
+  shagkur and WinterMute, for devkitppc/libogc and the cooperation
   svpe, for fixing the libfat feof/thread bugs on the last minute
   para, for making wiiuse available in libogc


Commit: 563860ed6dd59f4573254506ee32451d8d5d2acd
    https://github.com/scummvm/scummvm/commit/563860ed6dd59f4573254506ee32451d8d5d2acd
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:48+03:00

Commit Message:
JANITORIAL: TEENAGENT: Fix typos

Changed paths:
    engines/teenagent/resources.h


diff --git a/engines/teenagent/resources.h b/engines/teenagent/resources.h
index 369efda788d..40b85af8bdd 100644
--- a/engines/teenagent/resources.h
+++ b/engines/teenagent/resources.h
@@ -887,11 +887,11 @@ const uint16 dsAddr_inventoryItemDataPtrTable = 0xc4a6;
 const uint16 dsAddr_lansAnimationTablePtr = 0xd89e;
 
 // Spoken With Mansion Guard Flag : 0xda96
-// FIXME - This is probably unecessary as although this location is set, it
+// FIXME - This is probably unnecessary as although this location is set, it
 //         doesn't now appear to be read.
 const uint16 dsAddr_spokenWithMansionGuardFlag = 0xda96; // 1 byte
 // Have Not Spoken With Mansion Guard Flag : 0xda97
-// FIXME - This is probably unecessary as although this location is set, it
+// FIXME - This is probably unnecessary as although this location is set, it
 //         doesn't now appear to be read.
 const uint16 dsAddr_haveNotSpokenWithMansionGuardFlag = 0xda97; // 1 byte
 


Commit: 97c8a135362cede048a242e4201b03f9f92ccc66
    https://github.com/scummvm/scummvm/commit/97c8a135362cede048a242e4201b03f9f92ccc66
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:49+03:00

Commit Message:
JANITORIAL: TESTBED: Fix typos

Changed paths:
    engines/testbed/cloud.cpp


diff --git a/engines/testbed/cloud.cpp b/engines/testbed/cloud.cpp
index ce3ab47b2ba..f572b5e2fe4 100644
--- a/engines/testbed/cloud.cpp
+++ b/engines/testbed/cloud.cpp
@@ -186,7 +186,7 @@ TestExitStatus CloudTests::testInfo() {
 		"Welcome to the Cloud test suite!\n"
 		"We're going to use the %s cloud storage which is connected right now.\n\n"
 		"Testing Cloud Storage API info() method.\n"
-		"In this test we'll try to list user infomation.",
+		"In this test we'll try to list user information.",
 		CloudMan.getCurrentStorage()->name().c_str()
 	);
 


Commit: 9040364cfbe1ef414da1ede1b09bbfa6435debb7
    https://github.com/scummvm/scummvm/commit/9040364cfbe1ef414da1ede1b09bbfa6435debb7
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:49+03:00

Commit Message:
JANITORIAL: TETRAEDGE: Fix typos

Changed paths:
    engines/tetraedge/te/te_intrusive_ptr.h


diff --git a/engines/tetraedge/te/te_intrusive_ptr.h b/engines/tetraedge/te/te_intrusive_ptr.h
index c3f7e1bcbe7..df0738bf5bb 100644
--- a/engines/tetraedge/te/te_intrusive_ptr.h
+++ b/engines/tetraedge/te/te_intrusive_ptr.h
@@ -32,7 +32,7 @@ template<class T> class TeIntrusivePtr {
 public:
 	// NOTE: The original uses a member function for this, which is cleaner, but
 	// MSVC compiles member functions for different class types (forward
-	// declaration, multi-inheritance, etc) as differnt sizes which causes all
+	// declaration, multi-inheritance, etc) as different sizes which causes all
 	// sorts of issues.  Only accept a static function to avoid such problems.
 	typedef void(*Tdestructor)(T *obj);
 


Commit: cd291a35eaeadcf2c77430d6ab7b271ee108f935
    https://github.com/scummvm/scummvm/commit/cd291a35eaeadcf2c77430d6ab7b271ee108f935
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:49+03:00

Commit Message:
JANITORIAL: TINSEL: Fix typos

Changed paths:
    engines/tinsel/bmv.cpp
    engines/tinsel/cursor.cpp
    engines/tinsel/dw.h
    engines/tinsel/handle.cpp
    engines/tinsel/strres.cpp
    engines/tinsel/strres.h
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index d7e58a7c34c..ec06450a1d4 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -539,7 +539,7 @@ void BMVPlayer::InitBMV(byte *memoryBuffer) {
 	if (TinselVersion == 3) {
 		// Clear the whole buffer
 		memset(memoryBuffer, 0, SCREEN_WIDE * (SCREEN_HIGH + 2) * bpp);
-		// Reset the pallete as it might be partially updated
+		// Reset the palette as it might be partially updated
 		memset(moviePal, 0, sizeof(moviePal));
 	} else {
 		// Clear the two extra 'off-screen' rows
diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp
index 92b1fdac9dd..0b94d3473f1 100644
--- a/engines/tinsel/cursor.cpp
+++ b/engines/tinsel/cursor.cpp
@@ -290,14 +290,14 @@ void Cursor::UnHideCursorTrails() {
 }
 
 /**
- * Delete auxillary cursor. Restore animation offsets in the image.
+ * Delete auxiliary cursor. Restore animation offsets in the image.
  */
 void Cursor::DelAuxCursor() {
 	MultiDeleteObjectIfExists(FIELD_STATUS, &_auxCursor);
 }
 
 /**
- * Set auxillary cursor.
+ * Set auxiliary cursor.
  * Save animation offsets from the image if required.
  */
 void Cursor::SetAuxCursor(SCNHANDLE hFilm) {
@@ -322,14 +322,14 @@ void Cursor::SetAuxCursor(SCNHANDLE hFilm) {
 
 	GetCursorXY(&x, &y, false);	// Note: also waits for cursor to appear
 
-	pim = _vm->_handle->GetImage(READ_32(pFrame)); // Get pointer to auxillary cursor's image
+	pim = _vm->_handle->GetImage(READ_32(pFrame)); // Get pointer to auxiliary cursor's image
 
 	_auxCursorOffsetX = (short)(pim->imgWidth / 2 - ((int16) pim->anioffX));
 	_auxCursorOffsetY = (short)((pim->imgHeight & ~C16_FLAG_MASK) / 2 -
 		((int16) pim->anioffY));
 	delete pim;
 
-	// Initialize and insert the auxillary cursor object
+	// Initialize and insert the auxiliary cursor object
 	_auxCursor = MultiInitObject(pmi);
 	MultiInsertObject(_vm->_bg->GetPlayfieldList(FIELD_STATUS), _auxCursor);
 
@@ -425,7 +425,7 @@ void Cursor::InitCurObj() {
 	}
 
 	if (TinselVersion <= 1)
-		_auxCursor = nullptr; // No auxillary cursor
+		_auxCursor = nullptr; // No auxiliary cursor
 
 	_mainCursor = MultiInitObject(pmi);
 	MultiInsertObject(_vm->_bg->GetPlayfieldList(FIELD_STATUS), _mainCursor);
@@ -476,7 +476,7 @@ void Cursor::DropCursor() {
 		_cursorProcessesRestarted = false;
 	}
 
-	_auxCursor = nullptr;		// No auxillary cursor
+	_auxCursor = nullptr;		// No auxiliary cursor
 	_mainCursor = nullptr;		// No cursor object (imminently deleted elsewhere)
 	_hiddenCursor = false;	// Not hidden in next scene
 	_hiddenTrails = false;	// Trailers not hidden in next scene
diff --git a/engines/tinsel/dw.h b/engines/tinsel/dw.h
index c016b5b0d54..624cef661ac 100644
--- a/engines/tinsel/dw.h
+++ b/engines/tinsel/dw.h
@@ -75,7 +75,7 @@ typedef int HPOLYGON;
 #define Z_CURSORTRAIL	999	// Cursor trails
 #define Z_ACURSOR	990	// Auxillary cursor
 
-#define Z_TAG_TEXT	995	// In front of auxillary cursor
+#define Z_TAG_TEXT	995	// In front of auxiliary cursor
 
 #define Z_MDGROOVE	20
 #define Z_MDSLIDER	21
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index a07986dd3d9..73b56923cc6 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -221,7 +221,7 @@ void Handle::LoadCDGraphData(MEMHANDLE *pH) {
 }
 
 /**
- * Called immediatly preceding a CDplay().
+ * Called immediately preceding a CDplay().
  * Prepares the ground so that when LockMem() is called, the
  * appropriate section of the extra scene file is loaded.
  * @param start			Handle of start of range
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp
index f5a37869290..9e88a4366c0 100644
--- a/engines/tinsel/strres.cpp
+++ b/engines/tinsel/strres.cpp
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * String resource managment routines
+ * String resource management routines
  */
 
 #include "tinsel/dw.h"
diff --git a/engines/tinsel/strres.h b/engines/tinsel/strres.h
index c3c8c2b5989..b58ce98d361 100644
--- a/engines/tinsel/strres.h
+++ b/engines/tinsel/strres.h
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * String resource managment routines
+ * String resource management routines
  */
 
 #ifndef TINSEL_STRRES_H
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 36bd0afedbb..a6adef94d82 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -630,7 +630,7 @@ static void AddInv(int invno, int object) {
 }
 
 /**
- * Define an actor's walk and stand reels for an auxilliary scale.
+ * Define an actor's walk and stand reels for an auxiliary scale.
  */
 static void AuxScale(int actor, int scale, SCNHANDLE *rp) {
 	MOVER *pMover = GetMover(actor);
@@ -5231,7 +5231,7 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		debug(7, "%s(0x%08X)", mapping.name, pp[0]);
 		break;
 	case 215: // this case produces "Unsupported library function" error,
-			  // followed by "You cant possibly get here", so map it to an invalid value
+			  // followed by "You can't possibly get here", so map it to an invalid value
 		mapping = NoirMapping{"OP215_USUPPORTED", -1, 0};
 		debug(7, "%s()", mapping.name);
 		break;


Commit: 77722844c5d52ef38e7d71702be724dbd0586780
    https://github.com/scummvm/scummvm/commit/77722844c5d52ef38e7d71702be724dbd0586780
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:50+03:00

Commit Message:
JANITORIAL: TITANIC: Fix typos

Changed paths:
    engines/titanic/core/game_object.cpp
    engines/titanic/core/project_item.h
    engines/titanic/gfx/text_control.h
    engines/titanic/support/string.h
    engines/titanic/true_talk/script_handler.h
    engines/titanic/true_talk/title_engine.h
    engines/titanic/true_talk/tt_string.h


diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index b588b94ce8e..8c557a43e1a 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -393,7 +393,7 @@ void CGameObject::loadMovie(const CString &name, bool pendingFlag) {
 }
 
 void CGameObject::loadImage(const CString &name, bool pendingFlag) {
-	// Get a refernce to the game and screen managers
+	// Get a reference to the game and screen managers
 	CGameManager *gameManager = getGameManager();
 	CScreenManager *screenManager;
 
diff --git a/engines/titanic/core/project_item.h b/engines/titanic/core/project_item.h
index de7effdcc0d..ee411bf55cc 100644
--- a/engines/titanic/core/project_item.h
+++ b/engines/titanic/core/project_item.h
@@ -122,7 +122,7 @@ private:
 	CTreeItem *findChildInstance(ClassDef *classDef) const;
 
 	/**
-	 * Finds the next sibling occurance of a given class type
+	 * Finds the next sibling occurrence of a given class type
 	 */
 	CTreeItem *findSiblingChildInstanceOf(ClassDef *classDef, CTreeItem *startItem) const;
 private:
diff --git a/engines/titanic/gfx/text_control.h b/engines/titanic/gfx/text_control.h
index 6a834428407..76d6cf05b67 100644
--- a/engines/titanic/gfx/text_control.h
+++ b/engines/titanic/gfx/text_control.h
@@ -262,7 +262,7 @@ public:
 	int getNPCNum(uint ident, uint startIndex);
 
 	/**
-	 * Replaces any occurances of line colors that appear in the
+	 * Replaces any occurrences of line colors that appear in the
 	 * first list with the entry at the same index in the dest list
 	 */
 	void remapColors(uint count, uint *srcColors, uint *destColors);
diff --git a/engines/titanic/support/string.h b/engines/titanic/support/string.h
index 1753ea09094..672520f07e4 100644
--- a/engines/titanic/support/string.h
+++ b/engines/titanic/support/string.h
@@ -80,17 +80,17 @@ public:
 	CString deleteRight(uint count) const;
 
 	/**
-	 * Returns the index of the first occurance of a given character
+	 * Returns the index of the first occurrence of a given character
 	 */
 	int indexOf(char c) const;
 
 	/**
-	 * Returns the index of the first occurance of a given string
+	 * Returns the index of the first occurrence of a given string
 	 */
 	int indexOf(const char *s) const;
 
 	/**
-	 * Returns the index of the last occurance of a given character
+	 * Returns the index of the last occurrence of a given character
 	 */
 	int lastIndexOf(char c) const;
 
diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h
index b84c6bc4a7a..0b6f75e8fa1 100644
--- a/engines/titanic/true_talk/script_handler.h
+++ b/engines/titanic/true_talk/script_handler.h
@@ -72,7 +72,7 @@ public:
 	void setParserConcept(TTconcept *newConcept, TTconcept *oldConcept);
 
 	/**
-	 * Sets a conversation reponse
+	 * Sets a conversation response
 	 */
 	int setResponse(TTscriptBase *script, TTresponse *response);
 
diff --git a/engines/titanic/true_talk/title_engine.h b/engines/titanic/true_talk/title_engine.h
index d04c7968145..85a86b3916c 100644
--- a/engines/titanic/true_talk/title_engine.h
+++ b/engines/titanic/true_talk/title_engine.h
@@ -52,7 +52,7 @@ public:
 	virtual void setup(int val1, VocabMode vocabMode = VOCAB_MODE_NONE);
 
 	/**
-	 * Sets a conversation reponse
+	 * Sets a conversation response
 	 */
 	virtual int setResponse(TTscriptBase *script, TTresponse *response) { return SS_4; }
 
@@ -81,7 +81,7 @@ public:
 	void setup(int val1, VocabMode vocabMode = VOCAB_MODE_NONE) override;
 
 	/**
-	 * Sets a conversation reponse
+	 * Sets a conversation response
 	 */
 	int setResponse(TTscriptBase *script, TTresponse *response) override;
 
diff --git a/engines/titanic/true_talk/tt_string.h b/engines/titanic/true_talk/tt_string.h
index 67c17e7247b..e28f3b3417c 100644
--- a/engines/titanic/true_talk/tt_string.h
+++ b/engines/titanic/true_talk/tt_string.h
@@ -150,7 +150,7 @@ public:
 	}
 
 	/**
-	 * Split off everything in the string until the first occurance
+	 * Split off everything in the string until the first occurrence
 	 * of any specified delimiter character
 	 */
 	TTstring tokenize(const char *delim);


Commit: dc4315e1a58ab602d77ef83bdcb2e8362a39768e
    https://github.com/scummvm/scummvm/commit/dc4315e1a58ab602d77ef83bdcb2e8362a39768e
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:50+03:00

Commit Message:
JANITORIAL: TOON: Fix typos

Changed paths:
    engines/toon/script.h


diff --git a/engines/toon/script.h b/engines/toon/script.h
index 9e71e15298a..c36a36527a6 100644
--- a/engines/toon/script.h
+++ b/engines/toon/script.h
@@ -80,7 +80,7 @@ public:
 		// It seems Westwood missunderstood the 'size' field of the FORM chunk.
 		//
 		// For EMC scripts (type EMC2) it's filesize instead of filesize - 8,
-		// means accidently including the 8 bytes used by the chunk header for the FORM
+		// means accidentally including the 8 bytes used by the chunk header for the FORM
 		// chunk.
 		//
 		// For TIM scripts (type AVFS) it's filesize - 12 instead of filesize - 8,


Commit: 49ea85a0817d0ce1c71116fe919ef1f7819624de
    https://github.com/scummvm/scummvm/commit/49ea85a0817d0ce1c71116fe919ef1f7819624de
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:50+03:00

Commit Message:
JANITORIAL: TSAGE: Fix typos

Changed paths:
    engines/tsage/graphics.cpp
    engines/tsage/scenes.cpp
    engines/tsage/sound.cpp


diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 63bfbcebf57..fcd348eed20 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -608,7 +608,7 @@ void GfxElement::highlight() {
 	GfxManager &gfxManager = g_globals->gfxManager();
 	Graphics::Surface surface = gfxManager.lockSurface();
 
-	// Scan through the contents of the element, switching any occurances of the foreground
+	// Scan through the contents of the element, switching any occurrences of the foreground
 	// color with the background color and vice versa
 	Rect tempRect(_bounds);
 	tempRect.collapse(g_globals->_gfxEdgeAdjust - 1, g_globals->_gfxEdgeAdjust - 1);
@@ -1275,7 +1275,7 @@ void GfxFont::setFontNumber(uint32 fontNumber) {
 		_fontData = g_resourceManager->getResource(RES_FONT, _fontNumber, 0);
 
 	// Since some TsAGE game versions don't have a valid character count at offset 4, use the offset of the
-	// first charactre data to calculate the number of characters in the offset table preceeding it
+	// first character data to calculate the number of characters in the offset table preceding it
 	_numChars = (READ_LE_UINT32(_fontData + 12) - 12) / 4;
 	assert(_numChars <= 256);
 
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index b3f9d8bfd03..d8c2e334374 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -428,7 +428,7 @@ void Scene::loadBackground(int xAmount, int yAmount) {
 
 	if ((g_globals->_sceneOffset.x != g_globals->_prevSceneOffset.x) ||
 		(g_globals->_sceneOffset.y != g_globals->_prevSceneOffset.y)) {
-		// Change has happend, so refresh background
+		// Change has happened, so refresh background
 		g_globals->_prevSceneOffset = g_globals->_sceneOffset;
 		refreshBackground(xAmount, yAmount);
 	}
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 7b640486a80..365bfe0b025 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -217,7 +217,7 @@ void SoundManager::installDriver(int driverNum) {
 	switch (driverNum) {
 	case ROLAND_DRIVER_NUM:
 	case ADLIB_DRIVER_NUM: {
-		// Handle loading bank infomation
+		// Handle loading bank information
 		byte *bankData = g_resourceManager->getResource(RES_BANK, driverNum, 0, true);
 		if (bankData) {
 			// Install the patch bank data


Commit: 1260bbfffe96bf6e04ab4a87a88d6c84a4f27218
    https://github.com/scummvm/scummvm/commit/1260bbfffe96bf6e04ab4a87a88d6c84a4f27218
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:51+03:00

Commit Message:
JANITORIAL: TWINE: Fix typos

Changed paths:
    engines/twine/script/script_life.cpp
    engines/twine/script/script_move.cpp
    engines/twine/text.cpp
    engines/twine/twine.h


diff --git a/engines/twine/script/script_life.cpp b/engines/twine/script/script_life.cpp
index 6210082ea5c..4dedfc7c885 100644
--- a/engines/twine/script/script_life.cpp
+++ b/engines/twine/script/script_life.cpp
@@ -1411,7 +1411,7 @@ int32 ScriptLife::lZOOM(TwinEEngine *engine, LifeScriptContext &ctx) {
 }
 
 /**
- * Set new postion for the current actor (Parameter = Track Index)
+ * Set new position for the current actor (Parameter = Track Index)
  * @note Opcode @c 0x3A
  */
 int32 ScriptLife::lPOS_POINT(TwinEEngine *engine, LifeScriptContext &ctx) {
diff --git a/engines/twine/script/script_move.cpp b/engines/twine/script/script_move.cpp
index 215da0bebc5..40c24c06def 100644
--- a/engines/twine/script/script_move.cpp
+++ b/engines/twine/script/script_move.cpp
@@ -160,7 +160,7 @@ int32 ScriptMove::mANGLE(TwinEEngine *engine, MoveScriptContext &ctx) {
 }
 
 /**
- * Set new postion for the current actor (Parameter = Track Index)
+ * Set new position for the current actor (Parameter = Track Index)
  * @note Opcode @c 0x08
  */
 int32 ScriptMove::mPOS_POINT(TwinEEngine *engine, MoveScriptContext &ctx) {
diff --git a/engines/twine/text.cpp b/engines/twine/text.cpp
index caca662db53..41d78d7d9ec 100644
--- a/engines/twine/text.cpp
+++ b/engines/twine/text.cpp
@@ -70,7 +70,7 @@ void Text::initVoxBank(TextBankId bankIdx) {
 	    "002", // White Leaf Desert voices
 	    "003", // Proxima Island voices
 	    "004", // Rebellion Island voices
-	    "005", // Hamalayi Mountains - sourthern range voices
+	    "005", // Hamalayi Mountains - southern range voices
 	    "006", // Hamalayi Mountains - northern range voices
 	    "007", // Tippett Island voices
 	    "008", // Brundle Island voices
diff --git a/engines/twine/twine.h b/engines/twine/twine.h
index 26fa2cc311b..e710010f907 100644
--- a/engines/twine/twine.h
+++ b/engines/twine/twine.h
@@ -309,7 +309,7 @@ public:
 	DebugScene *_debugScene;
 
 	/** Configuration file structure
-	 * Contains all the data used in the engine to configurated the game in particulary ways. */
+	 * Contains all the data used in the engine to configurate the game in particularly ways. */
 	ConfigFile _cfgfile;
 
 	int32 _frameCounter = 0;


Commit: c1d8af18f175886281bc8f2f330179be87fe811b
    https://github.com/scummvm/scummvm/commit/c1d8af18f175886281bc8f2f330179be87fe811b
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-17T00:38:51+03:00

Commit Message:
JANITORIAL: TWP: Fix typos

Changed paths:
    engines/twp/actorlib.cpp
    engines/twp/clipper/clipper.cpp
    engines/twp/clipper/clipper.hpp
    engines/twp/squirrel/sqstate.cpp
    engines/twp/squirrel/sqstdrex.cpp
    engines/twp/vm.cpp


diff --git a/engines/twp/actorlib.cpp b/engines/twp/actorlib.cpp
index 896030193b9..8511ab64e47 100644
--- a/engines/twp/actorlib.cpp
+++ b/engines/twp/actorlib.cpp
@@ -178,7 +178,7 @@ static SQInteger actorColor(HSQUIRRELVM v) {
 }
 
 // Sets the actor's costume to the (JSON) filename animation file.
-// If the actor is expected to preform the standard walk, talk, stand, reach animations, they need to exist in the file.
+// If the actor is expected to perform the standard walk, talk, stand, reach animations, they need to exist in the file.
 // If a sheet is given, this is a sprite sheet containing all the images needed for the animation.
 static SQInteger actorCostume(HSQUIRRELVM v) {
 	Common::SharedPtr<Object> actor = sqactor(v, 2);
diff --git a/engines/twp/clipper/clipper.cpp b/engines/twp/clipper/clipper.cpp
index c38bfc1ef5f..b94560d3980 100644
--- a/engines/twp/clipper/clipper.cpp
+++ b/engines/twp/clipper/clipper.cpp
@@ -1517,7 +1517,7 @@ bool Clipper::ExecuteInternal() {
 
 void Clipper::SetWindingCount(TEdge &edge) {
 	TEdge *e = edge.PrevInAEL;
-	// find the edge of the same polytype that immediately preceeds 'edge' in AEL
+	// find the edge of the same polytype that immediately precedes 'edge' in AEL
 	while (e && ((e->PolyTyp != edge.PolyTyp) || (e->WindDelta == 0)))
 		e = e->PrevInAEL;
 	if (!e) {
@@ -2503,7 +2503,7 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge) {
 		while (e) {
 
 			// this code block inserts extra coords into horizontal edges (in output
-			// polygons) whereever maxima touch these horizontal edges. This helps
+			// polygons) wherever maxima touch these horizontal edges. This helps
 			//'simplifying' polygons (ie if the Simplify property is set).
 			if (m_Maxima.size() > 0) {
 				if (dir == dLeftToRight) {
diff --git a/engines/twp/clipper/clipper.hpp b/engines/twp/clipper/clipper.hpp
index 1a7173e4236..b77568e7468 100644
--- a/engines/twp/clipper/clipper.hpp
+++ b/engines/twp/clipper/clipper.hpp
@@ -40,7 +40,7 @@
 //improve performance but coordinate values are limited to the range +/- 46340
 #define use_int32
 
-//use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance.
+//use_xyz: adds a Z member to IntPoint. Adds a minor cost to performance.
 //#define use_xyz
 
 //use_lines: Enables line clipping. Adds a very minor cost to performance.
diff --git a/engines/twp/squirrel/sqstate.cpp b/engines/twp/squirrel/sqstate.cpp
index 4162e0d6a1c..2845d3658be 100755
--- a/engines/twp/squirrel/sqstate.cpp
+++ b/engines/twp/squirrel/sqstate.cpp
@@ -202,7 +202,7 @@ SQSharedState::~SQSharedState()
             t = nx;
         }
     }
-    assert(_gc_chain==NULL); //just to proove a theory
+    assert(_gc_chain==NULL); //just to prove a theory
     while(_gc_chain){
         _gc_chain->_uiRef++;
         _gc_chain->Release();
diff --git a/engines/twp/squirrel/sqstdrex.cpp b/engines/twp/squirrel/sqstdrex.cpp
index 8dcdcc5b9b0..b559466f0cb 100755
--- a/engines/twp/squirrel/sqstdrex.cpp
+++ b/engines/twp/squirrel/sqstdrex.cpp
@@ -528,7 +528,7 @@ static const SQChar *sqstd_rex_matchnode(SQRex* exp,SQRexNode *node,const SQChar
     case OP_MB:
         {
             SQInteger cb = node->left; //char that opens a balanced expression
-            if(*str != cb) return NULL; // string doesnt start with open char
+            if(*str != cb) return NULL; // string doesn't start with open char
             SQInteger ce = node->right; //char that closes a balanced expression
             SQInteger cont = 1;
             const SQChar *streol = exp->_eol;
diff --git a/engines/twp/vm.cpp b/engines/twp/vm.cpp
index 67d8aa8beff..9157f6a9766 100644
--- a/engines/twp/vm.cpp
+++ b/engines/twp/vm.cpp
@@ -54,7 +54,7 @@ static SQInteger aux_printerror(HSQUIRRELVM v) {
 	if (SQ_FAILED(sq_getstring(v, 2, &error))) {
 		error = "unknown";
 	}
-	pf(v, _SC("\nAn error occured in the script: %s\n"), error);
+	pf(v, _SC("\nAn error occurred in the script: %s\n"), error);
 	sqstd_printcallstack(v);
 
 	return 0;

More information about the Scummvm-git-logs mailing list