[Scummvm-git-logs] scummvm master -> b5f5358870d4d14d2a502ebfc48671abade6dd7b
whoozle
noreply at scummvm.org
Wed Jul 15 23:41:12 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
db5559d061 PHOENIXVR: Handle pauseEngineIntern()
b5f5358870 PHOENIXVR: Mark Amerzone as ADGF_UNSTABLE
Commit: db5559d061977cad06ae8afc17b4ca8686a382cf
https://github.com/scummvm/scummvm/commit/db5559d061977cad06ae8afc17b4ca8686a382cf
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-07-16T00:38:13+01:00
Commit Message:
PHOENIXVR: Handle pauseEngineIntern()
Release mouse when pausing the engine.
Changed paths:
engines/phoenixvr/phoenixvr.cpp
engines/phoenixvr/phoenixvr.h
diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index e83066d8f40..d2d631c9de3 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -1692,6 +1692,16 @@ void PhoenixVREngine::processGenericEvents(const Common::Event &event) {
}
}
+void PhoenixVREngine::pauseEngineIntern(bool pause) {
+ // this is called when main menu appears on the screen
+ Engine::pauseEngineIntern(pause);
+ if (pause) {
+ _system->lockMouse(false);
+ } else {
+ _system->lockMouse(_vr.isVR());
+ }
+}
+
bool PhoenixVREngine::testSaveSlot(int idx) const {
return _saveFileMan->exists(getSaveStateName(idx));
}
diff --git a/engines/phoenixvr/phoenixvr.h b/engines/phoenixvr/phoenixvr.h
index cd073c9f0ca..aab023b4ea9 100644
--- a/engines/phoenixvr/phoenixvr.h
+++ b/engines/phoenixvr/phoenixvr.h
@@ -241,6 +241,7 @@ private:
void drawAudioSubtitles();
void processGenericEvents(const Common::Event &event);
+ void pauseEngineIntern(bool pause) override;
private:
bool _hasFocus = true;
Commit: b5f5358870d4d14d2a502ebfc48671abade6dd7b
https://github.com/scummvm/scummvm/commit/b5f5358870d4d14d2a502ebfc48671abade6dd7b
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-07-16T00:39:42+01:00
Commit Message:
PHOENIXVR: Mark Amerzone as ADGF_UNSTABLE
Flag removal has been ccidentally slipped into detection changes.
Changed paths:
engines/phoenixvr/detection_tables.h
diff --git a/engines/phoenixvr/detection_tables.h b/engines/phoenixvr/detection_tables.h
index 908abe5ee5d..ebc3dfcd7a9 100644
--- a/engines/phoenixvr/detection_tables.h
+++ b/engines/phoenixvr/detection_tables.h
@@ -429,7 +429,7 @@ const ADGameDescription gameDescriptions[] = {
),
Common::EN_USA,
Common::kPlatformWindows,
- ADGF_DROPPLATFORM,
+ ADGF_DROPPLATFORM | ADGF_UNSTABLE,
GUIO1(GUIO_NONE)
},
{"amerzone",
@@ -440,7 +440,7 @@ const ADGameDescription gameDescriptions[] = {
),
Common::EN_USA,
Common::kPlatformWindows,
- ADGF_DROPPLATFORM | ADGF_CD,
+ ADGF_DROPPLATFORM | ADGF_UNSTABLE | ADGF_CD,
GUIO1(GUIO_NONE)
},
More information about the Scummvm-git-logs
mailing list