[Scummvm-git-logs] scummvm master -> 2eeb4c9f089d96e1ac3b52385eb9e0fd340e0b00

digitall noreply at scummvm.org
Sat Apr 1 21:39:44 UTC 2023


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:
2eeb4c9f08 VCRUISE: Fix GCC Compiler Warnings


Commit: 2eeb4c9f089d96e1ac3b52385eb9e0fd340e0b00
    https://github.com/scummvm/scummvm/commit/2eeb4c9f089d96e1ac3b52385eb9e0fd340e0b00
Author: D G Turner (digitall at scummvm.org)
Date: 2023-04-01T22:39:19+01:00

Commit Message:
VCRUISE: Fix GCC Compiler Warnings

Changed paths:
    engines/vcruise/runtime.cpp


diff --git a/engines/vcruise/runtime.cpp b/engines/vcruise/runtime.cpp
index cd0658585dc..d7e857a8471 100644
--- a/engines/vcruise/runtime.cpp
+++ b/engines/vcruise/runtime.cpp
@@ -3089,7 +3089,7 @@ LoadGameOutcome Runtime::loadGame(Common::ReadStream *stream) {
 		const StackValue *stackArgsPtr = &this->_scriptStack[stackSize - (n)];                \
 		for (uint i = 0; i < (n); i++) {                                                      \
 			if (stackArgsPtr[i].type != StackValue::kNumber)                                  \
-				error("Expected op argument %u to be a number");                              \
+				error("Expected op argument %u to be a number", i);                           \
 			arrayName[i] = stackArgsPtr[i].value.i;                                           \
 		}                                                                                     \
 		this->_scriptStack.resize(stackSize - (n));                                           \
@@ -3108,7 +3108,7 @@ LoadGameOutcome Runtime::loadGame(Common::ReadStream *stream) {
 		const StackValue *stackArgsPtr = &this->_scriptStack[stackSize - (n)]; \
 		for (uint i = 0; i < (n); i++) {                                       \
 			if (stackArgsPtr[i].type != StackValue::kNumber)                   \
-				error("Expected op argument %u to be a string");               \
+				error("Expected op argument %u to be a string", i);            \
 			arrayName[i] = Common::move(stackArgsPtr[i].value.s);              \
 		}                                                                      \
 		this->_scriptStack.resize(stackSize - (n));                            \
@@ -3888,8 +3888,9 @@ void Runtime::scriptOpSay1(ScriptArg_t arg) {
 	SoundInstance *cachedSound = nullptr;
 	resolveSoundByName(sndNameArgs[0], soundID, cachedSound);
 
-	// uint ? = sndParamArgs[0];
-	// uint cycleLength = sndParamArgs[1];
+	// uint unk = sndParamArgs[0];
+	uint cycleLength = sndParamArgs[1];
+	debug(5, "Say1 cycle length: %u", cycleLength);
 
 	if (cachedSound)
 		triggerSound(false, *cachedSound, 100, 0, false, true);




More information about the Scummvm-git-logs mailing list