[Scummvm-git-logs] scummvm master -> 8baf920e7344e6b06817bac0c0f8825943c6e2d4

[criezy]

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:
8baf920e73 AGS: Fix custom dialog options dropped fps twice


Commit: 8baf920e7344e6b06817bac0c0f8825943c6e2d4
    https://github.com/scummvm/scummvm/commit/8baf920e7344e6b06817bac0c0f8825943c6e2d4
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-29T20:15:31+01:00

Commit Message:
AGS: Fix custom dialog options dropped fps twice

This is because game was making TWO time breaks between frames
instead of one.
Cherry picked from adventuregamestudio/ags bac258cac2.

Changed paths:
    engines/ags/engine/ac/dialog.cpp
    engines/ags/engine/ac/timer.h


diff --git a/engines/ags/engine/ac/dialog.cpp b/engines/ags/engine/ac/dialog.cpp
index 511b6b23a2..6ad613395e 100644
--- a/engines/ags/engine/ac/dialog.cpp
+++ b/engines/ags/engine/ac/dialog.cpp
@@ -962,7 +962,8 @@ bool DialogOptions::Run() {
 
 	update_polled_stuff_if_runtime();
 
-	if (_GP(play).fast_forward == 0) {
+	if (!runGameLoopsInBackground && _GP(play).fast_forward == 0) {
+		// note if runGameLoopsInBackground then it's called inside UpdateGameOnce
 		WaitForNextFrame();
 	}
 
diff --git a/engines/ags/engine/ac/timer.h b/engines/ags/engine/ac/timer.h
index 6470e7ff7b..28c5df9c08 100644
--- a/engines/ags/engine/ac/timer.h
+++ b/engines/ags/engine/ac/timer.h
@@ -36,6 +36,7 @@ using AGS_Clock = std::conditional<
 	std::chrono::high_resolution_clock, std::chrono::steady_clock
 >::type;
 
+// Sleeps for time remaining until the next game frame, updates next frame timestamp
 extern void WaitForNextFrame();
 
 // Sets real FPS to the given number of frames per second; pass 1000+ for maxed FPS mode