[Scummvm-git-logs] scummvm master -> 9d44efe130ca80dddc70ec19911641ca975f59a8
sev-
noreply at scummvm.org
Sun Aug 24 15:11:12 UTC 2025
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
2fbfbbd100 DIRECTOR: Print out file version in human-readable format
8b91fc7197 DIRECTOR: DT: Remove global constructor
9d44efe130 DIRECTOR: DT: Remove unused variable
Commit: 2fbfbbd100d2d8b5a076c2ba13a21effceabf625
https://github.com/scummvm/scummvm/commit/2fbfbbd100d2d8b5a076c2ba13a21effceabf625
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-08-24T17:09:39+02:00
Commit Message:
DIRECTOR: Print out file version in human-readable format
Changed paths:
engines/director/cast.cpp
engines/director/castmember/bitmap.cpp
engines/director/castmember/filmloop.cpp
engines/director/castmember/palette.cpp
engines/director/castmember/script.cpp
engines/director/castmember/sound.cpp
engines/director/castmember/transition.cpp
engines/director/frame.cpp
engines/director/movie.cpp
engines/director/score.cpp
engines/director/types.h
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index be0e862197b..35ca5e513a2 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -484,7 +484,7 @@ bool Cast::loadConfig() {
_defaultPalette.member -= 1;
} else {
- warning("STUB: Cast::loadConfig(): Extended config not yet supported for version %d", _version);
+ warning("STUB: Cast::loadConfig(): Extended config not yet supported for version v%d (%d)", humanVersion(_version), _version);
}
debugC(1, kDebugLoading, "Cast::loadConfig(): platform: %s, defaultPalette: %s, frameRate: %d", getPlatformAbbrev(_platform), _defaultPalette.asString().c_str(), _frameRate);
}
@@ -1388,7 +1388,7 @@ void Cast::loadCastData(Common::SeekableReadStreamEndian &stream, uint16 id, Res
castInfoOffset = stream.pos();
castDataOffset = stream.pos() + castInfoSize;
} else {
- error("Cast::loadCastData: unsupported Director version (%d)", _version);
+ error("Cast::loadCastData: unsupported Director version v%d (%d)", humanVersion(_version), _version);
}
debugC(3, kDebugLoading, "Cast::loadCastData(): CASt: id: %d type: %x castDataSize: %d castInfoSize: %d (%x) unk1: %d unk2: %d unk3: %d",
@@ -1645,7 +1645,7 @@ void Cast::loadLingoContext(Common::SeekableReadStreamEndian &stream) {
}
}
} else {
- error("Cast::loadLingoContext: unsupported Director version (%d)", _version);
+ error("Cast::loadLingoContext: unsupported Director version v%d (%d)", humanVersion(_version), _version);
}
if (debugChannelSet(-1, kDebugImGui) || ConfMan.getBool("dump_scripts")) {
@@ -1879,7 +1879,7 @@ void Cast::loadCastInfo(Common::SeekableReadStreamEndian &stream, uint16 id) {
if (_version >= kFileVer400 && _version < kFileVer600 && member->_type == kCastSound) {
((SoundCastMember *)member)->_looping = castInfo.flags & 16 ? 0 : 1;
} else if (_version >= kFileVer600 && member->_type == kCastSound) {
- warning("STUB: Cast::loadCastInfo(): Sound cast member info not yet supported for version %d", _version);
+ warning("STUB: Cast::loadCastInfo(): Sound cast member info not yet supported for version v%d (%d)", humanVersion(_version), _version);
}
// For PaletteCastMember, run load() as we need it right now
diff --git a/engines/director/castmember/bitmap.cpp b/engines/director/castmember/bitmap.cpp
index 88af89d2a51..30c860c8a08 100644
--- a/engines/director/castmember/bitmap.cpp
+++ b/engines/director/castmember/bitmap.cpp
@@ -158,7 +158,7 @@ BitmapCastMember::BitmapCastMember(Cast *cast, uint16 castId, Common::SeekableRe
}
}
} else {
- warning("STUB: BitmapCastMember::BitmapCastMember(): Bitmaps not yet supported for version %d", version);
+ warning("STUB: BitmapCastMember::BitmapCastMember(): Bitmaps not yet supported for version v%d (%d)", humanVersion(version), version);
}
_tag = castTag;
diff --git a/engines/director/castmember/filmloop.cpp b/engines/director/castmember/filmloop.cpp
index 4c570e75d18..2c0bd704592 100644
--- a/engines/director/castmember/filmloop.cpp
+++ b/engines/director/castmember/filmloop.cpp
@@ -724,7 +724,7 @@ void FilmLoopCastMember::load() {
warning("FilmLoopCastMember::load(): No SCVW resource found in %d children", _children.size());
}
} else {
- warning("STUB: FilmLoopCastMember::load(): Film loops not yet supported for version %d", _cast->_version);
+ warning("STUB: FilmLoopCastMember::load(): Film loops not yet supported for version v%d (%d)", humanVersion(_cast->_version), _cast->_version);
}
_loaded = true;
diff --git a/engines/director/castmember/palette.cpp b/engines/director/castmember/palette.cpp
index dba45cac4e5..a390cad6e79 100644
--- a/engines/director/castmember/palette.cpp
+++ b/engines/director/castmember/palette.cpp
@@ -109,7 +109,7 @@ void PaletteCastMember::load() {
warning("PaletteCastMember::load(): No CLUT resource found in %d children", _children.size());
}
} else {
- warning("STUB: PaletteCastMember::load(): Palettes not yet supported for version %d", _cast->_version);
+ warning("STUB: PaletteCastMember::load(): Palettes not yet supported for version v%d (%d)", humanVersion(_cast->_version), _cast->_version);
}
if (paletteId) {
diff --git a/engines/director/castmember/script.cpp b/engines/director/castmember/script.cpp
index a3c5fddecc5..d5dc83d77c9 100644
--- a/engines/director/castmember/script.cpp
+++ b/engines/director/castmember/script.cpp
@@ -62,7 +62,7 @@ ScriptCastMember::ScriptCastMember(Cast *cast, uint16 castId, Common::SeekableRe
assert(stream.pos() == stream.size()); // There should be no more data
} else {
- warning("STUB: ScriptCastMember::ScriptCastMember(): Scripts not yet supported for version %d", version);
+ warning("STUB: ScriptCastMember::ScriptCastMember(): Scripts not yet supported for version v%d (%d)", humanVersion(version), version);
}
}
diff --git a/engines/director/castmember/sound.cpp b/engines/director/castmember/sound.cpp
index ef1a82ed5b5..4633880b7f2 100644
--- a/engines/director/castmember/sound.cpp
+++ b/engines/director/castmember/sound.cpp
@@ -80,7 +80,7 @@ void SoundCastMember::load() {
sndId = (uint16)(_castId + _cast->_castIDoffset);
}
} else {
- warning("STUB: SoundCastMember::SoundCastMember(): Sounds not yet supported for version %d", _cast->_version);
+ warning("STUB: SoundCastMember::SoundCastMember(): Sounds not yet supported for version v%d (%d)", humanVersion(_cast->_version), _cast->_version);
}
Common::SeekableReadStreamEndian *sndData = _cast->getResource(tag, sndId);
diff --git a/engines/director/castmember/transition.cpp b/engines/director/castmember/transition.cpp
index 38d18e92092..5d2f3a59e9c 100644
--- a/engines/director/castmember/transition.cpp
+++ b/engines/director/castmember/transition.cpp
@@ -48,7 +48,7 @@ TransitionCastMember::TransitionCastMember(Cast *cast, uint16 castId, Common::Se
_durationMillis = stream.readUint16BE();
debugC(5, kDebugLoading, "TransitionCastMember::TransitionCastMember(): transType: %d, durationMillis: %d, flags: %d, chunkSize: %d, area: %d", _transType, _durationMillis, _flags, _chunkSize, _area);
} else {
- warning("STUB: TransitionCastMember::TransitionCastMember(): Transitions not yet supported for version %d", _cast->_version);
+ warning("STUB: TransitionCastMember::TransitionCastMember(): Transitions not yet supported for version v%d (%d)", humanVersion(_cast->_version), _cast->_version);
}
}
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index d76d2cb1dbf..4c2de99ab74 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -111,7 +111,7 @@ void Frame::readChannel(Common::MemoryReadStreamEndian &stream, uint16 offset, u
}
void Frame::writeMainChannels(Common::SeekableWriteStream *writeStream, uint16 version) {
- debugC(6, kDebugLoading, "Frame::writeChannel: writing main channels for version %d", version);
+ debugC(6, kDebugLoading, "Frame::writeChannel: writing main channels for version v%d (%d)", humanVersion(version), version);
if (version >= kFileVer400 && version < kFileVer500) {
writeMainChannelsD4(writeStream);
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index b78f28a5253..007eac375a2 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -258,7 +258,7 @@ bool Movie::loadArchive() {
} else if (_version < kFileVer600) {
r = new Common::MemoryReadStreamEndian(kBlankScoreD4, sizeof(kBlankScoreD4), true);
} else {
- error("Movie::loadArchive(): score format not yet supported for version %d", _version);
+ error("Movie::loadArchive(): score format not yet supported for version v%d (%d)", humanVersion(_version), _version);
}
}
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c4e978952e1..c67a8bab3dc 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1773,7 +1773,7 @@ void Score::loadFrames(Common::SeekableReadStreamEndian &stream, uint16 version)
frame1Offset, _framesVersion, _spriteRecordSize, _numChannels, _numChannelsDisplayed);
// Unknown, some bytes - constant (refer to contuinity).
} else {
- error("STUB: Score::loadFrames(): score not yet supported for version %d", version);
+ error("STUB: Score::loadFrames(): score not yet supported for version v%d (%d)", humanVersion(version), version);
}
// partically by channels, hence we keep it and read the score from left to right
diff --git a/engines/director/types.h b/engines/director/types.h
index 0388a774957..62399b58e1b 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -466,7 +466,7 @@ const char *spriteType2str(SpriteType type);
const char *inkType2str(InkType type);
const char *symbolType2str(SymbolType type);
Common::String objectType2str(int fl);
-
+\
enum CollisionTest {
kCollisionNo = 0,
kCollisionYes,
Commit: 8b91fc719721e4e61b646f12cfee7a839c5d3214
https://github.com/scummvm/scummvm/commit/8b91fc719721e4e61b646f12cfee7a839c5d3214
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-08-24T17:09:39+02:00
Commit Message:
DIRECTOR: DT: Remove global constructor
Changed paths:
engines/director/debugger/dt-save-state.cpp
diff --git a/engines/director/debugger/dt-save-state.cpp b/engines/director/debugger/dt-save-state.cpp
index 581693453f6..8a1e91c3842 100644
--- a/engines/director/debugger/dt-save-state.cpp
+++ b/engines/director/debugger/dt-save-state.cpp
@@ -33,7 +33,7 @@
namespace Director {
namespace DT {
-Common::String savedStateFileName = Common::String("ImGuiSaveState.json");
+const char *savedStateFileName = "ImGuiSaveState.json";
Common::Array<WindowFlag> getWindowFlags() {
return {
@@ -99,9 +99,9 @@ void saveCurrentState() {
if (stream) {
stream->writeString(save.stringify());
stream->finalize();
- debug("ImGui::SaveCurrentState: Saved the current ImGui State @%s", savedStateFileName.c_str());
+ debug("ImGui::SaveCurrentState: Saved the current ImGui State @%s", savedStateFileName);
} else {
- debug("ImGui::SaveCurrentState: Failed to open the file %s for saving", savedStateFileName.c_str());
+ debug("ImGui::SaveCurrentState: Failed to open the file %s for saving", savedStateFileName);
}
// Clean up everything
@@ -112,7 +112,7 @@ void loadSavedState() {
Common::InSaveFile *savedState = g_engine->getSaveFileManager()->openForLoading(savedStateFileName);
if (!savedState || savedState->size() == 0) {
- debug("ImGui::loadSavedState(): Failed to open saved state file: %s", savedStateFileName.c_str());
+ debug("ImGui::loadSavedState(): Failed to open saved state file: %s", savedStateFileName);
return;
}
Commit: 9d44efe130ca80dddc70ec19911641ca975f59a8
https://github.com/scummvm/scummvm/commit/9d44efe130ca80dddc70ec19911641ca975f59a8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-08-24T17:10:47+02:00
Commit Message:
DIRECTOR: DT: Remove unused variable
Changed paths:
engines/director/debugger/debugtools.cpp
diff --git a/engines/director/debugger/debugtools.cpp b/engines/director/debugger/debugtools.cpp
index 1f7cee04839..ba924663263 100644
--- a/engines/director/debugger/debugtools.cpp
+++ b/engines/director/debugger/debugtools.cpp
@@ -166,8 +166,6 @@ ImGuiImage getImageID(CastMember *castMember) {
return _state->_cast._textures[bmpMember];
}
- Common::Rect bbox(bmpMember->getBbox());
-
bmpMember->load();
Picture *pic = bmpMember->_picture;
if (!pic)
More information about the Scummvm-git-logs
mailing list