[Scummvm-git-logs] scummvm master -> 5dad41851e9559675a2530539efa56d25f3566f4
dreammaster
dreammaster at scummvm.org
Thu Nov 23 01:41:58 CET 2017
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:
5dad41851e TSAGE: R2R: Fix brief flash of UI when starting demo
Commit: 5dad41851e9559675a2530539efa56d25f3566f4
https://github.com/scummvm/scummvm/commit/5dad41851e9559675a2530539efa56d25f3566f4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-22T19:41:49-05:00
Commit Message:
TSAGE: R2R: Fix brief flash of UI when starting demo
Changed paths:
engines/tsage/ringworld2/ringworld2_logic.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e8d5110..f54efb5 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -387,9 +387,13 @@ void SceneExt::postInit(SceneObjectList *OwnerList) {
int prevScene = R2_GLOBALS._sceneManager._previousScene;
int sceneNumber = R2_GLOBALS._sceneManager._sceneNumber;
if (g_vm->getFeatures() & GF_DEMO) {
- if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50))
+ if (prevScene == 0 && sceneNumber == 180) {
+ // Very start of the demo, title & intro about to be shown
+ R2_GLOBALS._uiElements._active = false;
+ R2_GLOBALS._uiElements.hide();
+ } else if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50))
|| (prevScene == 0) || (sceneNumber == 600)
- || ((prevScene == 205 || prevScene == 180) && (sceneNumber == 100))) {
+ || ((prevScene == 205 || prevScene == 180 || prevScene == 50) && (sceneNumber == 100))) {
R2_GLOBALS._uiElements._active = true;
R2_GLOBALS._uiElements.show();
} else {
More information about the Scummvm-git-logs
mailing list