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

[sev-]

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:
3dfa5f805a SCUMM: Added missing override keywords
6ebd112a40 SCUMM: Remove superfluous 'extern' keyword
fd91ac61c2 SCUMM: Rename global variables in accordance with our naming conventions


Commit: 3dfa5f805a84aa8fcb395f5e876fdb2de3adb3aa
    https://github.com/scummvm/scummvm/commit/3dfa5f805a84aa8fcb395f5e876fdb2de3adb3aa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-01-29T12:58:02+01:00

Commit Message:
SCUMM: Added missing override keywords

Changed paths:
    engines/scumm/players/player_mac_indy3.cpp


diff --git a/engines/scumm/players/player_mac_indy3.cpp b/engines/scumm/players/player_mac_indy3.cpp
index 752fe7ff2e6..2f94029bf6b 100644
--- a/engines/scumm/players/player_mac_indy3.cpp
+++ b/engines/scumm/players/player_mac_indy3.cpp
@@ -154,12 +154,12 @@ public:
 	~I3MFourToneSynthDriver() override;
 
 	void feed(int8 *dst, uint32 len, Audio::Mixer::SoundType type, bool expectStereo) override;
-	void start();
-	void stop();
+	void start() override;
+	void stop() override;
 
-	void setDuration(uint16 duration);
+	void setDuration(uint16 duration) override;
 	void setWaveForm(uint8 chan, const uint8 *data, uint32 dataSize);
-	void setRate(uint8 chan, uint16 rate);
+	void setRate(uint8 chan, uint16 rate) override;
 
 private:
 	uint32 _pos;


Commit: 6ebd112a400774481b81c003e6d8114ce46da5f0
    https://github.com/scummvm/scummvm/commit/6ebd112a400774481b81c003e6d8114ce46da5f0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-01-29T12:58:20+01:00

Commit Message:
SCUMM: Remove superfluous 'extern' keyword

Changed paths:
    engines/scumm/players/player_v2base.cpp


diff --git a/engines/scumm/players/player_v2base.cpp b/engines/scumm/players/player_v2base.cpp
index 8f89952c348..0c46921a59d 100644
--- a/engines/scumm/players/player_v2base.cpp
+++ b/engines/scumm/players/player_v2base.cpp
@@ -648,7 +648,7 @@ void Player_V2Base::nextTick() {
 	}
 }
 
-extern const uint8 *_pv2ModTbl = reinterpret_cast<const uint8*>(freqmod_table);
+const uint8 *_pv2ModTbl = reinterpret_cast<const uint8*>(freqmod_table);
 extern const uint32 _pv2ModTblSize = ARRAYSIZE(freqmod_table);
 
 } // End of namespace Scumm


Commit: fd91ac61c2f3a289cab4b66570231e570941d8f5
    https://github.com/scummvm/scummvm/commit/fd91ac61c2f3a289cab4b66570231e570941d8f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-01-29T12:59:33+01:00

Commit Message:
SCUMM: Rename global variables in accordance with our naming conventions

Changed paths:
    engines/scumm/players/player_mac_indy3.cpp
    engines/scumm/players/player_v2base.cpp


diff --git a/engines/scumm/players/player_mac_indy3.cpp b/engines/scumm/players/player_mac_indy3.cpp
index 2f94029bf6b..9e95e712bdd 100644
--- a/engines/scumm/players/player_mac_indy3.cpp
+++ b/engines/scumm/players/player_mac_indy3.cpp
@@ -34,8 +34,8 @@ namespace Scumm {
 #define PCM_BUFFER_SIZE		1024
 #define RATECNV_BIT_PRECSN	24
 
-extern const uint8 *_pv2ModTbl;
-extern const uint32 _pv2ModTblSize;
+extern const uint8 *g_pv2ModTbl;
+extern const uint32 g_pv2ModTblSize;
 
 class I3MPlayer;
 class AudioStream_I3M : public Audio::AudioStream {
@@ -1169,7 +1169,7 @@ uint16 savedOffset = 0;
 I3MPlayer::MusicChannel *I3MPlayer::MusicChannel::_ctrlChan = nullptr;
 
 I3MPlayer::MusicChannel::MusicChannel(I3MPlayer *pl) : _player(pl), _vars(nullptr), _numVars(0), _ctrlProc(nullptr),
-	_resSize(0), _savedOffset(savedOffset), _modShapes(_pv2ModTbl), _modShapesTableSize(_pv2ModTblSize) {
+	_resSize(0), _savedOffset(savedOffset), _modShapes(g_pv2ModTbl), _modShapesTableSize(g_pv2ModTblSize) {
 	static const CtrlProc ctrl[8] {
 		&I3MPlayer::MusicChannel::ctrl_setShape,
 		&I3MPlayer::MusicChannel::ctrl_modPara,
diff --git a/engines/scumm/players/player_v2base.cpp b/engines/scumm/players/player_v2base.cpp
index 0c46921a59d..3c6004bcf61 100644
--- a/engines/scumm/players/player_v2base.cpp
+++ b/engines/scumm/players/player_v2base.cpp
@@ -648,7 +648,7 @@ void Player_V2Base::nextTick() {
 	}
 }
 
-const uint8 *_pv2ModTbl = reinterpret_cast<const uint8*>(freqmod_table);
-extern const uint32 _pv2ModTblSize = ARRAYSIZE(freqmod_table);
+const uint8 *g_pv2ModTbl = reinterpret_cast<const uint8*>(freqmod_table);
+extern const uint32 g_pv2ModTblSize = ARRAYSIZE(freqmod_table);
 
 } // End of namespace Scumm