[Scummvm-git-logs] scummvm master -> 8e87fe8c49de55e16749a634d6030c53ffc98b72

[athrxx]

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

Summary:
8e87fe8c49 KYRA: get rid of wshadow warnings


Commit: 8e87fe8c49de55e16749a634d6030c53ffc98b72
    https://github.com/scummvm/scummvm/commit/8e87fe8c49de55e16749a634d6030c53ffc98b72
Author: athrxx (athrxx at scummvm.org)
Date: 2022-09-18T21:59:23+02:00

Commit Message:
KYRA: get rid of wshadow warnings

Changed paths:
    engines/kyra/gui/gui_eob_segacd.cpp
    engines/kyra/sequence/seqplayer_eob_segacd.cpp
    engines/kyra/sequence/seqplayer_eob_segacd.h
    engines/kyra/sound/drivers/halestorm.cpp


diff --git a/engines/kyra/gui/gui_eob_segacd.cpp b/engines/kyra/gui/gui_eob_segacd.cpp
index 075384fd15e..0a4d3aee199 100644
--- a/engines/kyra/gui/gui_eob_segacd.cpp
+++ b/engines/kyra/gui/gui_eob_segacd.cpp
@@ -290,7 +290,7 @@ void EoBEngine::gui_displayMap() {
 		removeInputTop();
 
 		drawMapSpots(level, animState < 20 ? 0 : 1);
-		bool update = (animState == 0 || animState == 20);
+		bool needupdate = (animState == 0 || animState == 20);
 		if (++animState == 40)
 			animState = 0;
 
@@ -302,7 +302,7 @@ void EoBEngine::gui_displayMap() {
 				drawMapPage(level);
 		}
 
-		if (update) {
+		if (needupdate) {
 			r->render(0);
 			_screen->updateScreen();
 		}
diff --git a/engines/kyra/sequence/seqplayer_eob_segacd.cpp b/engines/kyra/sequence/seqplayer_eob_segacd.cpp
index d08455149ff..39cfe907405 100644
--- a/engines/kyra/sequence/seqplayer_eob_segacd.cpp
+++ b/engines/kyra/sequence/seqplayer_eob_segacd.cpp
@@ -220,8 +220,8 @@ bool SegaSequencePlayer::play(int id) {
 	return true;
 }
 
-void SegaSequencePlayer::pause(bool pause) {
-	if (pause)
+void SegaSequencePlayer::pause(bool togglePause) {
+	if (togglePause)
 		_pauseStart = _vm->_system->getMillis();
 	else
 		_frameTimer += (_vm->_system->getMillis() - _pauseStart);
diff --git a/engines/kyra/sequence/seqplayer_eob_segacd.h b/engines/kyra/sequence/seqplayer_eob_segacd.h
index 4ff68836fcb..d5287fd19f7 100644
--- a/engines/kyra/sequence/seqplayer_eob_segacd.h
+++ b/engines/kyra/sequence/seqplayer_eob_segacd.h
@@ -40,7 +40,7 @@ public:
 	~SegaSequencePlayer();
 
 	bool play(int id);
-	void pause(bool pause);
+	void pause(bool togglePause);
 
 private:
 	void run(const uint8 *data);
diff --git a/engines/kyra/sound/drivers/halestorm.cpp b/engines/kyra/sound/drivers/halestorm.cpp
index 7201c0a5e49..39983f7a18e 100644
--- a/engines/kyra/sound/drivers/halestorm.cpp
+++ b/engines/kyra/sound/drivers/halestorm.cpp
@@ -171,7 +171,7 @@ public:
 	void setTempo(uint32 tempo);
 	void setTicksPerSecond(uint32 tps);
 
-	uint16 tempo() const { return _internalTempo; }
+	uint16 getTempo() const { return _internalTempo; }
 
 public:
 	int _numChanMusic;
@@ -763,7 +763,7 @@ bool HSMidiParser::nextTick(HSSong &song) {
 			s->status = 'R';
 			checkPos = false;
 		} else {
-			s->ticker -= song.tempo();
+			s->ticker -= song.getTempo();
 			if (s->ticker >= 0)
 				continue;
 		}