[Scummvm-git-logs] scummvm master -> 70dfdfcae01f0fe3bb4244f43f24c0bc87df94d5
neuromancer
noreply at scummvm.org
Wed Nov 11 07:19:52 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:
78026fac5c SCUMM: RA1: properly handle scummvm main menu event during a cutscene
70dfdfcae0 CREDITS: Rebuild CREDITS information files
Commit: 78026fac5c333c82a627ddb89fb3b9263a3672e4
https://github.com/scummvm/scummvm/commit/78026fac5c333c82a627ddb89fb3b9263a3672e4
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-11T08:18:43+01:00
Commit Message:
SCUMM: RA1: properly handle scummvm main menu event during a cutscene
Changed paths:
engines/scumm/insane/rebel1/menu.cpp
engines/scumm/insane/rebel1/runlevels.cpp
diff --git a/engines/scumm/insane/rebel1/menu.cpp b/engines/scumm/insane/rebel1/menu.cpp
index aff8c90b06d..9818cf297b4 100644
--- a/engines/scumm/insane/rebel1/menu.cpp
+++ b/engines/scumm/insane/rebel1/menu.cpp
@@ -941,14 +941,11 @@ bool InsaneRebel1::notifyEvent(const Common::Event &event) {
}
if (event.type == Common::EVENT_MAINMENU) {
- if (_player && !_interactiveVideoActive && !_menuActive) {
- _vm->_smushVideoShouldFinish = true;
+ if (_player && (!_interactiveVideoActive || _menuActive || _highScoresActive)) {
+ openGameplayMainMenu();
return true;
}
- if (_menuActive || _highScoresActive)
- return true;
-
const uint32 now = _vm->_system->getMillis();
const uint32 elapsedSinceAxis = _lastJoystickAxisEventTime ? now - _lastJoystickAxisEventTime : 0xffffffffu;
diff --git a/engines/scumm/insane/rebel1/runlevels.cpp b/engines/scumm/insane/rebel1/runlevels.cpp
index ed127c78f4a..5c435775918 100644
--- a/engines/scumm/insane/rebel1/runlevels.cpp
+++ b/engines/scumm/insane/rebel1/runlevels.cpp
@@ -1472,7 +1472,7 @@ void InsaneRebel1::runGame() {
if (!loadedStartupSave) {
playIntroSequence();
- if (shouldAbortGameFlow())
+ if (_vm->shouldQuit())
return;
}
Commit: 70dfdfcae01f0fe3bb4244f43f24c0bc87df94d5
https://github.com/scummvm/scummvm/commit/70dfdfcae01f0fe3bb4244f43f24c0bc87df94d5
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-11T08:18:43+01:00
Commit Message:
CREDITS: Rebuild CREDITS information files
Changed paths:
AUTHORS
doc/docportal/help/credits.rst
gui/credits.h
diff --git a/AUTHORS b/AUTHORS
index 8f0ed5af8f5..02117513e63 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -112,6 +112,7 @@ ScummVM Team
Avalanche:
Peter Bozso
Arnaud Boutonne
+ Mohit Bankar
awe:
Gregory Montoir
@@ -210,6 +211,7 @@ ScummVM Team
DM:
Arnaud Boutonne
Bendeguz Nagy
+ Mohit Bankar
Draci:
Denis Kasak
@@ -297,6 +299,9 @@ ScummVM Team
Hades Challenge:
Vladimir Serbinenko/Google
+ Harold:
+ Scorp
+
Harvester:
Alex Bevilacqua
@@ -304,6 +309,9 @@ ScummVM Team
Eugene Sandulenko
Nipun Garg - GSoC student
+ Hollywood:
+ Gustavo Grieco
+
Hopkins:
Arnaud Boutonne
Paul Gilbert
@@ -442,9 +450,9 @@ ScummVM Team
PhoenixVR:
Vladimir Menshakov
- Hermann Noll - Help with 3D VR projections
Scorp - Dracula 1/2 and Messenger support,
Engine improvements
+ Hermann Noll - Help with 3D VR projections
Pink:
Andrei Prykhodko
diff --git a/doc/docportal/help/credits.rst b/doc/docportal/help/credits.rst
index 7d567adce0b..b08c737cebf 100644
--- a/doc/docportal/help/credits.rst
+++ b/doc/docportal/help/credits.rst
@@ -261,6 +261,8 @@ Avalanche
-
* - Arnaud Boutonné
-
+ * - Mohit Bankar
+ -
awe
^^^
@@ -520,6 +522,8 @@ DM
-
* - Bendegúz Nagy
-
+ * - Mohit Bankar
+ -
Draci
^^^^^
@@ -744,6 +748,15 @@ Hades Challenge
* - Vladimir Serbinenko/Google
-
+Harold
+^^^^^^
+
+.. list-table::
+ :widths: 35 65
+
+ * - Scorp
+ -
+
Harvester
^^^^^^^^^
@@ -764,6 +777,15 @@ HDB
* - Nipun Garg
- GSoC student
+Hollywood
+^^^^^^^^^
+
+.. list-table::
+ :widths: 35 65
+
+ * - Gustavo Grieco
+ -
+
Hopkins
^^^^^^^
@@ -1140,10 +1162,10 @@ PhoenixVR
* - Vladimir Menshakov
-
- * - Hermann Noll
- - Help with 3D VR projections
* - Scorp
- Dracula 1/2 and Messenger support, Engine improvements
+ * - Hermann Noll
+ - Help with 3D VR projections
Pink
^^^^
diff --git a/gui/credits.h b/gui/credits.h
index 192d53dfc09..77338540262 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -157,6 +157,7 @@ static const char *const credits[] = {
"C1""Avalanche",
"C0""Peter Bozs\303\263",
"C0""Arnaud Boutonn\303\251",
+"C0""Mohit Bankar",
"",
"C1""awe",
"C0""Gregory Montoir",
@@ -261,6 +262,7 @@ static const char *const credits[] = {
"C1""DM",
"C0""Arnaud Boutonn\303\251",
"C0""Bendeg\303\272z Nagy",
+"C0""Mohit Bankar",
"",
"C1""Draci",
"C0""Denis Kasak",
@@ -367,6 +369,9 @@ static const char *const credits[] = {
"C1""Hades Challenge",
"C0""Vladimir Serbinenko/Google",
"",
+"C1""Harold",
+"C0""Scorp",
+"",
"C1""Harvester",
"C0""Alex Bevilacqua",
"",
@@ -375,6 +380,9 @@ static const char *const credits[] = {
"C0""Nipun Garg",
"C2""GSoC student",
"",
+"C1""Hollywood",
+"C0""Gustavo Grieco",
+"",
"C1""Hopkins",
"C0""Arnaud Boutonn\303\251",
"C0""Paul Gilbert",
@@ -525,10 +533,10 @@ static const char *const credits[] = {
"",
"C1""PhoenixVR",
"C0""Vladimir Menshakov",
-"C0""Hermann Noll",
-"C2""Help with 3D VR projections",
"C0""Scorp",
"C2""Dracula 1/2 and Messenger support, Engine improvements",
+"C0""Hermann Noll",
+"C2""Help with 3D VR projections",
"",
"C1""Pink",
"C0""Andrei Prykhodko",
More information about the Scummvm-git-logs
mailing list