[Scummvm-git-logs] scummvm master -> 7f4c0c93911b868f2cfc2153111543cdc77cbfa0

sev- noreply at scummvm.org
Tue Sep 19 13:22:58 UTC 2023 

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

Summary:
947c62fd67 FREESCAPE: Fix sanity check for ObjectType
ffe8869bb5 GRIM: Fix warning about unused variable
ea542c4619 GROOVIE: Add more debug output
8787d9ccb3 HPL1: Remove unused variable
f5460fceb5 HPL1: Remove unused variable
e4eb58ecf0 HPL1: Fix warnings
98dc4748c7 HYPNO: Fix warning
b2bde8711d KYRA: Comment out unused class variable
e44879c036 JANITORIAL: Remove trailing spaces
21bb9f3a84 KYRA: Remove redundant (and incorrect) variable clapping
15866dc113 MM: MM1: Comment out unused class variables
5a2fbed061 MM: MM1: Remove redundant copy constructor
a2c96b6233 MM: XEEN: Remove unused variable
bef7fd845d NANCY: Fix warning
146c3df549 NGI: Fix warning
755086d5f4 SCI: Shut several "unused variable" warnings
b032f66030 SHERLOCK: Comment out unused variables
0916e19a48 STARK: Added missing override keywords
d294553c42 SWORD1: Comment out unused class constant
31e83c2d8e ULTIMA: Fix warnings
7523b108c5 WATCHMAKER: Fix warnings
7f4c0c9391 JANITORIAL: Remove trailing whitepaces


Commit: 947c62fd67ddb680f825c86719a126b4fe6e9df4
    https://github.com/scummvm/scummvm/commit/947c62fd67ddb680f825c86719a126b4fe6e9df4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:23:07+02:00

Commit Message:
FREESCAPE: Fix sanity check for ObjectType

Since it is assigned to an enum, that comparison was always false

Changed paths:
    engines/freescape/loaders/8bitBinaryLoader.cpp


diff --git a/engines/freescape/loaders/8bitBinaryLoader.cpp b/engines/freescape/loaders/8bitBinaryLoader.cpp
index 0fd74a05f06..52b64f4afc6 100644
--- a/engines/freescape/loaders/8bitBinaryLoader.cpp
+++ b/engines/freescape/loaders/8bitBinaryLoader.cpp
@@ -275,7 +275,7 @@ Object *FreescapeEngine::load8bitObject(Common::SeekableReadStream *file) {
 	// object ID
 	uint16 objectID = readField(file, 8);
 
-	if (objectID == 224 && objectType == 29)
+	if (objectID == 224 && (rawFlagsAndType & 0x1F) == 29) // If objectType is out of range, fix it
 		objectType = (ObjectType)7;
 
 	// size of object on disk; we've accounted for 8 bytes


Commit: ffe8869bb5d34b655bf6b9800ed9583b2b9d2faf
    https://github.com/scummvm/scummvm/commit/ffe8869bb5d34b655bf6b9800ed9583b2b9d2faf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:25:48+02:00

Commit Message:
GRIM: Fix warning about unused variable

Changed paths:
    engines/grim/lua/lstx.cpp


diff --git a/engines/grim/lua/lstx.cpp b/engines/grim/lua/lstx.cpp
index cf4021b4021..59351b7078b 100644
--- a/engines/grim/lua/lstx.cpp
+++ b/engines/grim/lua/lstx.cpp
@@ -1447,6 +1447,7 @@ yyerrlab:   /* here on detecting error */
 	if (! yyerrstatus) {
 		/* If not already recovering from an error, report this error.  */
 		++yynerrs;
+		(void)yynerrs;
 		yyerror("parse error");
 	}
 


Commit: ea542c46191ea3cec318c19fb2ec0461e2378cd1
    https://github.com/scummvm/scummvm/commit/ea542c46191ea3cec318c19fb2ec0461e2378cd1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:27:17+02:00

Commit Message:
GROOVIE: Add more debug output

Changed paths:
    engines/groovie/cursor.cpp


diff --git a/engines/groovie/cursor.cpp b/engines/groovie/cursor.cpp
index c2bc06018c6..4d601da6a5e 100644
--- a/engines/groovie/cursor.cpp
+++ b/engines/groovie/cursor.cpp
@@ -220,6 +220,7 @@ byte *GrvCursorMan_t7g::loadImage(Common::SeekableReadStream &file) {
 			}
 		}
 	}
+	debug(9, "GrvCursorMan_t7g::loadImage(): decompressed %d bytes", decompbytes);
 
 	return cursorStorage;
 }


Commit: 8787d9ccb337d1a3f2a69da1a2246afc5cf5041c
    https://github.com/scummvm/scummvm/commit/8787d9ccb337d1a3f2a69da1a2246afc5cf5041c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:28:03+02:00

Commit Message:
HPL1: Remove unused variable

Changed paths:
    engines/hpl1/engine/graphics/font_data.cpp


diff --git a/engines/hpl1/engine/graphics/font_data.cpp b/engines/hpl1/engine/graphics/font_data.cpp
index 6bc5e0bae1e..c84dc39c208 100644
--- a/engines/hpl1/engine/graphics/font_data.cpp
+++ b/engines/hpl1/engine/graphics/font_data.cpp
@@ -311,11 +311,9 @@ void FontData::getWordWrapRows(float afLength, float afFontHeight, cVector2f avS
 		apRowVec->push_back(asString);
 	} else {
 		first_letter = 0;
-		unsigned int i = 0;
 
 		for (tUIntListIt it = RowLengthList.begin(); it != RowLengthList.end(); ++it) {
 			apRowVec->push_back(asString.substr(first_letter, *it - first_letter));
-			i++;
 			first_letter = *it + 1;
 		}
 		apRowVec->push_back(asString.substr(first_letter));


Commit: f5460fceb59cd16b8d3670781b8f17e36864b497
    https://github.com/scummvm/scummvm/commit/f5460fceb59cd16b8d3670781b8f17e36864b497
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:28:52+02:00

Commit Message:
HPL1: Remove unused variable

Changed paths:
    engines/hpl1/engine/scene/TileMap.cpp


diff --git a/engines/hpl1/engine/scene/TileMap.cpp b/engines/hpl1/engine/scene/TileMap.cpp
index 4766bd34f50..3c3f5615290 100644
--- a/engines/hpl1/engine/scene/TileMap.cpp
+++ b/engines/hpl1/engine/scene/TileMap.cpp
@@ -265,8 +265,6 @@ void cTileMap::AddTileLayerFront(cTileLayer *apLayer) {
 //-----------------------------------------------------------------------
 
 void cTileMap::RenderTileData(cTile *apTile, int alLayer) {
-	static int count = 0;
-
 	cTileDataNormal *pData = static_cast<cTileDataNormal *>(apTile->GetTileData());
 	if (pData == NULL)
 		return;
@@ -279,8 +277,6 @@ void cTileMap::RenderTileData(cTile *apTile, int alLayer) {
 											_obj,
 											NULL, apTile->GetPositionPtr());
 	mpGraphics->GetRenderer2D()->AddObject(_obj2);
-
-	count++;
 }
 
 //-----------------------------------------------------------------------


Commit: e4eb58ecf0e8ffb4d6790dc90769e7244365bf26
    https://github.com/scummvm/scummvm/commit/e4eb58ecf0e8ffb4d6790dc90769e7244365bf26
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:34:59+02:00

Commit Message:
HPL1: Fix warnings

Changed paths:
    engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp
    engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp
    engines/hpl1/penumbra-overture/PlayerHands.cpp


diff --git a/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp b/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp
index 1ae4ea8b483..a61ae4869d8 100644
--- a/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp
+++ b/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp
@@ -3557,7 +3557,7 @@ void dgPolyhedra::ConvexPartition(const dgFloat64 *const vertex,
 		DeleteDegenerateFaces(vertex, strideInBytes, dgFloat32(1.0e-5f));
 
 		if (GetCount()) {
-			dgInt32 removeCount = 0;
+			//dgInt32 removeCount = 0;
 			dgInt32 stride = dgInt32(strideInBytes / sizeof(dgFloat64));
 
 			dgInt32 polygon[1024 * 8];
@@ -3664,14 +3664,14 @@ void dgPolyhedra::ConvexPartition(const dgFloat64 *const vertex,
 							if (isConvex) {
 								for (dgInt32 j = 0; j < diagonalCount; j++) {
 									dgEdge *const diagonal = diagonalsPool[j];
-									removeCount++;
+									//removeCount++;
 									flatFace.DeleteEdge(diagonal);
 								}
 							} else {
 								for (dgInt32 j = 0; j < diagonalCount; j++) {
 									dgEdge *const diagonal = diagonalsPool[j];
 									if (!IsEssensialDiagonal(diagonal, normal, vertex, stride)) {
-										removeCount++;
+										//removeCount++;
 										flatFace.DeleteEdge(diagonal);
 									}
 								}
diff --git a/engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp b/engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp
index 6cdf9cf6c72..62268464676 100644
--- a/engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp
+++ b/engines/hpl1/engine/libraries/newton/physics/dgWorldDynamicUpdate.cpp
@@ -3739,7 +3739,7 @@ void dgJacobianMemory::CalculateForcesSimulationMode(dgFloat32 maxAccNorm) const
 	dgInt32 prevJoint;
 	dgInt32 maxPasses;
 	dgInt32 forceRows;
-	dgInt32 totalPassesCount;
+	//dgInt32 totalPassesCount;
 	dgFloat32 akNum;
 	dgFloat32 accNorm;
 	dgFloat32 *const force = m_force;
@@ -4006,7 +4006,7 @@ void dgJacobianMemory::CalculateForcesSimulationMode(dgFloat32 maxAccNorm) const
 	}
 
 	maxPasses = forceRows;
-	totalPassesCount = 0;
+	//totalPassesCount = 0;
 	for (passes = 0; (passes < maxPasses) && (accNorm > maxAccNorm); passes++) {
 		dgInt32 clampedForceIndex;
 		dgInt32 clampedForceJoint;
@@ -4257,7 +4257,7 @@ void dgJacobianMemory::CalculateForcesSimulationMode(dgFloat32 maxAccNorm) const
 				}
 			}
 		}
-		totalPassesCount++;
+		//totalPassesCount++;
 	}
 	ApplyExternalForcesAndAcceleration(maxAccNorm);
 }
diff --git a/engines/hpl1/penumbra-overture/PlayerHands.cpp b/engines/hpl1/penumbra-overture/PlayerHands.cpp
index d76c016964a..56eaf047665 100644
--- a/engines/hpl1/penumbra-overture/PlayerHands.cpp
+++ b/engines/hpl1/penumbra-overture/PlayerHands.cpp
@@ -610,7 +610,7 @@ void cPlayerHands::UpdatePrevPostions() {
 	cVector3f vRotation(0, 0, 0);
 	cVector3f vPosition(0, 0, 0);
 	float fRotNum = 0;
-	float fPosNum = 0;
+	//float fPosNum = 0;
 
 	// float fRotMulStart = 1.0f;
 	// float fRotMulEnd = 0.1f;
@@ -626,7 +626,7 @@ void cPlayerHands::UpdatePrevPostions() {
 
 	for (tVector3fListIt it = mlstPositions.begin(); it != mlstPositions.end(); ++it) {
 		vPosition += *it;
-		fPosNum++;
+		//fPosNum++;
 	}
 
 	mvSmoothCameraPos = vCamPosition; // vPosition / fPosNum;


Commit: 98dc4748c7054cb36ec73dea26bedcd9836cd3b2
    https://github.com/scummvm/scummvm/commit/98dc4748c7054cb36ec73dea26bedcd9836cd3b2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:35:38+02:00

Commit Message:
HYPNO: Fix warning

Changed paths:
    engines/hypno/spider/hard.cpp


diff --git a/engines/hypno/spider/hard.cpp b/engines/hypno/spider/hard.cpp
index 5493d16ab60..9257a3f1564 100644
--- a/engines/hypno/spider/hard.cpp
+++ b/engines/hypno/spider/hard.cpp
@@ -1001,7 +1001,7 @@ void SpiderEngine::runFuseBox(Code *code) {
 	};
 
 	Common::Rect matrix(289, 89, 551, 351);
-	Common::Point fuse(292, 87);
+	//Common::Point fuse(292, 87);
 	Common::Point vz(289, 89);
 	Common::Point hz(289, 89);
 
@@ -1194,4 +1194,4 @@ void SpiderEngine::showCredits() {
 	_nextLevel = "mainmenu.mi_";
 }
 
-} // End of namespace Hypno
\ No newline at end of file
+} // End of namespace Hypno


Commit: b2bde8711dcb7e5cfa2cd42f55144639272f6727
    https://github.com/scummvm/scummvm/commit/b2bde8711dcb7e5cfa2cd42f55144639272f6727
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:38:39+02:00

Commit Message:
KYRA: Comment out unused class variable

Changed paths:
    engines/kyra/graphics/screen_eob.h
    engines/kyra/graphics/screen_eob_pc98.cpp


diff --git a/engines/kyra/graphics/screen_eob.h b/engines/kyra/graphics/screen_eob.h
index 4a69d41e0b0..32ac4781405 100644
--- a/engines/kyra/graphics/screen_eob.h
+++ b/engines/kyra/graphics/screen_eob.h
@@ -404,7 +404,7 @@ public:
 private:
 	uint16 convert(uint16 c) const;
 	const char *_convTable1, *_convTable2;
-	bool _defaultConv;
+	//bool _defaultConv;
 };
 
 /**
diff --git a/engines/kyra/graphics/screen_eob_pc98.cpp b/engines/kyra/graphics/screen_eob_pc98.cpp
index 93a2b08ab1e..ce9eb77983d 100644
--- a/engines/kyra/graphics/screen_eob_pc98.cpp
+++ b/engines/kyra/graphics/screen_eob_pc98.cpp
@@ -210,7 +210,7 @@ uint16 SJISFontEoB1PC98::convert(uint16 c) const {
 }
 
 SJISFontEoB2PC98::SJISFontEoB2PC98(Common::SharedPtr<Graphics::FontSJIS> &font, /*uint8 shadowColor,*/ const char *convTable1, const char *convTable2) : SJISFont(font, 0, false, false, 0),
-/*_shadowColor(shadowColor),*/ _convTable1(convTable1), _convTable2(convTable2), _defaultConv(true) {
+/*_shadowColor(shadowColor),*/ _convTable1(convTable1), _convTable2(convTable2)/*, _defaultConv(true)*/ {
 	assert(_convTable1);
 	assert(_convTable2);
 }


Commit: e44879c03617c52e7890a67f71e913c5f7e9b2a0
    https://github.com/scummvm/scummvm/commit/e44879c03617c52e7890a67f71e913c5f7e9b2a0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:39:07+02:00

Commit Message:
JANITORIAL: Remove trailing spaces

Changed paths:
    engines/kyra/sound/drivers/capcom98.cpp


diff --git a/engines/kyra/sound/drivers/capcom98.cpp b/engines/kyra/sound/drivers/capcom98.cpp
index 8a130bf426d..b215ac6472f 100644
--- a/engines/kyra/sound/drivers/capcom98.cpp
+++ b/engines/kyra/sound/drivers/capcom98.cpp
@@ -493,7 +493,7 @@ CapcomPC98Player_MIDI::CapcomPC98Player_MIDI(MidiDriver::DeviceHandle dev, bool
 	uint8 *map = new uint8[128];
 	assert(map);
 
-	if (isMT32) {		
+	if (isMT32) {
 		memcpy(map, _programMapping_mt32ToGM, 128);
 	} else {
 		for (uint8 i = 0; i < 128; ++i)
@@ -584,7 +584,7 @@ void CapcomPC98Player_MIDI::updateMasterVolume()  {
 		for (int i = 4; i < 8; ++i)
 			chk += mt32VolSysEx[i];
 		mt32VolSysEx[8] = 0x80 - (chk & 0x7f);
-		_midi->sysEx(mt32VolSysEx, sizeof(mt32VolSysEx));	
+		_midi->sysEx(mt32VolSysEx, sizeof(mt32VolSysEx));
 	} else {
 		uint16 vol = _musicVolume * 0x3FFF / Audio::Mixer::kMaxMixerVolume;
 		byte vl = vol & 0x7F;
@@ -921,7 +921,7 @@ void CapcomPC98_FMChannel::setupVibrato() {
 		_vbrState = _vbrDelayTicker ? 0 : ((_instrument.vbrType == 2 ? -3072 : 3072) << 16);
 		_vbrCycleTicker = _instrument.vbrCycleLength - 1;
 		_vbrHandler = _vbrHandlers[_instrument.vbrType];
-		
+
 		break;
 
 	default:
@@ -1151,7 +1151,7 @@ bool CapcomPC98Player_FM::init() {
 	if (!(_chan && _ac && _ac->init()))
 		return false;
 
-	if (_volControlMask == 0xFFFF) 
+	if (_volControlMask == 0xFFFF)
 		setVolControlMask();
 
 	_ac->writeReg(0, 7, 0xBF);


Commit: 21bb9f3a84a5a817b5deb488bc4201d56cd088af
    https://github.com/scummvm/scummvm/commit/21bb9f3a84a5a817b5deb488bc4201d56cd088af
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:39:20+02:00

Commit Message:
KYRA: Remove redundant (and incorrect) variable clapping

Changed paths:
    engines/kyra/sound/drivers/capcom98.cpp


diff --git a/engines/kyra/sound/drivers/capcom98.cpp b/engines/kyra/sound/drivers/capcom98.cpp
index b215ac6472f..7696651dfd3 100644
--- a/engines/kyra/sound/drivers/capcom98.cpp
+++ b/engines/kyra/sound/drivers/capcom98.cpp
@@ -840,9 +840,6 @@ void CapcomPC98_FMChannel::updateVolume() {
 		vol += (((a * b) & 0x7FFF) >> 7);
 		vol += s[1];
 
-		if (vol > 0x7f)
-			vol=vol;
-
 		vol = MIN<uint16>(vol, 0x7F);
 
 		_ac->writeReg(0, 0x40 + i, vol & 0xFF);


Commit: 15866dc113ed266fa01ebbbc6f954ceb6c8822b3
    https://github.com/scummvm/scummvm/commit/15866dc113ed266fa01ebbbc6f954ceb6c8822b3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:43:25+02:00

Commit Message:
MM: MM1: Comment out unused class variables

Changed paths:
    engines/mm/mm1/views/spells/duplication.h


diff --git a/engines/mm/mm1/views/spells/duplication.h b/engines/mm/mm1/views/spells/duplication.h
index 1caef30617e..f05395aa684 100644
--- a/engines/mm/mm1/views/spells/duplication.h
+++ b/engines/mm/mm1/views/spells/duplication.h
@@ -33,9 +33,9 @@ namespace Spells {
 class Duplication : public SpellView, public MM1::Game::Duplication {
 private:
 	enum Mode { SELECT_ITEM, CAST };
-	Mode _mode = SELECT_ITEM;
-	char _direction = '\0';
-	int _squares = 0;
+	//Mode _mode = SELECT_ITEM;
+	//char _direction = '\0';
+	//int _squares = 0;
 
 public:
 	/**


Commit: 5a2fbed0616136bc974c4f2086af1a35dde9106e
    https://github.com/scummvm/scummvm/commit/5a2fbed0616136bc974c4f2086af1a35dde9106e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:43:51+02:00

Commit Message:
MM: MM1: Remove redundant copy constructor

Default one will work equally fine

Changed paths:
    engines/mm/mm1/messages.cpp
    engines/mm/mm1/messages.h


diff --git a/engines/mm/mm1/messages.cpp b/engines/mm/mm1/messages.cpp
index 9b1f58852ca..f52271b7584 100644
--- a/engines/mm/mm1/messages.cpp
+++ b/engines/mm/mm1/messages.cpp
@@ -97,18 +97,6 @@ InfoMessage::InfoMessage(int x1, int y1, const Common::String &str1,
 	_lines.push_back(Line(x2, y2, str2));
 }
 
-InfoMessage &InfoMessage::operator=(const InfoMessage &src) {
-	_lines = src._lines;
-	_callback = src._callback;
-	_nCallback = src._nCallback;
-	_keyCallback = src._keyCallback;
-	_largeMessage = src._largeMessage;
-	_sound = src._sound;
-	_delaySeconds = src._delaySeconds;
-	_fontReduced = src._fontReduced;
-	return *this;
-}
-
 size_t Line::size() const {
 	return _text.size();
 }
diff --git a/engines/mm/mm1/messages.h b/engines/mm/mm1/messages.h
index ac5e8efa126..5ccf6b950c3 100644
--- a/engines/mm/mm1/messages.h
+++ b/engines/mm/mm1/messages.h
@@ -157,8 +157,6 @@ struct InfoMessage : public Message {
 	InfoMessage(int x1, int y1, const Common::String &str1,
 		int x2, int y2, const Common::String &str2,
 		KeyCallback keyCallback);
-
-	InfoMessage &operator=(const InfoMessage &src);
 };
 
 struct SoundMessage : public InfoMessage {


Commit: a2c96b62334e0cba0f5d9ecc92f7d32af9261eb0
    https://github.com/scummvm/scummvm/commit/a2c96b62334e0cba0f5d9ecc92f7d32af9261eb0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:44:18+02:00

Commit Message:
MM: XEEN: Remove unused variable

Changed paths:
    engines/mm/xeen/interface_scene.cpp


diff --git a/engines/mm/xeen/interface_scene.cpp b/engines/mm/xeen/interface_scene.cpp
index 049b290795f..4c5118c0e43 100644
--- a/engines/mm/xeen/interface_scene.cpp
+++ b/engines/mm/xeen/interface_scene.cpp
@@ -2674,7 +2674,6 @@ void InterfaceScene::setMonsterSprite(DrawStruct &drawStruct, MazeMonster &monst
 void InterfaceScene::setIndoorsObjects() {
 	Common::Point mazePos = _vm->_party->_mazePosition;
 	Direction dir = _vm->_party->_mazeDirection;
-	Common::Point pt;
 	_objNumber = -1;
 
 	Common::Array<MazeObject> &objects = _vm->_map->_mobData._objects;


Commit: bef7fd845d77fabfc5e43809e89f61f0fe8cf19a
    https://github.com/scummvm/scummvm/commit/bef7fd845d77fabfc5e43809e89f61f0fe8cf19a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:44:58+02:00

Commit Message:
NANCY: Fix warning

Changed paths:
    engines/nancy/misc/lightning.h


diff --git a/engines/nancy/misc/lightning.h b/engines/nancy/misc/lightning.h
index f80b7ce300a..371b6c1bb4e 100644
--- a/engines/nancy/misc/lightning.h
+++ b/engines/nancy/misc/lightning.h
@@ -42,7 +42,7 @@ private:
 	void handlePulse(bool on);
 	void handleThunder();
 
-	bool _isRunning = false;
+	//bool _isRunning = false;
 	LightningState _state = kNotRunning;
 
 	int16 _minRGBPercent = 0;


Commit: 146c3df54966973c2ba5f460872643b8d51eca3b
    https://github.com/scummvm/scummvm/commit/146c3df54966973c2ba5f460872643b8d51eca3b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:46:12+02:00

Commit Message:
NGI: Fix warning

Changed paths:
    engines/ngi/fullpipe/scene09.cpp


diff --git a/engines/ngi/fullpipe/scene09.cpp b/engines/ngi/fullpipe/scene09.cpp
index 72ccdc2e84d..ac6ff441e0e 100644
--- a/engines/ngi/fullpipe/scene09.cpp
+++ b/engines/ngi/fullpipe/scene09.cpp
@@ -86,9 +86,7 @@ void scene09_initScene(Scene *sc) {
 
 	g_vars->scene09_hangers.push_back(hng);
 
-	int x = 75;
-
-	for (int i = 1; x < 300; i++, x += 75) {
+	for (int x = 75; x < 300; x += 75) {
 		StaticANIObject *ani = new StaticANIObject(hanger);
 
 		ani->show1(x + hanger->_ox, hanger->_oy, MV_VSN_CYCLE2, 0);


Commit: 755086d5f4f07c04fc9d1511f3c2d2ee3f42fdef
    https://github.com/scummvm/scummvm/commit/755086d5f4f07c04fc9d1511f3c2d2ee3f42fdef
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:50:09+02:00

Commit Message:
SCI: Shut several "unused variable" warnings

Changed paths:
    engines/sci/console.cpp
    engines/sci/engine/kvideo.cpp
    engines/sci/sound/music.cpp


diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index d93d5b87b1e..4ed32927ead 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -4732,7 +4732,7 @@ bool Console::processGameFlagsOperation(GameFlagsOperation op, int argc, const c
 		} else {
 			flagMask = 0x8000 >> (flagNumber % 16);
 		}
-		
+
 		// set or clear the flag
 		bool already = false;
 		if (op == kGameFlagsSet) {
@@ -4750,7 +4750,7 @@ bool Console::processGameFlagsOperation(GameFlagsOperation op, int argc, const c
 				globalReg->setOffset(globalValue);
 			}
 		}
-		
+
 		const char *result = (globalValue & flagMask) ? "set" : "clear";
 		debugPrintf("Flag %d is %s%s (global var %d, flag %04x)\n",
 					flagNumber, already ? "already " : "", result, globalNumber, flagMask);
@@ -5038,6 +5038,8 @@ static int parse_reg_t(EngineState *s, const char *str, reg_t *dest) {
 			if (dest->isNull())
 				return 1;
 		}
+
+		(void)charsCountLetter; // Shut "unused variable" warning
 	}
 	if (offsetStr) {
 		int val = strtol(offsetStr, &endptr, 16);
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index 388b8e3bc17..403d62ae882 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -313,7 +313,7 @@ reg_t kShowMovieWinOpen(EngineState *s, int argc, reg_t *argv) {
 	// so just ignore it
 	if (getSciVersion() > SCI_VERSION_2) {
 		++argv;
-		--argc;
+		//--argc;
 	}
 
 	const Common::String fileName = s->_segMan->getString(argv[0]);
@@ -325,7 +325,7 @@ reg_t kShowMovieWinInit(EngineState *s, int argc, reg_t *argv) {
 	// so just ignore it
 	if (getSciVersion() > SCI_VERSION_2) {
 		++argv;
-		--argc;
+		//--argc;
 	}
 
 	// argv[0] is a broken x-coordinate
@@ -363,7 +363,7 @@ reg_t kShowMovieWinCue(EngineState *s, int argc, reg_t *argv) {
 	// so just ignore it
 	if (getSciVersion() > SCI_VERSION_2) {
 		++argv;
-		--argc;
+		//--argc;
 	}
 
 	const uint16 frameNo = argv[0].toUint16();
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index ce1ac0282b4..72b544b8179 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -537,7 +537,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
 				// but _does_ update channel state (including volume) with
 				// them. Specifically, prio/voices, patch, volume, pan.
 				// This should probably be implemented in MidiParser_SCI::loadMusic.
-				// 
+				//
 				// UPDATE: While we could change how we handle it, we DO
 				// read the commands into the channel data arrays when we call
 				// trackState(). So, I think what we do has the same result...
@@ -1231,6 +1231,7 @@ void SciMusic::remapChannels(bool mainThread) {
 				if (channelUsed[j])
 					debug(" Unmapping song %d, channel %d", songIndex, j);
 #endif
+				(void)songIndex;
 			}
 		}
 	}


Commit: b032f660302f738e05f314347588f1502643fd15
    https://github.com/scummvm/scummvm/commit/b032f660302f738e05f314347588f1502643fd15
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:54:00+02:00

Commit Message:
SHERLOCK: Comment out unused variables

Changed paths:
    engines/sherlock/tattoo/tattoo_user_interface.cpp
    engines/sherlock/tattoo/widget_talk.cpp


diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 68ab86a0d02..35b02e5f389 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -93,9 +93,9 @@ void TattooUserInterface::lookAtObject() {
 	} else {
 		// Check if there is a Look animation
 		if (_bgShape->_lookcAnim != 0) {
-			int cAnimSpeed = _bgShape->_lookcAnim & 0xe0;
-			cAnimSpeed >>= 5;
-			++cAnimSpeed;
+			//int cAnimSpeed = _bgShape->_lookcAnim & 0xe0;
+			//cAnimSpeed >>= 5;
+			//++cAnimSpeed;
 
 			_cAnimFramePause = _bgShape->_lookFrames;
 			desc = _bgShape->_examine;
diff --git a/engines/sherlock/tattoo/widget_talk.cpp b/engines/sherlock/tattoo/widget_talk.cpp
index 025bbab255e..a8159b4dffc 100644
--- a/engines/sherlock/tattoo/widget_talk.cpp
+++ b/engines/sherlock/tattoo/widget_talk.cpp
@@ -43,15 +43,17 @@ WidgetTalk::WidgetTalk(SherlockEngine *vm) : WidgetBase(vm) {
 }
 
 void WidgetTalk::getTalkWindowSize() {
-	TattooTalk &talk = *(TattooTalk *)_vm->_talk;
+	//TattooTalk &talk = *(TattooTalk *)_vm->_talk;
 	int width, height;
 
 	// See how many statements are going to be available
+#if 0
 	int numStatements = 0;
 	for (uint idx = 0; idx < talk._statements.size(); ++idx) {
 		if (talk._statements[idx]._talkMap != -1)
 			++numStatements;
 	}
+#endif
 
 	width = SHERLOCK_SCREEN_WIDTH * 2 / 3;
 


Commit: 0916e19a482b27a4fba5fa0daf4797a9bda01a8f
    https://github.com/scummvm/scummvm/commit/0916e19a482b27a4fba5fa0daf4797a9bda01a8f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:54:32+02:00

Commit Message:
STARK: Added missing override keywords

Changed paths:
    engines/stark/formats/xarc.cpp


diff --git a/engines/stark/formats/xarc.cpp b/engines/stark/formats/xarc.cpp
index 16cb78b30f0..b3d7687d678 100644
--- a/engines/stark/formats/xarc.cpp
+++ b/engines/stark/formats/xarc.cpp
@@ -41,8 +41,8 @@ public:
 	Common::SeekableReadStream *createReadStream() const override;
 	Common::SeekableReadStream *createReadStreamForAltStream(Common::AltStreamType altStreamType) const override;
 	Common::String getName() const override { return _name; }
-	Common::Path getPathInArchive() const { return _name; }
-	Common::String getFileName() const { return _name; }
+	Common::Path getPathInArchive() const override { return _name; }
+	Common::String getFileName() const override { return _name; }
 	uint32 getLength() const { return _length; }
 	uint32 getOffset() const { return _offset; }
 


Commit: d294553c42de2a1d385b9a6215adf3c8c5121ad4
    https://github.com/scummvm/scummvm/commit/d294553c42de2a1d385b9a6215adf3c8c5121ad4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T14:55:13+02:00

Commit Message:
SWORD1: Comment out unused class constant

Changed paths:
    engines/sword1/screen.h


diff --git a/engines/sword1/screen.h b/engines/sword1/screen.h
index 6cd1a4ca74a..ab2fb152a58 100644
--- a/engines/sword1/screen.h
+++ b/engines/sword1/screen.h
@@ -110,7 +110,7 @@ private:
 	const uint8 _green[3]  = { 0  << 2, 63 << 2, 0  << 2};
 	const uint8 _purple[3] = { 32 << 2, 0  << 2, 32 << 2};
 	const uint8 _black[3]  = { 0  << 2, 0  << 2, 0  << 2};
-	const uint8 _grey[3]   = { 32 << 2, 32 << 2, 32 << 2};
+	//const uint8 _grey[3]   = { 32 << 2, 32 << 2, 32 << 2};
 
 	struct PaletteFadeInfo {
 		int16 paletteStatus;


Commit: 31e83c2d8ecc523e6034c352218218f1e99f7bcc
    https://github.com/scummvm/scummvm/commit/31e83c2d8ecc523e6034c352218218f1e99f7bcc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T15:01:22+02:00

Commit Message:
ULTIMA: Fix warnings

Changed paths:
    engines/ultima/nuvie/core/effect.cpp
    engines/ultima/nuvie/core/tile_manager.cpp
    engines/ultima/nuvie/files/u6_lib_n.cpp
    engines/ultima/ultima1/widgets/overworld_monster.cpp


diff --git a/engines/ultima/nuvie/core/effect.cpp b/engines/ultima/nuvie/core/effect.cpp
index 457818fc732..6f915317e42 100644
--- a/engines/ultima/nuvie/core/effect.cpp
+++ b/engines/ultima/nuvie/core/effect.cpp
@@ -1141,6 +1141,7 @@ bool FadeEffect::pixelated_fade_core(uint32 pixels_to_check, sint16 fade_to) {
 		}
 		++p;
 	}
+	(void)colored; // Fix warning about unused variable
 	// all but two lines colored
 	if (colored_total >= (pixel_count - fade_width * 2) || fade_iterations > FADE_EFFECT_MAX_ITERATIONS) { // fill the rest
 		if (fade_to >= 0)
diff --git a/engines/ultima/nuvie/core/tile_manager.cpp b/engines/ultima/nuvie/core/tile_manager.cpp
index 1ff0fb8d50c..b4bdc788330 100644
--- a/engines/ultima/nuvie/core/tile_manager.cpp
+++ b/engines/ultima/nuvie/core/tile_manager.cpp
@@ -515,7 +515,6 @@ bool TileManager::loadAnimData() {
 
 void TileManager::decodePixelBlockTile(unsigned char *tile_data, uint16 tile_num) {
 	uint8 len;
-	uint8 i;
 	uint16 disp;
 	uint8 x;
 	unsigned char *ptr;
@@ -529,7 +528,7 @@ void TileManager::decodePixelBlockTile(unsigned char *tile_data, uint16 tile_num
 
 	memset(data_ptr, 0xff, 256); //set all pixels to transparent.
 
-	for (i = 0; ; i++) {
+	for (;;) {
 		disp = (ptr[0] + (ptr[1] << 8));
 
 		x = disp % 160 + (disp >= 1760 ? 160 : 0);
diff --git a/engines/ultima/nuvie/files/u6_lib_n.cpp b/engines/ultima/nuvie/files/u6_lib_n.cpp
index 80fe77fd94a..1e7f69c6a6c 100644
--- a/engines/ultima/nuvie/files/u6_lib_n.cpp
+++ b/engines/ultima/nuvie/files/u6_lib_n.cpp
@@ -334,6 +334,7 @@ void U6Lib_n::load_index(Common::ReadStream *index_f) {
 		offset_str[0] = '\0';
 		oc = 0;
 	}
+	(void)entry_count; // Fix "unused varable" warning
 }
 
 
diff --git a/engines/ultima/ultima1/widgets/overworld_monster.cpp b/engines/ultima/ultima1/widgets/overworld_monster.cpp
index 8fa6386eb42..8f0b756af6a 100644
--- a/engines/ultima/ultima1/widgets/overworld_monster.cpp
+++ b/engines/ultima/ultima1/widgets/overworld_monster.cpp
@@ -67,7 +67,7 @@ void OverworldMonster::attackParty() {
 	Point playerPos = _map->_playerWidget->_position;
 	Point diff = playerPos - _position;
 	Point delta(SGN(diff.x), SGN(diff.y));
-	Point tempDiff;
+	//Point tempDiff;
 	//int maxDistance = attackDistance();
 	Shared::Maps::MapTile mapTile;
 	//Shared::Character &c = *_game->_party;


Commit: 7523b108c5765929ff91f71a6bf7a2dd9e2b8ec4
    https://github.com/scummvm/scummvm/commit/7523b108c5765929ff91f71a6bf7a2dd9e2b8ec4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T15:10:15+02:00

Commit Message:
WATCHMAKER: Fix warnings

Changed paths:
    engines/watchmaker/3d/loader.cpp
    engines/watchmaker/3d/render/render.cpp
    engines/watchmaker/3d/t3d_body.cpp
    engines/watchmaker/game.h
    engines/watchmaker/walk/walk.cpp


diff --git a/engines/watchmaker/3d/loader.cpp b/engines/watchmaker/3d/loader.cpp
index 6f1b5c086aa..35c179cb59c 100644
--- a/engines/watchmaker/3d/loader.cpp
+++ b/engines/watchmaker/3d/loader.cpp
@@ -560,11 +560,11 @@ void t3dOptimizeMaterialList(t3dBODY *b) {
 	// TODO: The optimization leaves a bunch of materials as nullptr, we need to update all the
 	// references to them. Currently we do this by subtracting 1 from all references that were above
 	// a removed material. This works, but isn't really optimal.
-	int subtract = 0;
+	//int subtract = 0;
 	for (uint32 i = 0; i < b->NumMaterials(); i++) {
 		if (!b->MatTable[i]) {
 			b->MatTable.remove_at(i);
-			subtract++;
+			//subtract++;
 			for (uint32 k = 0; k < b->NumMeshes(); k++) {
 				auto &m = b->MeshTable[k];
 				for (int q = 0; q < m.NumFaces(); q++) {
diff --git a/engines/watchmaker/3d/render/render.cpp b/engines/watchmaker/3d/render/render.cpp
index be40f288429..8ceae6b5204 100644
--- a/engines/watchmaker/3d/render/render.cpp
+++ b/engines/watchmaker/3d/render/render.cpp
@@ -398,7 +398,7 @@ void RenderGeometry(void) {
 bool rRenderScene(void) {
 	unsigned int    i, j;
 	bool            hres;
-	static unsigned int dwFrameCount = 0;
+	//static unsigned int dwFrameCount = 0;
 
 	g_renderer->setRenderState(RenderState::LIGHT, false);
 	g_renderer->setRenderState(RenderState::CLIP, true);
@@ -560,7 +560,7 @@ bool rRenderScene(void) {
 //	NumBatchBlocksLightmaps=0;
 	NumBatchBlocksSky = 0;
 
-	dwFrameCount++;
+	//dwFrameCount++;
 
 	return TRUE;
 	// End the scene.
diff --git a/engines/watchmaker/3d/t3d_body.cpp b/engines/watchmaker/3d/t3d_body.cpp
index 2d131d7919c..cc3e4d2a93f 100644
--- a/engines/watchmaker/3d/t3d_body.cpp
+++ b/engines/watchmaker/3d/t3d_body.cpp
@@ -103,6 +103,7 @@ void t3dLoadMaterials(WGame &game, t3dBODY *b, Common::SeekableReadStream &strea
 		}
 		assert(mat->Texture);
 	}//__for_material
+	(void)loader_numtextures;
 }
 
 void t3dLoadMeshes(t3dBODY *b, uint32 numMeshes, t3dMESH *&ReceiveRipples, uint8 &Mirror, Common::SeekableReadStream &stream) {
diff --git a/engines/watchmaker/game.h b/engines/watchmaker/game.h
index dfc9c3c4866..e90a918e55d 100644
--- a/engines/watchmaker/game.h
+++ b/engines/watchmaker/game.h
@@ -54,7 +54,7 @@ class RoomManager;
 
 class WGame {
 	bool g_bReady, g_bActive;
-	bool g_bSkipActive = false;
+	//bool g_bSkipActive = false;
 	const char *CharName[32];
 	uint32 LoadChar;
 	MeshModifiers *_meshModifiers;
diff --git a/engines/watchmaker/walk/walk.cpp b/engines/watchmaker/walk/walk.cpp
index 22e16ecbced..a00afffd3f6 100644
--- a/engines/watchmaker/walk/walk.cpp
+++ b/engines/watchmaker/walk/walk.cpp
@@ -798,6 +798,7 @@ void ForceAnimInBounds(int32 oc) {
 			}
 		}
 	}
+	(void)inters;
 }
 
 } // End of namespace Watchmaker


Commit: 7f4c0c93911b868f2cfc2153111543cdc77cbfa0
    https://github.com/scummvm/scummvm/commit/7f4c0c93911b868f2cfc2153111543cdc77cbfa0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T15:16:20+02:00

Commit Message:
JANITORIAL: Remove trailing whitepaces

Changed paths:
    common/compression/gentee_installer.cpp


diff --git a/common/compression/gentee_installer.cpp b/common/compression/gentee_installer.cpp
index 7abda6a1a09..618832e5844 100644
--- a/common/compression/gentee_installer.cpp
+++ b/common/compression/gentee_installer.cpp
@@ -267,7 +267,7 @@ void DecompressorState::resetEverything() {
 		b = 0;
 
 	_windowOffset = 0;
-	
+
 	uint16 nextValue = 0;
 	for (int i = 0; i < 30; i++) {
 		_matchVLCOffsets[i] = nextValue;

More information about the Scummvm-git-logs mailing list