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

dwatteau noreply at scummvm.org
Fri Nov 11 19:58:19 UTC 2022 

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

Summary:
614925d85a ILLUSIONS: JANITORIAL: Silence -Wbitwise-instead-of-logical warning
16e2068aec JANITORIAL: Fix various single-character typos
d14114e6a9 COMMON: Fix duplicate "line" word in INIFile warning


Commit: 614925d85aae5948840ecd066e56c81d1e908740
    https://github.com/scummvm/scummvm/commit/614925d85aae5948840ecd066e56c81d1e908740
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-11T20:39:31+01:00

Commit Message:
ILLUSIONS: JANITORIAL: Silence -Wbitwise-instead-of-logical warning

Changed paths:
    engines/illusions/sound.cpp


diff --git a/engines/illusions/sound.cpp b/engines/illusions/sound.cpp
index 71554c04b2d..a2b996001f3 100644
--- a/engines/illusions/sound.cpp
+++ b/engines/illusions/sound.cpp
@@ -483,7 +483,7 @@ Sound *SoundMan::getSound(uint32 soundEffectId) {
 }
 
 void SoundMan::updateMidi() {
-	if (_midiPlayer->isIdle() & !_midiMusicQueue.empty()) {
+	if (_midiPlayer->isIdle() && !_midiMusicQueue.empty()) {
 		uint32 musicId = _midiMusicQueue.front();
 		_midiMusicQueue.remove_at(0);
 		_midiPlayer->play(musicId);


Commit: 16e2068aec391b8eb12a7e5276f41537f5c90050
    https://github.com/scummvm/scummvm/commit/16e2068aec391b8eb12a7e5276f41537f5c90050
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-11T20:55:56+01:00

Commit Message:
JANITORIAL: Fix various single-character typos

Changed paths:
    backends/audiocd/win32/win32-audiocd.cpp
    backends/saves/posix/posix-saves.cpp
    engines/bladerunner/bladerunner.cpp
    engines/grim/localize.cpp
    engines/icb/main_menu_pc.cpp
    engines/icb/res_man.cpp
    engines/kyra/engine/kyra_v1.cpp
    engines/scumm/imuse/imuse.cpp
    engines/scumm/saveload.cpp
    engines/tinsel/bmv.cpp


diff --git a/backends/audiocd/win32/win32-audiocd.cpp b/backends/audiocd/win32/win32-audiocd.cpp
index 87b66e426fe..aeb17eb7cba 100644
--- a/backends/audiocd/win32/win32-audiocd.cpp
+++ b/backends/audiocd/win32/win32-audiocd.cpp
@@ -62,7 +62,7 @@
 #include <winioctl.h>
 #if _MSC_VER < 1900
 // WORKAROUND: Older versions of MSVC might not supply DDK headers by default.
-// Visual Studio 2015 contains the required headers. We use a compatability
+// Visual Studio 2015 contains the required headers. We use a compatibility
 // header from MinGW's w32api for all older versions.
 // TODO: Limit this to the Visual Studio versions which actually require this.
 #include "msvc/ntddcdrm.h"
diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp
index f4d57fc319e..cb692fb37db 100644
--- a/backends/saves/posix/posix-saves.cpp
+++ b/backends/saves/posix/posix-saves.cpp
@@ -56,7 +56,7 @@ POSIXSaveFileManager::POSIXSaveFileManager() {
 	const char *envVar;
 
 	// Previously we placed our default savepath in HOME. If the directory
-	// still exists, we will use it for backwards compatability.
+	// still exists, we will use it for backwards compatibility.
 	envVar = getenv("HOME");
 	if (envVar && *envVar) {
 		savePath = envVar;
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index c230a7d80a5..9cbcff6cfd2 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -1722,7 +1722,7 @@ void BladeRunnerEngine::setExtraCNotify(uint8 val) {
 	_extraCNotify = val;
 }
 
-// Check if an polled event belongs to a currently disabled keymap and, if so, drop it.
+// Check if a polled event belongs to a currently disabled keymap and, if so, drop it.
 bool BladeRunnerEngine::shouldDropRogueCustomEvent(const Common::Event &evt) {
 	if (getEventManager()->getKeymapper() != nullptr) {
 		Common::KeymapArray kmpsArr = getEventManager()->getKeymapper()->getKeymaps();
diff --git a/engines/grim/localize.cpp b/engines/grim/localize.cpp
index ff91684e7f9..dadacec7c9f 100644
--- a/engines/grim/localize.cpp
+++ b/engines/grim/localize.cpp
@@ -124,7 +124,7 @@ Localizer::Localizer() {
 			continue;
 		}
 
-		// EMI has an garbage line which should be ignored
+		// EMI has a garbage line which should be ignored
 		if (g_grim->getGameType() == GType_MONKEY4 && *line == '\x1A')
 			continue;
 
diff --git a/engines/icb/main_menu_pc.cpp b/engines/icb/main_menu_pc.cpp
index b001141b851..99aae60df39 100644
--- a/engines/icb/main_menu_pc.cpp
+++ b/engines/icb/main_menu_pc.cpp
@@ -61,7 +61,7 @@ void Credits() {
 	t = GetMicroTimer() - t;
 
 	// As the DoCredits() function takes a variable time this timing code
-	// forces an constant frame rate for smoother scrolling
+	// forces a constant frame rate for smoother scrolling
 	int32 r = 40000 - t;
 	if (t < 40000) {
 		g_system->delayMillis(r / 1000);
diff --git a/engines/icb/res_man.cpp b/engines/icb/res_man.cpp
index 7d6001cfca6..81fdd91dbfc 100644
--- a/engines/icb/res_man.cpp
+++ b/engines/icb/res_man.cpp
@@ -652,7 +652,7 @@ uint32 res_man::Check_file_size(const char *url, uint32 url_hash, const char *cl
 uint8 *res_man::Internal_open(RMParams *params, int32 *ret_len) {
 	// Loads if not in memory here already
 
-	// resoures cannot be locked in memory
+	// resources cannot be locked in memory
 
 	// if space cannot be found then ALL the resources loaded during a previous time-frame will be removed
 	// as graphic resources are to be loaded en-mass when scenes begin the trash process should make a sizeable single block
diff --git a/engines/kyra/engine/kyra_v1.cpp b/engines/kyra/engine/kyra_v1.cpp
index be0bda4e691..3bb2a5ecb92 100644
--- a/engines/kyra/engine/kyra_v1.cpp
+++ b/engines/kyra/engine/kyra_v1.cpp
@@ -283,7 +283,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 					keys = 0;
 				}
 
-				// When we got an keypress, which we might need to handle,
+				// When we got a keypress, which we might need to handle,
 				// break the event loop and pass it to GUI code.
 				if (keys)
 					breakLoop = true;
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 00ecdee0480..b912f54e694 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -1588,7 +1588,7 @@ void IMuseInternal::copyGlobalInstrument(byte slot, Instrument *dest) {
 	const byte defaultInstr[30] = { 0 };
 
 	if (_global_instruments[slot].isValid()) {
-		// In case we have an valid instrument set up, copy it to the part.
+		// In case we have a valid instrument set up, copy it to the part.
 		_global_instruments[slot].copy_to(dest);
 	} else if (_soundType == MDT_PCSPK) {
 		debug(0, "Trying to use non-existent global PC Speaker instrument %d", slot);
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 7491ff335e1..008a48a4d8c 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -671,7 +671,7 @@ bool ScummEngine::loadState(int slot, bool compat, Common::String &filename) {
 
 	// Since version 52 a thumbnail is saved directly after the header.
 	if (hdr.ver >= VER(52)) {
-		// Prior to version 75 we always required an thumbnail to be present
+		// Prior to version 75 we always required a thumbnail to be present
 		if (hdr.ver <= VER(74)) {
 			if (!Graphics::checkThumbnailHeader(*in)) {
 				warning("Can not load thumbnail");
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index 910bada8045..d7e58a7c34c 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -361,7 +361,7 @@ void BMVPlayer::t3PrepBMV(const byte *src, uint32 len, int32 deltaOffset) {
 
 	Length of each operation can be encoded either directly or via special variable length encoding. From a nibble two bottom bits are preprended to final value, then next nibble is processed, if a new nibble is needed next byte is read from the stream. Process ends if any of two upper bits are set, in that case two upper bits are prepended as well.
 
-	Which length is going to be used depends on an quite convoluted encoding and there are two ways how they are encoded (note that operations still keep switching).
+	Which length is going to be used depends on a quite convoluted encoding and there are two ways how they are encoded (note that operations still keep switching).
 	In outer loop, if:
 	- hi nibble has any of 2 upper bits set then only byte is read in this iteration and if:
 		- lo nibble has any of 2 upper bits set then length is between 7-30


Commit: d14114e6a9814c9be5866a8f0b84697879c127ef
    https://github.com/scummvm/scummvm/commit/d14114e6a9814c9be5866a8f0b84697879c127ef
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-11T20:56:53+01:00

Commit Message:
COMMON: Fix duplicate "line" word in INIFile warning

Changed paths:
    common/ini-file.cpp


diff --git a/common/ini-file.cpp b/common/ini-file.cpp
index 95d6efc5bfb..3cdaa54d87f 100644
--- a/common/ini-file.cpp
+++ b/common/ini-file.cpp
@@ -163,7 +163,7 @@ bool INIFile::loadFromStream(SeekableReadStream &stream) {
 			// Split string at '=' into 'key' and 'value'. First, find the "=" delimeter.
 			const char *p = strchr(t, '=');
 			if (!p) {
-				warning("Config file buggy: Junk found in line line %d: '%s'", lineno, t);
+				warning("Config file buggy: Junk found in line %d: '%s'", lineno, t);
 				kv.key = String(t);
 				kv.value.clear();
 			}  else {

More information about the Scummvm-git-logs mailing list