[Scummvm-git-logs] scummvm master -> 3357a2093b3136d3daf282e1b8876e08f9766bff
AndywinXp
noreply at scummvm.org
Sat Oct 31 19:30:06 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
3357a2093b GRIM: Fix AmigaOS build and fix warnings
Commit: 3357a2093b3136d3daf282e1b8876e08f9766bff
https://github.com/scummvm/scummvm/commit/3357a2093b3136d3daf282e1b8876e08f9766bff
Author: AndywinXp (andywinxp at gmail.com)
Date: 2026-10-31T20:29:55+01:00
Commit Message:
GRIM: Fix AmigaOS build and fix warnings
Changed paths:
engines/grim/imuse/imuse_dispatch.cpp
engines/grim/imuse/imuse_engine.cpp
engines/grim/imuse/imuse_triggers.cpp
engines/grim/imuse/imuse_triggers.h
diff --git a/engines/grim/imuse/imuse_dispatch.cpp b/engines/grim/imuse/imuse_dispatch.cpp
index 39907c6a565..340e026235e 100644
--- a/engines/grim/imuse/imuse_dispatch.cpp
+++ b/engines/grim/imuse/imuse_dispatch.cpp
@@ -769,7 +769,7 @@ int IMuse::dispatchGetMap(IMuseDispatch *dispatchPtr) {
uint8 *rawMap, *copiedBuf, *soundAddrData, *extFrmtBufPtr;
uint8 bufferHeader[80];
int32 size;
- int32 curChunkPos = 0;
+ int curChunkPos = 0;
int targetSampleRate, targetNumChannels;
dstMap = dispatchPtr->map;
diff --git a/engines/grim/imuse/imuse_engine.cpp b/engines/grim/imuse/imuse_engine.cpp
index 701c398c072..b67f3648d00 100644
--- a/engines/grim/imuse/imuse_engine.cpp
+++ b/engines/grim/imuse/imuse_engine.cpp
@@ -490,15 +490,15 @@ int IMuse::imGetHook(int soundId) {
}
int IMuse::imSetTrigger(int soundId, const char *marker, int opcode, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m, int n) {
- return _triggersHandler->setTrigger(soundId, (char *)marker, opcode, d, e, f, g, h, i, j, k, l, m, n);
+ return _triggersHandler->setTrigger(soundId, marker, opcode, d, e, f, g, h, i, j, k, l, m, n);
}
int IMuse::imCheckTrigger(int soundId, const char *marker, int opcode) {
- return _triggersHandler->checkTrigger(soundId, (char *)marker, opcode);
+ return _triggersHandler->checkTrigger(soundId, marker, opcode);
}
int IMuse::imClearTrigger(int soundId, const char *marker, int opcode) {
- return _triggersHandler->clearTrigger(soundId, (char *)marker, opcode);
+ return _triggersHandler->clearTrigger(soundId, marker, opcode);
}
int IMuse::imDeferCommand(int count, int opcode, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m, int n) {
diff --git a/engines/grim/imuse/imuse_triggers.cpp b/engines/grim/imuse/imuse_triggers.cpp
index f3e19afeef7..d433dc1dbe3 100644
--- a/engines/grim/imuse/imuse_triggers.cpp
+++ b/engines/grim/imuse/imuse_triggers.cpp
@@ -113,7 +113,7 @@ void IMuseTriggersHandler::saveLoad(Common::Serializer &ser) {
_defersOn = 1;
}
-int IMuseTriggersHandler::setTrigger(int soundId, char *marker, int opcode, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m, int n) {
+int IMuseTriggersHandler::setTrigger(int soundId, const char *marker, int opcode, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m, int n) {
Common::StackLock lock(*_mutex);
if (soundId == 0) {
@@ -155,7 +155,7 @@ int IMuseTriggersHandler::setTrigger(int soundId, char *marker, int opcode, int
return -6;
}
-int IMuseTriggersHandler::checkTrigger(int soundId, char *marker, int opcode) {
+int IMuseTriggersHandler::checkTrigger(int soundId, const char *marker, int opcode) {
Common::StackLock lock(*_mutex);
int r = 0;
@@ -173,7 +173,7 @@ int IMuseTriggersHandler::checkTrigger(int soundId, char *marker, int opcode) {
return r;
}
-int IMuseTriggersHandler::clearTrigger(int soundId, char *marker, int opcode) {
+int IMuseTriggersHandler::clearTrigger(int soundId, const char *marker, int opcode) {
Common::StackLock lock(*_mutex);
for (int l = 0; l < IMUSE_MAX_TRIGGERS; l++) {
diff --git a/engines/grim/imuse/imuse_triggers.h b/engines/grim/imuse/imuse_triggers.h
index c935065e8f6..44da0017a6a 100644
--- a/engines/grim/imuse/imuse_triggers.h
+++ b/engines/grim/imuse/imuse_triggers.h
@@ -49,9 +49,9 @@ public:
int init();
int clearAllTriggers();
void saveLoad(Common::Serializer &ser);
- int setTrigger(int soundId, char *marker, int opcode, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m, int n);
- int checkTrigger(int soundId, char *marker, int opcode);
- int clearTrigger(int soundId, char *marker, int opcode);
+ int setTrigger(int soundId, const char *marker, int opcode, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m, int n);
+ int checkTrigger(int soundId, const char *marker, int opcode);
+ int clearTrigger(int soundId, const char *marker, int opcode);
void processTriggers(int soundId, char *marker);
int deferCommand(int count, int opcode, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m, int n);
void loop();
More information about the Scummvm-git-logs
mailing list