[Scummvm-git-logs] scummvm master -> 9354d6c3e30bf738cd4351a647d4f211b1158924
bluegr
noreply at scummvm.org
Sat Mar 1 20:13:04 UTC 2025
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3fa6263af5 COMMON: Initialize class member in MemcachingCaseInsensitiveArchive
02011e8e0d DGDS: Fix warnings
11f6080127 SAGA: Fix warning in the key handling code when SAGA_DEBUG is false
3c6fe219ad SLUDGE: Fix incorrect order of parameters passed to debugChannelSet()
6f0438bc77 DIRECTOR: Fix warning
ff79b4ab8d NANCY: Fix warning
7d9f2a175d AGS: Fix a warning in the script creation code
9354d6c3e3 VIDEO: Render the first frame of PSX video files after they are loaded
Commit: 3fa6263af5ed9908690e8ab93ad78bb162411b85
https://github.com/scummvm/scummvm/commit/3fa6263af5ed9908690e8ab93ad78bb162411b85
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-01T22:12:33+02:00
Commit Message:
COMMON: Initialize class member in MemcachingCaseInsensitiveArchive
Changed paths:
common/archive.h
diff --git a/common/archive.h b/common/archive.h
index c479b10ccf8..ebec6350f21 100644
--- a/common/archive.h
+++ b/common/archive.h
@@ -317,7 +317,7 @@ private:
mutable HashMap<CacheKey, SharedArchiveContents, CacheKey_Hash, CacheKey_EqualTo> _cache;
uint32 _maxStronglyCachedSize;
- char _separator;
+ char _separator = '\0';
};
/**
Commit: 02011e8e0d59ced011c89ede07d204a53ea725fc
https://github.com/scummvm/scummvm/commit/02011e8e0d59ced011c89ede07d204a53ea725fc
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-01T22:12:34+02:00
Commit Message:
DGDS: Fix warnings
Changed paths:
engines/dgds/image.cpp
diff --git a/engines/dgds/image.cpp b/engines/dgds/image.cpp
index dca26ed708f..774277811ca 100644
--- a/engines/dgds/image.cpp
+++ b/engines/dgds/image.cpp
@@ -367,13 +367,13 @@ void Image::loadBitmap4(Graphics::ManagedSurface *surf, uint32 toffset, Common::
stream->skip(toffset >> 1);
if (highByte) {
- for (uint i = 0; i < tw * th; i += 2) {
+ for (uint32 i = 0; i < tw * th; i += 2) {
byte val = stream->readByte();
data[i + 0] |= val & 0xF0;
data[i + 1] |= (val & 0x0F) << 4;
}
} else {
- for (uint i = 0; i < tw * th; i += 2) {
+ for (uint32 i = 0; i < tw * th; i += 2) {
byte val = stream->readByte();
data[i + 0] |= (val & 0xF0) >> 4;
data[i + 1] |= val & 0x0F;
@@ -509,7 +509,7 @@ uint32 Image::loadVQT(Graphics::ManagedSurface *surf, uint32 toffset, Common::Se
uint32 th = surf->h;
assert(th != 0);
assert(DgdsEngine::getInstance()->getGameId() != GID_CASTAWAY);
- if (th > SCREEN_HEIGHT)
+ if (th > (uint32)SCREEN_HEIGHT)
error("Max VQT height supported is 200px");
VQTDecodeState state;
state.dstPtr = (byte *)surf->getPixels();
Commit: 11f60801273c189318de1239cfdf298773a4aa37
https://github.com/scummvm/scummvm/commit/11f60801273c189318de1239cfdf298773a4aa37
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-01T22:12:35+02:00
Commit Message:
SAGA: Fix warning in the key handling code when SAGA_DEBUG is false
Changed paths:
engines/saga/input.cpp
diff --git a/engines/saga/input.cpp b/engines/saga/input.cpp
index c9b7e410842..8cf9de9d8a3 100644
--- a/engines/saga/input.cpp
+++ b/engines/saga/input.cpp
@@ -76,6 +76,7 @@ int SagaEngine::processInput() {
return SUCCESS;
}
+#ifdef SAGA_DEBUG
switch (event.kbd.keycode) {
#if 0
case Common::KEYCODE_KP_MINUS:
@@ -92,7 +93,6 @@ int SagaEngine::processInput() {
break;
#endif
-#ifdef SAGA_DEBUG
case Common::KEYCODE_F1:
_render->toggleFlag(RF_SHOW_FPS);
_actor->_handleActionDiv = (_actor->_handleActionDiv == 15) ? 50 : 15;
@@ -114,11 +114,13 @@ int SagaEngine::processInput() {
break;
case Common::KEYCODE_F8:
break;
-#endif
default:
_interface->processAscii(event.kbd, event.customType);
break;
}
+#else
+ _interface->processAscii(event.kbd, event.customType);
+#endif
break;
case Common::EVENT_LBUTTONUP:
_leftMouseButtonPressed = false;
Commit: 3c6fe219ad8081169ab70ccff1e2e8a8a21bf4e8
https://github.com/scummvm/scummvm/commit/3c6fe219ad8081169ab70ccff1e2e8a8a21bf4e8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-01T22:12:36+02:00
Commit Message:
SLUDGE: Fix incorrect order of parameters passed to debugChannelSet()
Changed paths:
engines/sludge/function.cpp
diff --git a/engines/sludge/function.cpp b/engines/sludge/function.cpp
index 3b2db60910f..1aaedcb9102 100644
--- a/engines/sludge/function.cpp
+++ b/engines/sludge/function.cpp
@@ -218,7 +218,7 @@ bool continueFunction(LoadedFunction *fun) {
param = fun->compiledLines[fun->runThisLine].param;
com = fun->compiledLines[fun->runThisLine].theCommand;
- if (debugChannelSet(kSludgeDebugStackMachine, -1)) {
+ if (debugChannelSet(-1, kSludgeDebugStackMachine)) {
debugN(" Stack before: ");
printStack(fun->stack);
@@ -657,7 +657,7 @@ bool continueFunction(LoadedFunction *fun) {
}
if (advanceNow) {
- if (debugChannelSet(kSludgeDebugStackMachine, -1)) {
+ if (debugChannelSet(-1, kSludgeDebugStackMachine)) {
debugN(" Stack after: ");
printStack(fun->stack);
Commit: 6f0438bc77ff9d4187144fa44f4d30c51d0b440d
https://github.com/scummvm/scummvm/commit/6f0438bc77ff9d4187144fa44f4d30c51d0b440d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-01T22:12:36+02:00
Commit Message:
DIRECTOR: Fix warning
Changed paths:
engines/director/lingo/lingo-builtins.cpp
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 5ee7d68f0ce..196feab0f9e 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -830,7 +830,7 @@ void LB::b_findPos(int nargs) {
else
d = 0;
} else {
- if (prop.asInt() > 0 && prop.asInt() <= list.u.farr->arr.size())
+ if (prop.asInt() > 0 && prop.asInt() <= (int)list.u.farr->arr.size())
d = prop.asInt();
else
d = 0;
Commit: ff79b4ab8d27b74f2cf8402f57353c2cd1731c5f
https://github.com/scummvm/scummvm/commit/ff79b4ab8d27b74f2cf8402f57353c2cd1731c5f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-01T22:12:37+02:00
Commit Message:
NANCY: Fix warning
Changed paths:
engines/nancy/action/puzzle/peepholepuzzle.cpp
diff --git a/engines/nancy/action/puzzle/peepholepuzzle.cpp b/engines/nancy/action/puzzle/peepholepuzzle.cpp
index 1f2fb1b9f8f..209e791561d 100644
--- a/engines/nancy/action/puzzle/peepholepuzzle.cpp
+++ b/engines/nancy/action/puzzle/peepholepuzzle.cpp
@@ -166,7 +166,7 @@ void PeepholePuzzle::handleInput(NancyInput &input) {
if (_pressedButton != -1 && _pressStart != 0) {
uint32 curTime = g_nancy->getTotalPlayTime();
uint pixelsToMove = 0;
- if (curTime - _pressStart >= 1000 / _pixelsToScroll) {
+ if (curTime - _pressStart >= 1000u / _pixelsToScroll) {
pixelsToMove = (curTime - _pressStart) / (1000 / _pixelsToScroll);
}
Commit: 7d9f2a175db316ab216e9478f95abe45cc6810fd
https://github.com/scummvm/scummvm/commit/7d9f2a175db316ab216e9478f95abe45cc6810fd
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-01T22:12:37+02:00
Commit Message:
AGS: Fix a warning in the script creation code
CreateImpl() is called with either the text or the length parameter,
thus there is no reason to set the length parameter, which is unsigned,
to -1. Therefore, using 0 for the length when a text buffer is used
yields the same result
Changed paths:
engines/ags/engine/ac/dynobj/script_string.h
diff --git a/engines/ags/engine/ac/dynobj/script_string.h b/engines/ags/engine/ac/dynobj/script_string.h
index e9b92487e53..72d3e5edad4 100644
--- a/engines/ags/engine/ac/dynobj/script_string.h
+++ b/engines/ags/engine/ac/dynobj/script_string.h
@@ -40,7 +40,7 @@ public:
}
// Create a new script string by copying the given text
- static DynObjectRef Create(const char *text) { return CreateImpl(text, -1); }
+ static DynObjectRef Create(const char *text) { return CreateImpl(text, 0); }
// Create a new script string with a buffer of at least the given text length
static DynObjectRef Create(size_t buf_len) { return CreateImpl(nullptr, buf_len); }
Commit: 9354d6c3e30bf738cd4351a647d4f211b1158924
https://github.com/scummvm/scummvm/commit/9354d6c3e30bf738cd4351a647d4f211b1158924
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-01T22:12:38+02:00
Commit Message:
VIDEO: Render the first frame of PSX video files after they are loaded
Tested with the BS1 PSX videos. The PSX decoder now conforms to the
same behavior as the rest of the video decoders. This fixes a bug
uncovered in PR #6297
Changed paths:
video/psx_decoder.cpp
diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp
index c7f9f4820a2..bb6d2b5c519 100644
--- a/video/psx_decoder.cpp
+++ b/video/psx_decoder.cpp
@@ -189,6 +189,7 @@ void PSXStreamDecoder::readNextPacket() {
Common::SeekableReadStream *sector = 0;
byte *partialFrame = 0;
int sectorsRead = 0;
+ int64 prevPos = _stream->pos();
while (_stream->pos() < _stream->size()) {
sector = readSector();
@@ -211,6 +212,12 @@ void PSXStreamDecoder::readNextPacket() {
if (!_videoTrack) {
_videoTrack = new PSXVideoTrack(sector, _speed, _frameCount);
addTrack(_videoTrack);
+
+ // If no video track is initialized, we are called
+ // by loadStream(). Stop here, and start rendering
+ // the track from the next call.
+ _stream->seek(prevPos);
+ return;
}
sector->seek(28);
More information about the Scummvm-git-logs
mailing list