[Scummvm-git-logs] scummvm master -> 7b0a692f4800979edc1f09ebfc8926d65c20bb0b
whoozle
noreply at scummvm.org
Tue Mar 10 22:02:27 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:
7b0a692f48 PHOENIXVR: allow pausetimer only if timer was active
Commit: 7b0a692f4800979edc1f09ebfc8926d65c20bb0b
https://github.com/scummvm/scummvm/commit/7b0a692f4800979edc1f09ebfc8926d65c20bb0b
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-03-10T22:01:27Z
Commit Message:
PHOENIXVR: allow pausetimer only if timer was active
original engine only modifies flags if they were non-zero, or ignore pausetimer command
Changed paths:
engines/phoenixvr/phoenixvr.cpp
diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index 1140ee4ae47..952d8e727d0 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -606,14 +606,16 @@ void PhoenixVREngine::startTimer(float seconds) {
}
void PhoenixVREngine::pauseTimer(bool pause, bool deactivate) {
- if (pause)
- _timerFlags |= 2;
- else
- _timerFlags &= ~2;
- if (deactivate)
- _timerFlags &= ~4;
- else
- _timerFlags |= 4;
+ if (_timerFlags) {
+ if (pause)
+ _timerFlags |= 2;
+ else
+ _timerFlags &= ~2;
+ if (deactivate)
+ _timerFlags &= ~4;
+ else
+ _timerFlags |= 4;
+ }
}
void PhoenixVREngine::killTimer() {
More information about the Scummvm-git-logs
mailing list