[Scummvm-git-logs] scummvm master -> ed06369ad254aecd23fa4190ce84e3d576ee0749
mduggan
noreply at scummvm.org
Sun Oct 5 21:59:08 UTC 2025
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
6d5c6d8097 ACCESS: Remove some unused functions
05f3f1baaf ACCESS: Fix small memory leak
0a9d2ec951 ACCESS: Reduce warnings
ed06369ad2 ACCESS: Remove unused flag
Commit: 6d5c6d8097c84326821cd667fc04c3df2ad785c2
https://github.com/scummvm/scummvm/commit/6d5c6d8097c84326821cd667fc04c3df2ad785c2
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-10-06T08:49:19+11:00
Commit Message:
ACCESS: Remove some unused functions
Changed paths:
engines/access/access.cpp
engines/access/access.h
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 3a62c708439..ec84c73fbe0 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -595,36 +595,6 @@ void AccessEngine::writeSavegameHeader(Common::OutSaveFile *out, AccessSavegameH
out->writeUint32LE(_events->getFrameCounter());
}
-void AccessEngine::SPRINTCHR(char c, int fontNum) {
- warning("TODO: SPRINTCHR");
- _fonts._font1->drawChar(_screen, c, _screen->_printOrg);
-}
-
-void AccessEngine::PRINTCHR(Common::String msg, int fontNum) {
- _events->hideCursor();
- warning("TODO: PRINTCHR - Handle fontNum");
-
- for (int i = 0; msg[i]; i++) {
- if (!(_fonts._charSet._hi & 8)) {
- _fonts._font1->drawChar(_screen, msg[i], _screen->_printOrg);
- continue;
- } else if (_fonts._charSet._hi & 2) {
- Common::Point oldPos = _screen->_printOrg;
- int oldFontLo = _fonts._charFor._lo;
-
- _fonts._charFor._lo = 0;
- _screen->_printOrg.x++;
- _screen->_printOrg.y++;
- SPRINTCHR(msg[i], fontNum);
-
- _screen->_printOrg = oldPos;
- _fonts._charFor._lo = oldFontLo;
- }
- SPRINTCHR(msg[i], fontNum);
- }
- _events->showCursor();
-}
-
bool AccessEngine::shouldQuitOrRestart() {
return shouldQuit() || _restartFl;
}
diff --git a/engines/access/access.h b/engines/access/access.h
index 5e337bc2cac..da8c234c358 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -358,9 +358,6 @@ public:
*/
void writeSavegameHeader(Common::OutSaveFile *out, AccessSavegameHeader &header);
- void SPRINTCHR(char c, int fontNum);
- void PRINTCHR(Common::String msg, int fontNum);
-
bool playMovie(const Common::Path &filename, const Common::Point &pos);
};
Commit: 05f3f1baafb8b864b65b1fdb17b79d1d29af4b1e
https://github.com/scummvm/scummvm/commit/05f3f1baafb8b864b65b1fdb17b79d1d29af4b1e
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-10-06T08:54:20+11:00
Commit Message:
ACCESS: Fix small memory leak
Changed paths:
engines/access/martian/martian_game.cpp
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index 7f912145ec5..682321d9670 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -122,9 +122,11 @@ void MartianEngine::displayNote(const Common::String &msg) {
}
void MartianEngine::doSpecial5(int param1) {
- warning("TODO: Push midi song");
+ // Seems redundant to store the song as this is
+ // only ever called from restart or load?
+ debug("TODO: Push midi song?");
_midi->stopSong();
- _midi->_byte1F781 = false;
+ _midi->setLoop(false);
_midi->loadMusic(47, 4);
_midi->midiPlay();
_screen->setDisplayScan();
@@ -146,13 +148,13 @@ void MartianEngine::doSpecial5(int param1) {
int pos = notesRes->_stream->readUint16LE();
notesRes->_stream->seek(pos);
Common::String msg = notesRes->_stream->readString();
+ delete notesRes;
displayNote(msg);
_midi->stopSong();
_midi->freeMusic();
- warning("TODO: Pop Midi");
- // _midi->_byte1F781 = true;
+ _midi->setLoop(true);
}
void MartianEngine::playGame() {
@@ -236,7 +238,7 @@ bool MartianEngine::showCredits() {
}
void MartianEngine::doCredits() {
- _midi->_byte1F781 = false;
+ _midi->setLoop(false);
_midi->loadMusic(47, 3);
_midi->midiPlay();
_screen->setDisplayScan();
@@ -268,6 +270,7 @@ void MartianEngine::doCredits() {
_objectsTable[41] = nullptr;
_midi->freeMusic();
}
+ _midi->setLoop(true);
}
void MartianEngine::setupTimers() {
Commit: 0a9d2ec95116ab10afce386e3aad073f7c316379
https://github.com/scummvm/scummvm/commit/0a9d2ec95116ab10afce386e3aad073f7c316379
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-10-06T08:54:37+11:00
Commit Message:
ACCESS: Reduce warnings
Changed paths:
engines/access/martian/martian_scripts.cpp
diff --git a/engines/access/martian/martian_scripts.cpp b/engines/access/martian/martian_scripts.cpp
index e42711fab13..51ea2f883e1 100644
--- a/engines/access/martian/martian_scripts.cpp
+++ b/engines/access/martian/martian_scripts.cpp
@@ -137,7 +137,7 @@ void MartianScripts::doIntro(int param1) {
void MartianScripts::cmdSpecial6() {
// A special transition screen after the jetpack in the outpost.
- warning("cmdSpecial6: TODO: Store current music");
+ debug("cmdSpecial6: TODO: Store current music?");
_vm->_midi->stopSong();
_vm->_screen->setDisplayScan();
_vm->_events->clearEvents();
@@ -181,7 +181,9 @@ void MartianScripts::cmdSpecial6() {
// (bug also present in original game)
_vm->_player->_flags &= ~IMGFLAG_UNSCALED;
- warning("cmdSpecial6: TODO: Restore original music");
+ // We always go straight to another scene so this seems
+ // redundant..
+ debug("cmdSpecial6: TODO: Restore original music?");
}
void MartianScripts::cmdSpecial7() {
Commit: ed06369ad254aecd23fa4190ce84e3d576ee0749
https://github.com/scummvm/scummvm/commit/ed06369ad254aecd23fa4190ce84e3d576ee0749
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-10-06T08:54:53+11:00
Commit Message:
ACCESS: Remove unused flag
Changed paths:
engines/access/sound.cpp
engines/access/sound.h
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 379b34ae89f..7b412aa827b 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -218,7 +218,6 @@ MusicManager::MusicManager(AccessEngine *vm) : _vm(vm) {
_tempMusic = nullptr;
_isLooping = false;
_driver = nullptr;
- _byte1F781 = false;
MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MT32);
MusicType musicType = MidiDriver::getMusicType(dev);
diff --git a/engines/access/sound.h b/engines/access/sound.h
index f2722d0bef3..d41a45b7029 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -94,7 +94,6 @@ private:
public:
Resource *_music;
- bool _byte1F781; // Maybe repeat flag?
public:
MusicManager(AccessEngine *vm);
More information about the Scummvm-git-logs
mailing list