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

bluegr noreply at scummvm.org
Wed Sep 11 08:44:41 UTC 2024 

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

Summary:
c2c6befdf7 JANITORIAL: AGI: Fix typos
e94b47c01a JANITORIAL: AGS: Fix typos
9bb9f341cb JANITORIAL: BLADERUNNER: Fix typos
14eb320677 JANITORIAL: CRUISE: Fix typos
eb0752d811 JANITORIAL: GLK: Fix typos
a6441ecd25 JANITORIAL: GOB: Fix typos
a99e53a146 JANITORIAL: HPL1: Fix typos


Commit: c2c6befdf7493b0aa9aa60751a98cb41eb39fc60
    https://github.com/scummvm/scummvm/commit/c2c6befdf7493b0aa9aa60751a98cb41eb39fc60
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-11T10:58:43+03:00

Commit Message:
JANITORIAL: AGI: Fix typos

Changed paths:
    engines/agi/agi.h


diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 08bf10c5913..1a1104357c6 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -316,8 +316,8 @@ struct AgiDir {
 
 	// 0 = not in mem, can be freed
 	// 1 = in mem, can be released
-	// 2 = not in mem, cant be released
-	// 3 = in mem, cant be released
+	// 2 = not in mem, can't be released
+	// 3 = in mem, can't be released
 	// 0x40 = was compressed
 	uint8 flags;
 


Commit: e94b47c01aee2a131b0b2df6cc7454f8f1e327b4
    https://github.com/scummvm/scummvm/commit/e94b47c01aee2a131b0b2df6cc7454f8f1e327b4
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-11T11:01:26+03:00

Commit Message:
JANITORIAL: AGS: Fix typos

Changed paths:
    engines/ags/engine/ac/gui.cpp
    engines/ags/engine/ac/inv_window.cpp
    engines/ags/engine/script/script.cpp
    engines/ags/shared/util/buffered_stream.cpp


diff --git a/engines/ags/engine/ac/gui.cpp b/engines/ags/engine/ac/gui.cpp
index 8e5daac1209..ac499732fd2 100644
--- a/engines/ags/engine/ac/gui.cpp
+++ b/engines/ags/engine/ac/gui.cpp
@@ -83,7 +83,7 @@ int GUI_GetVisible(ScriptGUI *tehgui) {
 	// Since 3.5.0 this always returns honest state of the Visible property as set by the game
 	if (_G(loaded_game_file_version) >= kGameVersion_350)
 		return (_GP(guis)[tehgui->id].IsVisible()) ? 1 : 0;
-	// Prior to 3.5.0 PopupY guis overrided Visible property and set it to 0 when auto-hidden;
+	// Prior to 3.5.0 PopupY guis override Visible property and set it to 0 when auto-hidden;
 	// in order to simulate same behavior we only return positive if such gui is popped up:
 	return (_GP(guis)[tehgui->id].IsDisplayed()) ? 1 : 0;
 }
diff --git a/engines/ags/engine/ac/inv_window.cpp b/engines/ags/engine/ac/inv_window.cpp
index 93a68e42ec0..e67bac48876 100644
--- a/engines/ags/engine/ac/inv_window.cpp
+++ b/engines/ags/engine/ac/inv_window.cpp
@@ -222,7 +222,7 @@ void InventoryScreen::Prepare() {
 	// the engine to be used in the built-in inventory window.
 	// If they did not exist engine first fell back to sprites 0, 1, 2 instead.
 	// Fun fact: this fallback does not seem to be intentional, and was a
-	// coincidental result of SpriteCache incorrectly remembering "last seeked
+	// coincidental result of SpriteCache incorrectly remembering "last seek'd
 	// sprite" as 2041/2042/2043 while in fact stream was after sprite 0.
 	if (!_GP(spriteset).DoesSpriteExist(2041) || !_GP(spriteset).DoesSpriteExist(2042) || !_GP(spriteset).DoesSpriteExist(2043)) {
 		debug_script_warn("InventoryScreen: one or more of the inventory screen graphics (sprites 2041, 2042, 2043) does not exist, fallback to sprites 0, 1, 2 instead");
diff --git a/engines/ags/engine/script/script.cpp b/engines/ags/engine/script/script.cpp
index cb37471659c..ae42c2be16a 100644
--- a/engines/ags/engine/script/script.cpp
+++ b/engines/ags/engine/script/script.cpp
@@ -293,7 +293,7 @@ static bool DoRunScriptFuncCantBlock(ccInstance *sci, NonBlockingScriptFunction
 		return false;
 
 	if (result == -2) {
-		// the function doens't exist, so don't try and run it again
+		// the function doesn't exist, so don't try and run it again
 		hasTheFunc = false;
 	} else if ((result != 0) && (result != 100)) {
 		quit_with_script_error(funcToRun->functionName);
diff --git a/engines/ags/shared/util/buffered_stream.cpp b/engines/ags/shared/util/buffered_stream.cpp
index 49d1845591f..e8086b700ff 100644
--- a/engines/ags/shared/util/buffered_stream.cpp
+++ b/engines/ags/shared/util/buffered_stream.cpp
@@ -147,9 +147,9 @@ int32_t BufferedStream::ReadByte() {
 size_t BufferedStream::Write(const void *buffer, size_t size) {
 	const uint8_t *from = static_cast<const uint8_t*>(buffer);
 	while (size > 0) {
-		if (_position < _bufferPosition || // seeked before buffer pos
-			_position > _bufferPosition + _buffer.size() || // seeked beyond buffer pos
-			_position >= _bufferPosition + (soff_t) BufferSize) // seeked, or exceeded buffer limit
+		if (_position < _bufferPosition || // seek'd before buffer pos
+			_position > _bufferPosition + _buffer.size() || // seek'd beyond buffer pos
+			_position >= _bufferPosition + (soff_t) BufferSize) // seek'd, or exceeded buffer limit
 		{
 			FlushBuffer(_position);
 		}


Commit: 9bb9f341cb18e98ce603569c3cabd4dfffb1914f
    https://github.com/scummvm/scummvm/commit/9bb9f341cb18e98ce603569c3cabd4dfffb1914f
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-11T11:03:48+03:00

Commit Message:
JANITORIAL: BLADERUNNER: Fix typos

Changed paths:
    engines/bladerunner/script/ai/mccoy.cpp


diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index 32d0ea4a415..a38f7e80e93 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -803,7 +803,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		// animation state 21 is for the full shooting animation
 		*animation = kModelAnimationMcCoyWithGunShooting;
 		_animationFrame = 0;
-		// weird, but thats in game code
+		// weird, but that's in game code
 		if (Slice_Animation_Query_Number_Of_Frames(*animation) <= 0) {
 			_animationFrame = 0;
 			_animationState = 17;


Commit: 14eb320677096088279a4b29c869c6297dcad3b8
    https://github.com/scummvm/scummvm/commit/14eb320677096088279a4b29c869c6297dcad3b8
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-11T11:09:18+03:00

Commit Message:
JANITORIAL: CRUISE: Fix typos

Changed paths:
    engines/cruise/font.cpp
    engines/cruise/mainDraw.cpp


diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp
index bc05695a743..5c8fdc9542b 100644
--- a/engines/cruise/font.cpp
+++ b/engines/cruise/font.cpp
@@ -391,7 +391,7 @@ gfxEntryStruct *renderText(int inRightBorder_X, const char *string) {
 
 			if (character) {
 				if (character == ' ' || character == 0x7C) {
-					drawPosPixel_X += wordSpacingWidth + SPACE_WIDTH;	// if char = "space" adjust word starting postion (don't render space though);
+					drawPosPixel_X += wordSpacingWidth + SPACE_WIDTH;	// if char = "space" adjust word starting position (don't render space though);
 				} else {
 					if (charData >= 0) {
 						const FontEntry &fe = fontPtr_Desc[charData];
diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp
index c77148d13ca..73b61538946 100644
--- a/engines/cruise/mainDraw.cpp
+++ b/engines/cruise/mainDraw.cpp
@@ -745,7 +745,7 @@ void buildPolyModel(int positionX, int positionY, int scale, char *pMask, char *
 
 	dataPointer += 5;
 
-	m_coordCount = (*(dataPointer++)) + 1;	// original uses +1 here but its later substracted again, we could skip it
+	m_coordCount = (*(dataPointer++)) + 1;	// original uses +1 here but its later subtracted again, we could skip it
 	m_first_X = *(dataPointer);
 	dataPointer++;
 	m_first_Y = *(dataPointer);
@@ -902,7 +902,7 @@ bool findPoly(char* dataPtr, int positionX, int positionY, int scale, int mouseX
 
 	dataPointer += 5;
 
-	m_coordCount = (*(dataPointer++)) + 1;	// original uses +1 here but its later substracted again, we could skip it
+	m_coordCount = (*(dataPointer++)) + 1;	// original uses +1 here but its later subtracted again, we could skip it
 	m_first_X = *(dataPointer);
 	dataPointer++;
 	m_first_Y = *(dataPointer);


Commit: eb0752d811128a85bcbdf8e05d01a091d7fc36d0
    https://github.com/scummvm/scummvm/commit/eb0752d811128a85bcbdf8e05d01a091d7fc36d0
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-11T11:11:22+03:00

Commit Message:
JANITORIAL: GLK: Fix typos

Changed paths:
    engines/glk/scott/command_parser.cpp
    engines/glk/scott/unp64/scanners/megabyte.cpp


diff --git a/engines/glk/scott/command_parser.cpp b/engines/glk/scott/command_parser.cpp
index ee3d5f43b07..a7b3479352f 100644
--- a/engines/glk/scott/command_parser.cpp
+++ b/engines/glk/scott/command_parser.cpp
@@ -236,7 +236,7 @@ char **splitIntoWords(glui32 *string, int length) {
 
 	wordlength[words_found]--; /* Don't count final newline character */
 
-	/* Now we've created two arrays, one for starting postions
+	/* Now we've created two arrays, one for starting positions
 	 and one for word length. Now we convert these into an array of strings */
 	glui32 **words = new glui32 *[words_found];
 	char **words8 = new char *[words_found];
diff --git a/engines/glk/scott/unp64/scanners/megabyte.cpp b/engines/glk/scott/unp64/scanners/megabyte.cpp
index 94ffe30d6bf..a63706d451b 100644
--- a/engines/glk/scott/unp64/scanners/megabyte.cpp
+++ b/engines/glk/scott/unp64/scanners/megabyte.cpp
@@ -70,7 +70,7 @@ void scnMegabyte(UnpStr *unp) {
 				unp->_endAdr = READ_LE_UINT16(&mem[p + 0x59]); // mem[p + 0x59] | mem[p + 0x5a] << 8;
 				unp->_endAdr++;
 				unp->_strMem = 0x801;
-				unp->_retAdr = 0x801; /* ususally it just runs */
+				unp->_retAdr = 0x801; /* usually it just runs */
 				unp->_idFlag = 1;
 				return;
 			}


Commit: a6441ecd25693d060e0ab597a37fd629a9576922
    https://github.com/scummvm/scummvm/commit/a6441ecd25693d060e0ab597a37fd629a9576922
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-11T11:15:29+03:00

Commit Message:
JANITORIAL: GOB: Fix typos

Changed paths:
    engines/gob/detection/tables_adi4.h


diff --git a/engines/gob/detection/tables_adi4.h b/engines/gob/detection/tables_adi4.h
index 5a7cbc5e950..4c3ea9b4d6f 100644
--- a/engines/gob/detection/tables_adi4.h
+++ b/engines/gob/detection/tables_adi4.h
@@ -144,7 +144,7 @@
 {
 	{ // Supplied by fischbeck
 		"adi4",
-		"Addi Simule", // That is not an typo in the name "Addi" thats how this version is called.
+		"Addi Simule", // That is not an typo in the name "Addi" that's how this version is called.
 		AD_ENTRY1s("simule.stk", "66d97fe54bbf8ea4bbb18534cb28b13f", 2523796),
 		DE_DEU,
 		kPlatformWindows,


Commit: a99e53a146f858f998e3eca0a38a9f8d908e300a
    https://github.com/scummvm/scummvm/commit/a99e53a146f858f998e3eca0a38a9f8d908e300a
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-11T11:19:33+03:00

Commit Message:
JANITORIAL: HPL1: Fix typos

Changed paths:
    engines/hpl1/engine/impl/shaders/hpl1_BumpSpec2D_Light.vertex


diff --git a/engines/hpl1/engine/impl/shaders/hpl1_BumpSpec2D_Light.vertex b/engines/hpl1/engine/impl/shaders/hpl1_BumpSpec2D_Light.vertex
index a97898b0ce3..cc01dc9e89e 100644
--- a/engines/hpl1/engine/impl/shaders/hpl1_BumpSpec2D_Light.vertex
+++ b/engines/hpl1/engine/impl/shaders/hpl1_BumpSpec2D_Light.vertex
@@ -49,7 +49,7 @@ void main()
 	vHalfVec.xy = position.xy - EyePos.xy;
 	vHalfVec.z = -EyePos.y;
 
-	///rotate halfvec aswell NOTE: Not sure you need this...
+	///rotate halfvec as well NOTE: Not sure you need this...
 	vec2 TempHalfVec = vHalfVec.xy;
 	vHalfVec.x = normal.x*TempHalfVec.x + normal.y*TempHalfVec.y;
 	vHalfVec.y = normal.x*TempHalfVec.y - normal.y*TempHalfVec.x;

More information about the Scummvm-git-logs mailing list