[Scummvm-git-logs] scummvm master -> e8117fdbd2b550dd83ee7e9bfef490dc4a25f2ea
dreammaster
noreply at scummvm.org
Mon Feb 12 04:55:39 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e8117fdbd2 M4: Don't set up full game timed events list for demo
Commit: e8117fdbd2b550dd83ee7e9bfef490dc4a25f2ea
https://github.com/scummvm/scummvm/commit/e8117fdbd2b550dd83ee7e9bfef490dc4a25f2ea
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-11T20:55:34-08:00
Commit Message:
M4: Don't set up full game timed events list for demo
Changed paths:
engines/m4/burger/flags.cpp
engines/m4/burger/rooms/section.cpp
diff --git a/engines/m4/burger/flags.cpp b/engines/m4/burger/flags.cpp
index 78013adc719..6892ab4885a 100644
--- a/engines/m4/burger/flags.cpp
+++ b/engines/m4/burger/flags.cpp
@@ -129,7 +129,7 @@ void Flags::schedule_boonsville_time() {
term_message("************ Schedule ************");
- for (const auto& te : EVENTS) {
+ for (const auto &te : EVENTS) {
int teHours = te._time / 216000;
int teMinutes = (te._time % 216000) / 3600;
int teSeconds = (te._time % 3600) / 60;
diff --git a/engines/m4/burger/rooms/section.cpp b/engines/m4/burger/rooms/section.cpp
index 5e1065dab0f..6935a12d62a 100644
--- a/engines/m4/burger/rooms/section.cpp
+++ b/engines/m4/burger/rooms/section.cpp
@@ -122,8 +122,10 @@ void Section::global_room_init() {
}
}
- kernel_timing_trigger(900, kAdvanceHour, nullptr);
- kernel_timing_trigger(300, kAdvanceTime, nullptr);
+ if (_G(executing) == WHOLE_GAME) {
+ kernel_timing_trigger(900, kAdvanceHour, nullptr);
+ kernel_timing_trigger(300, kAdvanceTime, nullptr);
+ }
}
void Section::init_series_players() {
More information about the Scummvm-git-logs
mailing list