[Scummvm-git-logs] scummvm master -> 3070007c2668039695614082a9bc29b724be72e6

[AndywinXp]

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:
ae02bf6ab8 SCUMM: Make chosen random numbers visible via debug level 6
3070007c26 SCUMM: iMUSE: Remove debug messages from mutex lock/unlock


Commit: ae02bf6ab8735fee97a6399d56e30e5a3d40fe51
    https://github.com/scummvm/scummvm/commit/ae02bf6ab8735fee97a6399d56e30e5a3d40fe51
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-04-02T18:24:28+02:00

Commit Message:
SCUMM: Make chosen random numbers visible via debug level 6

Changed paths:
    engines/scumm/script_v5.cpp
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index ec188fe63a7..3b095e8248a 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1446,7 +1446,10 @@ void ScummEngine_v5::o5_getObjectState() {
 
 void ScummEngine_v5::o5_getRandomNr() {
 	getResultPos();
-	setResult(_rnd.getRandomNumber(getVarOrDirectByte(PARAM_1)));
+	int rnd = _rnd.getRandomNumber(getVarOrDirectByte(PARAM_1));
+	setResult(rnd);
+
+	debug(6, "o5_getRandomNr(): %d", rnd);
 }
 
 void ScummEngine_v5::o5_isScriptRunning() {
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 1347fd38566..21023275a33 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -1439,6 +1439,8 @@ void ScummEngine_v6::o6_getRandomNumber() {
 	if (VAR_RANDOM_NR != 0xFF)
 		VAR(VAR_RANDOM_NR) = rnd;
 	push(rnd);
+
+	debug(6, "o6_getRandomNumber(): %d", rnd);
 }
 
 void ScummEngine_v6::o6_getRandomNumberRange() {
@@ -1466,6 +1468,8 @@ void ScummEngine_v6::o6_getRandomNumberRange() {
 	if (VAR_RANDOM_NR != 0xFF)
 		VAR(VAR_RANDOM_NR) = rnd;
 	push(rnd);
+
+	debug(6, "o6_getRandomNumberRange(): %d (min: %d, max: %d)", rnd, min, max);
 }
 
 void ScummEngine_v6::o6_isScriptRunning() {


Commit: 3070007c2668039695614082a9bc29b724be72e6
    https://github.com/scummvm/scummvm/commit/3070007c2668039695614082a9bc29b724be72e6
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-04-02T18:24:28+02:00

Commit Message:
SCUMM: iMUSE: Remove debug messages from mutex lock/unlock

These were cluttering the log on debug level 6, since the messages
were displayed on callback functions. We also make room for RNG
debug messages, also on level 6. If these messages will be needed
again in the future we can figure out a way to make these non intrusive.

Changed paths:
    engines/scumm/imuse/imuse.cpp


diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 547b4be9c55..2043794f82e 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -79,7 +79,7 @@ IMuseInternal::~IMuseInternal() {
 	// interrupt us, and then do the rest outside
 	// the mutex.
 	{
-		Common::StackLock lock(_mutex, "IMuseInternal::~IMuseInternal()");
+		Common::StackLock lock(_mutex);
 		_initialized = false;
 		stopAllSounds_internal();
 	}
@@ -341,7 +341,7 @@ void IMuseInternal::init_parts() {
 ////////////////////////////////////////
 
 void IMuseInternal::on_timer(MidiDriver *midi) {
-	Common::StackLock lock(_mutex, "IMuseInternal::on_timer()");
+	Common::StackLock lock(_mutex);
 	if (_paused || !_initialized)
 		return;
 
@@ -351,7 +351,7 @@ void IMuseInternal::on_timer(MidiDriver *midi) {
 }
 
 void IMuseInternal::pause(bool paused) {
-	Common::StackLock lock(_mutex, "IMuseInternal::pause()");
+	Common::StackLock lock(_mutex);
 	if (_paused == paused)
 		return;
 	int vol = _music_volume;
@@ -386,7 +386,7 @@ static void syncWithSerializer(Common::Serializer &s, ImTrigger &it) {
 }
 
 void IMuseInternal::saveLoadIMuse(Common::Serializer &s, ScummEngine *scumm, bool fixAfterLoad) {
-	Common::StackLock lock(_mutex, "IMuseInternal::saveLoadIMuse()");
+	Common::StackLock lock(_mutex);
 
 	int i;
 
@@ -451,18 +451,18 @@ void IMuseInternal::saveLoadIMuse(Common::Serializer &s, ScummEngine *scumm, boo
 }
 
 bool IMuseInternal::get_sound_active(int sound) const {
-	Common::StackLock lock(_mutex, "IMuseInternal::get_sound_active()");
+	Common::StackLock lock(_mutex);
 	return getSoundStatus_internal(sound, false) != 0;
 }
 
 int32 IMuseInternal::doCommand(int numargs, int a[]) {
-	Common::StackLock lock(_mutex, "IMuseInternal::doCommand()");
+	Common::StackLock lock(_mutex);
 	return doCommand_internal(numargs, a);
 }
 
 
 uint32 IMuseInternal::property(int prop, uint32 value) {
-	Common::StackLock lock(_mutex, "IMuseInternal::property()");
+	Common::StackLock lock(_mutex);
 	switch (prop) {
 	case IMuse::PROP_TEMPO_BASE:
 		// This is a specified as a percentage of normal
@@ -491,12 +491,12 @@ uint32 IMuseInternal::property(int prop, uint32 value) {
 void IMuseInternal::addSysexHandler(byte mfgID, sysexfunc handler) {
 	// TODO: Eventually support multiple sysEx handlers and pay
 	// attention to the client-supplied manufacturer ID.
-	Common::StackLock lock(_mutex, "IMuseInternal::property()");
+	Common::StackLock lock(_mutex);
 	_sysex = handler;
 }
 
 void IMuseInternal::startSoundWithNoteOffset(int sound, int offset) {
-	Common::StackLock lock(_mutex, "IMuseInternal::startSound()");
+	Common::StackLock lock(_mutex);
 	startSound_internal(sound, offset);
 }
 
@@ -507,7 +507,7 @@ void IMuseInternal::startSoundWithNoteOffset(int sound, int offset) {
 ////////////////////////////////////////
 
 void IMuseInternal::setMusicVolume(int vol) {
-	Common::StackLock lock(_mutex, "IMuseInternal::setMusicVolume()");
+	Common::StackLock lock(_mutex);
 	if (vol > 255)
 		vol = 255;
 	if (_music_volume == vol)
@@ -522,27 +522,27 @@ void IMuseInternal::setMusicVolume(int vol) {
 }
 
 void IMuseInternal::startSound(int sound) {
-	Common::StackLock lock(_mutex, "IMuseInternal::startSound()");
+	Common::StackLock lock(_mutex);
 	startSound_internal(sound);
 }
 
 void IMuseInternal::stopSound(int sound) {
-	Common::StackLock lock(_mutex, "IMuseInternal::stopSound()");
+	Common::StackLock lock(_mutex);
 	stopSound_internal(sound);
 }
 
 void IMuseInternal::stopAllSounds() {
-	Common::StackLock lock(_mutex, "IMuseInternal::stopAllSounds()");
+	Common::StackLock lock(_mutex);
 	stopAllSounds_internal();
 }
 
 int IMuseInternal::getSoundStatus(int sound) const {
-	Common::StackLock lock(_mutex, "IMuseInternal::getSoundStatus()");
+	Common::StackLock lock(_mutex);
 	return getSoundStatus_internal(sound, true);
 }
 
 int IMuseInternal::getMusicTimer() {
-	Common::StackLock lock(_mutex, "IMuseInternal::getMusicTimer()");
+	Common::StackLock lock(_mutex);
 	int best_time = 0;
 	const Player *player = _players;
 	for (int i = ARRAYSIZE(_players); i; i--, player++) {