[Scummvm-git-logs] scummvm master -> 42b2ac3cb96e7fe88c951a571fd3b9a798c01d52
digitall
noreply at scummvm.org
Wed Jan 1 20:58:53 UTC 2025
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:
42b2ac3cb9 MEDIASTATION: Further Fixes For GCC Compiler Warnings
Commit: 42b2ac3cb96e7fe88c951a571fd3b9a798c01d52
https://github.com/scummvm/scummvm/commit/42b2ac3cb96e7fe88c951a571fd3b9a798c01d52
Author: D G Turner (digitall at scummvm.org)
Date: 2025-01-01T20:58:23Z
Commit Message:
MEDIASTATION: Further Fixes For GCC Compiler Warnings
Changed paths:
engines/mediastation/assets/path.cpp
engines/mediastation/assets/sound.cpp
engines/mediastation/assets/timer.cpp
engines/mediastation/bitmap.cpp
engines/mediastation/context.cpp
engines/mediastation/contextparameters.cpp
engines/mediastation/mediascript/codechunk.cpp
engines/mediastation/mediascript/eventhandler.cpp
engines/mediastation/mediascript/variable.cpp
engines/mediastation/subfile.cpp
diff --git a/engines/mediastation/assets/path.cpp b/engines/mediastation/assets/path.cpp
index a586ecdbdfb..b51f3fbfda0 100644
--- a/engines/mediastation/assets/path.cpp
+++ b/engines/mediastation/assets/path.cpp
@@ -67,7 +67,7 @@ void Path::timePlay() {
}
debugC(5, kDebugScript, "Path::timePlay(): Path playback started");
uint totalSteps = (_header->_duration * _header->_stepRate) / 1000;
- uint stepDurationInMilliseconds = 1000 / _header->_stepRate;
+ //uint stepDurationInMilliseconds = 1000 / _header->_stepRate;
// RUN THE START EVENT HANDLER.
EventHandler *startEventHandler = nullptr; // TODO: Haven't seen a path start event in the wild yet, don't know its ID.
diff --git a/engines/mediastation/assets/sound.cpp b/engines/mediastation/assets/sound.cpp
index d82e565aa99..c2b29a58217 100644
--- a/engines/mediastation/assets/sound.cpp
+++ b/engines/mediastation/assets/sound.cpp
@@ -54,7 +54,7 @@ void Sound::process() {
void Sound::readChunk(Chunk &chunk) {
// TODO: Can we read the chunk directly into the audio stream?
- debugC(5, kDebugLoading, "Sound::readChunk(): (encoding = 0x%x) Reading audio chunk (@0x%llx)", (uint)_encoding, chunk.pos());
+ debugC(5, kDebugLoading, "Sound::readChunk(): (encoding = 0x%x) Reading audio chunk (@0x%llx)", (uint)_encoding, static_cast<long long int>(chunk.pos()));
byte *buffer = (byte *)malloc(chunk.length);
chunk.read((void *)buffer, chunk.length);
@@ -77,7 +77,7 @@ void Sound::readChunk(Chunk &chunk) {
break;
}
}
- debugC(5, kDebugLoading, "Sound::readChunk(): Finished reading audio chunk (@0x%llx)", chunk.pos());
+ debugC(5, kDebugLoading, "Sound::readChunk(): Finished reading audio chunk (@0x%llx)", static_cast<long long int>(chunk.pos()));
}
void Sound::readSubfile(Subfile &subfile, Chunk &chunk) {
@@ -98,4 +98,4 @@ void Sound::readSubfile(Subfile &subfile, Chunk &chunk) {
}
}
-}
\ No newline at end of file
+}
diff --git a/engines/mediastation/assets/timer.cpp b/engines/mediastation/assets/timer.cpp
index 0ccb46d1379..35e9cf9d82c 100644
--- a/engines/mediastation/assets/timer.cpp
+++ b/engines/mediastation/assets/timer.cpp
@@ -93,7 +93,7 @@ void Timer::process() {
}
uint currentTime = g_system->getMillis();
- uint movieTime = currentTime - _startTime;
+ //uint movieTime = currentTime - _startTime;
debugC(7, kDebugScript, "** Timer %d: ON TIME Event Handlers **", _header->_id);
for (EventHandler *timeEvent : _header->_timeHandlers) {
double timeEventInFractionalSeconds = timeEvent->_argumentValue.u.f;
diff --git a/engines/mediastation/bitmap.cpp b/engines/mediastation/bitmap.cpp
index 439a4da7211..c6eff26eb93 100644
--- a/engines/mediastation/bitmap.cpp
+++ b/engines/mediastation/bitmap.cpp
@@ -26,7 +26,7 @@
namespace MediaStation {
BitmapHeader::BitmapHeader(Chunk &chunk) {
- uint header_size_in_bytes = Datum(chunk, DatumType::UINT16_1).u.i;
+ /*uint header_size_in_bytes =*/ Datum(chunk, DatumType::UINT16_1).u.i;
dimensions = Datum(chunk).u.point;
compression_type = BitmapHeader::CompressionType(Datum(chunk, DatumType::UINT16_1).u.i);
debugC(5, kDebugLoading, "BitmapHeader::BitmapHeader(): _compressionType = 0x%x", compression_type);
@@ -206,4 +206,4 @@ void Bitmap::decompress(Chunk &chunk) {
delete[] compressed_image_start;
}
-}
\ No newline at end of file
+}
diff --git a/engines/mediastation/context.cpp b/engines/mediastation/context.cpp
index 2657d70b835..66474b20d8d 100644
--- a/engines/mediastation/context.cpp
+++ b/engines/mediastation/context.cpp
@@ -297,7 +297,7 @@ void Context::play() {
if (_screenAsset == nullptr) {
error("Context::play(): No entry script exists for this context, cannot play it");
}
- EventHandler *entryHandler = nullptr; //_screenAsset->_eventHandlers.getVal(uint32(EventHandler::Type::Entry));
+ //EventHandler *entryHandler = nullptr; //_screenAsset->_eventHandlers.getVal(uint32(EventHandler::Type::Entry));
// So how can we actually execute this script?
// FIND AND EXECUTE THE EXIT SCRIPT.
diff --git a/engines/mediastation/contextparameters.cpp b/engines/mediastation/contextparameters.cpp
index d2327d9577a..1b498882904 100644
--- a/engines/mediastation/contextparameters.cpp
+++ b/engines/mediastation/contextparameters.cpp
@@ -31,7 +31,7 @@ ContextParameters::ContextParameters(Chunk &chunk) : contextName(nullptr) {
fileNumber = Datum(chunk, DatumType::UINT16_1).u.i;
uint sectionType = Datum(chunk, DatumType::UINT16_1).u.i;
while ((SectionType)sectionType != SectionType::EMPTY) {
- debugC(5, kDebugLoading, "ContextParameters::ContextParameters: sectionType = 0x%x (@0x%llx)", sectionType, chunk.pos());
+ debugC(5, kDebugLoading, "ContextParameters::ContextParameters: sectionType = 0x%x (@0x%llx)", sectionType, static_cast<long long int>(chunk.pos()));
switch ((SectionType)sectionType) {
case SectionType::NAME: {
uint repeatedFileNumber = Datum(chunk, DatumType::UINT16_1).u.i;
@@ -40,7 +40,8 @@ ContextParameters::ContextParameters(Chunk &chunk) : contextName(nullptr) {
}
contextName = Datum(chunk, DatumType::STRING).u.string;
// TODO: This is likely just an end flag.
- uint unk1 = Datum(chunk, DatumType::UINT16_1).u.i;
+ /*uint unk1 =*/ Datum(chunk, DatumType::UINT16_1).u.i;
+ break;
}
case SectionType::FILE_NUMBER: {
diff --git a/engines/mediastation/mediascript/codechunk.cpp b/engines/mediastation/mediascript/codechunk.cpp
index 92b7bc83387..ffed27f6815 100644
--- a/engines/mediastation/mediascript/codechunk.cpp
+++ b/engines/mediastation/mediascript/codechunk.cpp
@@ -32,7 +32,7 @@ namespace MediaStation {
CodeChunk::CodeChunk(Common::SeekableReadStream &chunk) : _args(nullptr) {
uint lengthInBytes = Datum(chunk, DatumType::UINT32_1).u.i;
- debugC(5, kDebugLoading, "CodeChunk::CodeChunk(): Length 0x%x (@0x%llx)", lengthInBytes, chunk.pos());
+ debugC(5, kDebugLoading, "CodeChunk::CodeChunk(): Length 0x%x (@0x%llx)", lengthInBytes, static_cast<long long int>(chunk.pos()));
_bytecode = chunk.readStream(lengthInBytes);
}
@@ -295,13 +295,13 @@ Operand CodeChunk::callBuiltInFunction(uint32 id, Common::Array<Operand> &args)
// TODO: Discover and handle the different ways
// effectTransition can be called.
case 1: {
- uint dollarSignVariable = args[0].getInteger();
+ //uint dollarSignVariable = args[0].getInteger();
break;
}
case 3: {
- uint dollarSignVariable = args[0].getInteger();
- double percentComplete = args[1].getDouble();
+ //uint dollarSignVariable = args[0].getInteger();
+ //double percentComplete = args[1].getDouble();
// TODO: Verify that this is a palette!
Asset *asset = args[2].getAsset();
diff --git a/engines/mediastation/mediascript/eventhandler.cpp b/engines/mediastation/mediascript/eventhandler.cpp
index f34e370e38b..dbbcdbacb09 100644
--- a/engines/mediastation/mediascript/eventhandler.cpp
+++ b/engines/mediastation/mediascript/eventhandler.cpp
@@ -26,14 +26,14 @@ namespace MediaStation {
EventHandler::EventHandler(Chunk &chunk) {
_type = (EventHandler::Type)(Datum(chunk).u.i);
- debugC(5, kDebugLoading, "EventHandler::EventHandler(): Type 0x%x (@0x%llx)", _type, chunk.pos());
+ debugC(5, kDebugLoading, "EventHandler::EventHandler(): Type 0x%x (@0x%llx)", _type, static_cast<long long int>(chunk.pos()));
_argumentType = (EventHandler::ArgumentType)(Datum(chunk).u.i);
- debugC(5, kDebugLoading, "EventHandler::EventHandler(): Argument type 0x%x (@0x%llx)", _argumentType, chunk.pos());
+ debugC(5, kDebugLoading, "EventHandler::EventHandler(): Argument type 0x%x (@0x%llx)", _argumentType, static_cast<long long int>(chunk.pos()));
_argumentValue = Datum(chunk);
if (_argumentType != EventHandler::ArgumentType::Null) {
uint lengthInBytes = Datum(chunk, DatumType::UINT32_1).u.i;
- debugC(5, kDebugLoading, "EventHandler::EventHandler(): Null argument type, length = 0x%x (@0x%llx)", lengthInBytes, chunk.pos());
+ debugC(5, kDebugLoading, "EventHandler::EventHandler(): Null argument type, length = 0x%x (@0x%llx)", lengthInBytes, static_cast<long long int>(chunk.pos()));
}
_code = new CodeChunk(chunk);
diff --git a/engines/mediastation/mediascript/variable.cpp b/engines/mediastation/mediascript/variable.cpp
index cec3f2cc8e2..b8f961420be 100644
--- a/engines/mediastation/mediascript/variable.cpp
+++ b/engines/mediastation/mediascript/variable.cpp
@@ -30,7 +30,7 @@ namespace MediaStation {
Variable::Variable(Chunk &chunk) {
id = Datum(chunk, DatumType::UINT16_1).u.i;
type = Variable::Type(Datum(chunk, DatumType::UINT8).u.i);
- debugC(5, kDebugLoading, "Variable::Variable(): id = 0x%x, type 0x%x (@0x%llx)", id, type, chunk.pos());
+ debugC(5, kDebugLoading, "Variable::Variable(): id = 0x%x, type 0x%x (@0x%llx)", id, type, static_cast<long long int>(chunk.pos()));
switch ((Type)type) {
case Type::COLLECTION: {
uint totalItems = Datum(chunk).u.i;
@@ -111,4 +111,4 @@ Variable::~Variable() {
}
}
-} // End of namespace MediaStation
\ No newline at end of file
+} // End of namespace MediaStation
diff --git a/engines/mediastation/subfile.cpp b/engines/mediastation/subfile.cpp
index 874225eb1e7..5f40dd4cb89 100644
--- a/engines/mediastation/subfile.cpp
+++ b/engines/mediastation/subfile.cpp
@@ -30,7 +30,7 @@ Subfile::Subfile() : _stream(nullptr) {}
Subfile::Subfile(Common::SeekableReadStream *stream) : _stream(stream) {
// VERIFY FILE SIGNATURE.
- debugC(5, kDebugLoading, "\n*** Subfile::Subfile(): Got new subfile (@0x%llx) ***", _stream->pos());
+ debugC(5, kDebugLoading, "\n*** Subfile::Subfile(): Got new subfile (@0x%llx) ***", static_cast<long long int>(_stream->pos()));
rootChunk = nextChunk();
if (rootChunk.id != MKTAG('R', 'I', 'F', 'F'))
// TODO: These need to be interpreted as ASCII.
More information about the Scummvm-git-logs
mailing list