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

dwatteau noreply at scummvm.org
Sun Sep 11 15:49:24 UTC 2022 

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

Summary:
1823f6efbd SCUMM: Make Trac#2961 workaround an enhancement and describe it more (Indy4)
bf5e489567 JANITORIAL: Fix "to to" and "if if" typos in some comments


Commit: 1823f6efbdd6133554ff26b5f5ed21a909fa4abc
    https://github.com/scummvm/scummvm/commit/1823f6efbdd6133554ff26b5f5ed21a909fa4abc
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-09-11T17:20:01+02:00

Commit Message:
SCUMM: Make Trac#2961 workaround an enhancement and describe it more (Indy4)

Fixing original typos is usually an enhancement now, and most of the
SCUMM workarounds describe what's going on.

Still OK with the English talkie release from GOG (with boot param 4964).
I'm not sure this workaround works with the floppy releases though (the
length and offsets look talkie-only) but I don't have any English floppy
release of this title.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index a4d86c05580..f28896f8366 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -3345,8 +3345,14 @@ void ScummEngine_v5::decodeParseStringTextString(int textSlot) {
 			_string[textSlot].color = 0x0E;
 		printString(textSlot, _scriptPointer);
 	} else if (_game.id == GID_INDY4 && _roomResource == 23 && vm.slot[_currentScript].number == 167 &&
-			len == 24 && 0==memcmp(_scriptPointer+16, "pregod", 6)) {
-		// WORKAROUND for bug #2961.
+			len == 24 && _enableEnhancements && memcmp(_scriptPointer+16, "pregod", 6) == 0) {
+		// WORKAROUND for bug #2961: At the end of Indy4, if Ubermann is told
+		// to use 20 orichalcum beads, he'll count "pregod8" and "pregod9"
+		// instead of "18" and "19", in some releases.
+		//
+		// TODO: Check whether this issue also appears in any floppy version,
+		// because the current workaround doesn't look compatible with
+		// non-talkie releases.
 		byte tmpBuf[25];
 		memcpy(tmpBuf, _scriptPointer, 25);
 		if (tmpBuf[22] == '8')


Commit: bf5e489567dc54846a17d9afd97f0a3c8a36e5be
    https://github.com/scummvm/scummvm/commit/bf5e489567dc54846a17d9afd97f0a3c8a36e5be
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-09-11T17:45:25+02:00

Commit Message:
JANITORIAL: Fix "to to" and "if if" typos in some comments

Changed paths:
    backends/platform/sdl/win32/win32_wrapper.h
    devtools/create_supernova/create_image/create_image.cpp
    devtools/create_titanic/hashmap.h
    devtools/create_xeen/hashmap.h
    engines/cine/sound.cpp
    engines/director/score.cpp
    engines/glk/hugo/hugo.h
    engines/lastexpress/game/state.h
    engines/sci/engine/kstring.cpp


diff --git a/backends/platform/sdl/win32/win32_wrapper.h b/backends/platform/sdl/win32/win32_wrapper.h
index 0deee5d6313..cedb0b9c731 100644
--- a/backends/platform/sdl/win32/win32_wrapper.h
+++ b/backends/platform/sdl/win32/win32_wrapper.h
@@ -97,7 +97,7 @@ char *unicodeToAnsi(const wchar_t *s);
 /**
  * Converts a Common::String to a TCHAR array for the purpose of passing to
  * a Windows API or CRT call. If UNICODE is defined then the string will be
- * converted from UTF8 to to wide characters, otherwise the character array
+ * converted from UTF8 to wide characters, otherwise the character array
  * will be copied with no conversion.
  *
  * @param s Source string
diff --git a/devtools/create_supernova/create_image/create_image.cpp b/devtools/create_supernova/create_image/create_image.cpp
index 6ea08607326..9826d5978de 100644
--- a/devtools/create_supernova/create_image/create_image.cpp
+++ b/devtools/create_supernova/create_image/create_image.cpp
@@ -128,7 +128,7 @@ void printHelp() {
 	std::cout << "create_image output-prefix file-number bytes-skip" << std::endl << std::endl;
 	std::cout << "	output-prefix: String the created file should begin with" << std::endl;
 	std::cout << "	file-number: Number of the created file and also name of source folder" << std::endl;
-	std::cout << "	bytes-skip: How many bytes to to skip in each .bmp file" << std::endl;
+	std::cout << "	bytes-skip: How many bytes to skip in each .bmp file" << std::endl;
 	std::cout << std::endl << "EXAMPLE:" << std::endl
 		<< "create_image ms2_data 15 1146" << std::endl
 		<< "	creates ms2_data.015 assuming there are the right files inside 015 folder" << std::endl;
diff --git a/devtools/create_titanic/hashmap.h b/devtools/create_titanic/hashmap.h
index d473cbfde31..944e0555bf0 100644
--- a/devtools/create_titanic/hashmap.h
+++ b/devtools/create_titanic/hashmap.h
@@ -67,7 +67,7 @@ template<class T> class IteratorImpl;
  * For each used Key type, we need an "size_type hashit(Key,size_type)" function
  * that computes a hash for the given Key object and returns it as an
  * an integer from 0 to hashsize-1, and also an "equality functor".
- * that returns true if if its two arguments are to be considered
+ * that returns true if its two arguments are to be considered
  * equal. Also, we assume that "=" works on Val objects for assignment.
  *
  * If aa is an HashMap<Key,Val>, then space is allocated each time aa[key] is
diff --git a/devtools/create_xeen/hashmap.h b/devtools/create_xeen/hashmap.h
index d473cbfde31..944e0555bf0 100644
--- a/devtools/create_xeen/hashmap.h
+++ b/devtools/create_xeen/hashmap.h
@@ -67,7 +67,7 @@ template<class T> class IteratorImpl;
  * For each used Key type, we need an "size_type hashit(Key,size_type)" function
  * that computes a hash for the given Key object and returns it as an
  * an integer from 0 to hashsize-1, and also an "equality functor".
- * that returns true if if its two arguments are to be considered
+ * that returns true if its two arguments are to be considered
  * equal. Also, we assume that "=" works on Val objects for assignment.
  *
  * If aa is an HashMap<Key,Val>, then space is allocated each time aa[key] is
diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp
index 3c5ca6f700e..8ae20d48ac5 100644
--- a/engines/cine/sound.cpp
+++ b/engines/cine/sound.cpp
@@ -1418,7 +1418,7 @@ void PaulaSound::loadMusic(const char *name) {
 		// Remove the old module stream so that it won't be played.
 		// Fixes not trying to play a null stream or an old wrong music in
 		// e.g. Italian version of Future Wars when first teleporting from
-		// the office to to the swamp.
+		// the office to the swamp.
 		_moduleStream = nullptr;
 	}
 }
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index b68de298a64..01fc48f8792 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -168,7 +168,7 @@ void Score::setStartToLabel(Common::String &label) {
 }
 
 void Score::gotoLoop() {
-	// This command has the playback head contonuously return to the first marker to to the left and then loop back.
+	// This command has the playback head continuously return to the first marker to the left and then loop back.
 	// If no marker are to the left of the playback head, the playback head continues to the right.
 	if (_labels == nullptr) {
 		_nextFrame = 1;
diff --git a/engines/glk/hugo/hugo.h b/engines/glk/hugo/hugo.h
index bc78d1ba1ae..91977a0a575 100644
--- a/engines/glk/hugo/hugo.h
+++ b/engines/glk/hugo/hugo.h
@@ -896,7 +896,7 @@ private:
 	/**
 	 * Assumes that filename/resname contain a resourcefile name and a resource name.
 	 * If resname is "", filename contains the path of the resource on disk.
-	 * Returns the length of the resource if if the named resource is found.
+	 * Returns the length of the resource if the named resource is found.
 	 *
 	 * If FindResource() returns non-zero, the file is hot, i.e., it is open and positioned
 	 * to the start of the resource.
diff --git a/engines/lastexpress/game/state.h b/engines/lastexpress/game/state.h
index 9c4e1645c1b..61fba00ed98 100644
--- a/engines/lastexpress/game/state.h
+++ b/engines/lastexpress/game/state.h
@@ -301,7 +301,7 @@ public:
 		}
 
 		/**
-		 * Query if if a progress value is equal to the specified value.
+		 * Query if a progress value is equal to the specified value.
 		 *
 		 * Note: This is necessary because we store different types in the progress structure
 		 *       and need to test a value based on an index in Action::getCursor()
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 7a4441167d5..458cea39b36 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -492,7 +492,7 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv) {
 #endif
 
 //	TODO: Perhaps fix this check, currently doesn't work with PUSH and POP subfunctions
-//	Pepper uses them to to handle the glossary
+//	Pepper uses them to handle the glossary
 //	if ((func != K_MESSAGE_NEXT) && (argc < 2)) {
 //		warning("Message: not enough arguments passed to subfunction %d", func);
 //		return NULL_REG;

More information about the Scummvm-git-logs mailing list