[Scummvm-git-logs] scummvm master -> 9368284fc412025dc0f78fdec3e69d0b25d34536

[digitall]

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:
9d8c243517 STARK: Fix Signed vs. Unsigned Comparison GCC Warning
9368284fc4 ICB: Fix Set-But-Unused-Variable GCC Compiler Warnings


Commit: 9d8c243517119ff15268ddc8debca7c0a831d672
    https://github.com/scummvm/scummvm/commit/9d8c243517119ff15268ddc8debca7c0a831d672
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-19T00:34:49Z

Commit Message:
STARK: Fix Signed vs. Unsigned Comparison GCC Warning

Changed paths:
    engines/stark/ui/world/actionmenu.cpp


diff --git a/engines/stark/ui/world/actionmenu.cpp b/engines/stark/ui/world/actionmenu.cpp
index 9dc355b83d..bded2fcb6c 100644
--- a/engines/stark/ui/world/actionmenu.cpp
+++ b/engines/stark/ui/world/actionmenu.cpp
@@ -151,7 +151,7 @@ void ActionMenu::onRender() {
 
 	for (uint i = 0; i < ARRAYSIZE(_buttons); i++) {
 		if (_buttons[i].enabled) {
-			VisualImageXMG *visual = StarkGameInterface->getActionImage(_buttons[i].action, i == _activeMenuType);
+			VisualImageXMG *visual = StarkGameInterface->getActionImage(_buttons[i].action, (int32)i == _activeMenuType);
 			visual->render(Common::Point(_buttons[i].rect.left, _buttons[i].rect.top), false);
 		}
 	}


Commit: 9368284fc412025dc0f78fdec3e69d0b25d34536
    https://github.com/scummvm/scummvm/commit/9368284fc412025dc0f78fdec3e69d0b25d34536
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-19T00:35:11Z

Commit Message:
ICB: Fix Set-But-Unused-Variable GCC Compiler Warnings

Changed paths:
    engines/icb/remora_pc.cpp
    engines/icb/sound/fx_manager.cpp


diff --git a/engines/icb/remora_pc.cpp b/engines/icb/remora_pc.cpp
index f084db2040..f8b15b3303 100644
--- a/engines/icb/remora_pc.cpp
+++ b/engines/icb/remora_pc.cpp
@@ -1081,7 +1081,7 @@ void _remora::DrawPulse() {
 	int32 nHighlightIndex;
 	int32 pnWholePulse[REMORA_PULSE_POINTS * REMORA_MAX_HEALTH][2];
 	float pfHighlightValues[REMORA_PULSE_POINTS * REMORA_MAX_HEALTH];
-	int32 nBaseX, nBaseY;
+	//int32 nBaseX, nBaseY;
 	int32 nX1, nY1, nX2, nY2;
 	_rgb oLineColour, oDrawColour;
 	uint32 nWholePulseIndex;
@@ -1092,8 +1092,8 @@ void _remora::DrawPulse() {
 	uint32 nHits, nHealth;
 
 	// Calculate a base drawing point for the whole thing.
-	nBaseX = REMORA_PULSE_X;
-	nBaseY = REMORA_PULSE_Y;
+	//nBaseX = REMORA_PULSE_X;
+	//nBaseY = REMORA_PULSE_Y;
 
 	// Work out player's health.
 	pPlayer = (c_game_object *)MS->objects->Fetch_item_by_name("player");
diff --git a/engines/icb/sound/fx_manager.cpp b/engines/icb/sound/fx_manager.cpp
index 10fc08bccc..9e6c106b2f 100644
--- a/engines/icb/sound/fx_manager.cpp
+++ b/engines/icb/sound/fx_manager.cpp
@@ -68,8 +68,6 @@ bool8 FxManager::Poll() {
 	if (noSoundEngine)
 		return TRUE8;
 
-	uint32 frequency;
-
 	// Update all buffers
 	for (int32 id = 0; id < MAX_FX; id++) {
 		switch (m_effects[id].flags) {
@@ -81,8 +79,8 @@ bool8 FxManager::Poll() {
 				g_icb->_mixer->setChannelVolume(m_effects[id]._handle, m_effects[id].volume * volumeConversion);
 				g_icb->_mixer->setChannelBalance(m_effects[id]._handle, m_effects[id].pan);
 
-				frequency = (m_effects[id].pitch * g_stub->cycle_speed) / 100;
 				// FIXME correct pitch control
+				//uint32 frequency = (m_effects[id].pitch * g_stub->cycle_speed) / 100;
 				//m_effects[id].buffer->SetFrequency( frequency ) ;
 				//alSourcef(m_effects[id].alStream.source, AL_PITCH, 1.0f);
 			}
@@ -99,13 +97,14 @@ bool8 FxManager::Poll() {
 			m_effects[id].delay--;
 			if (m_effects[id].delay != 0)
 				break;
+			// FIXME: fallthrough intentional?
 
 		// It's waiting to play
 		case Effect::QUEUED: {
 
 			// Apply current settings
-			frequency = (m_effects[id].pitch * g_stub->cycle_speed) / 100;
-			// FIXME corrent pitch control
+			// FIXME correct pitch control
+			//uint32 frequency = (m_effects[id].pitch * g_stub->cycle_speed) / 100;
 			//m_effects[id].buffer->SetFrequency( frequency ) ;
 			//alSourcef(m_effects[id].alStream.source, AL_PITCH, 1.0f);