[Gemrb-commits] gemrb: branch master updated. v0.6.2-1003-gab84211
|
From: Jaka Kranjc <lynxlupodian@us...> - 2011-03-31 13:12:17
|
gemrb: Infinity Engine emulator
The branch master has been updated
via ab842112bcbba8f77905421385ce5ee06810f3f2 (commit)
Summary of changes:
gemrb/GUIScripts/GUISAVE.py | 18 ++++++++++++++----
gemrb/core/GUI/GameControl.cpp | 7 -------
2 files changed, 14 insertions(+), 11 deletions(-)
from 88b03e719bd4684cb6fa6ad6403164488d507725 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=ab842112bcbba8f77905421385ce5ee06810f3f2
commit ab842112bcbba8f77905421385ce5ee06810f3f2
Author: Jaka Kranjc <lynxlupodian@...>
Date: Thu Mar 31 15:10:13 2011 +0200
guisave: don't start the loadscreen, it only causes problems
don't hide the gui from the core
diff --git a/gemrb/GUIScripts/GUISAVE.py b/gemrb/GUIScripts/GUISAVE.py
index ddb9613..a0d968f 100644
--- a/gemrb/GUIScripts/GUISAVE.py
+++ b/gemrb/GUIScripts/GUISAVE.py
@@ -158,6 +158,7 @@ def ScrollBarPress():
def AbortedSaveGame():
if ConfirmWindow:
ConfirmWindow.Unload ()
+ ConfirmWindow = None
SaveWindow.SetVisible (WINDOW_VISIBLE)
return
@@ -167,14 +168,18 @@ def ConfirmedSaveGame():
Pos = GemRB.GetVar ("TopIndex")+GemRB.GetVar ("LoadIdx")
Label = ConfirmWindow.GetControl (3)
Slotname = Label.QueryText ()
- LoadScreen.StartLoadScreen()
+ #FIXME: make this work
+ #LoadScreen.StartLoadScreen()
+ if ConfirmWindow:
+ ConfirmWindow.Unload ()
+ ConfirmWindow = None
+ OpenSaveWindow() # close window
+ GemRB.HideGUI ()
if Pos < len(Games):
GemRB.SaveGame(Games[Pos], Slotname, sav_version)
else:
GemRB.SaveGame(None, Slotname, sav_version)
- if ConfirmWindow:
- ConfirmWindow.Unload ()
- OpenSaveWindow() # close window
+ GemRB.UnhideGUI ()
return
def SavePress():
@@ -262,12 +267,14 @@ def DeleteGameConfirm():
ScrollBarPress()
if ConfirmWindow:
ConfirmWindow.Unload ()
+ ConfirmWindow = None
SaveWindow.SetVisible (WINDOW_VISIBLE)
return
def DeleteGameCancel():
if ConfirmWindow:
ConfirmWindow.Unload ()
+ ConfirmWindow = None
SaveWindow.SetVisible (WINDOW_VISIBLE)
return
@@ -290,8 +297,11 @@ def DeleteGamePress():
return
def CloseSaveWindow ():
+ global SaveWindow
+
if SaveWindow:
SaveWindow.Unload ()
+ SaveWindow = None
if GemRB.GetVar ("QuitAfterSave"):
GemRB.QuitGame ()
GemRB.SetNextScript ("Start")
diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp
index 0794c08..eb8ee41 100644
--- a/gemrb/core/GUI/GameControl.cpp
+++ b/gemrb/core/GUI/GameControl.cpp
@@ -2720,15 +2720,8 @@ Sprite2D* GameControl::GetPreview()
if (!x)
y = 0;
- int hf = HideGUI ();
- signed char v = Owner->Visible;
- Owner->Visible = WINDOW_VISIBLE;
Draw (0, 0);
- Owner->Visible = v;
Sprite2D *screenshot = video->GetScreenshot( Region(x, y, w, h) );
- if (hf) {
- UnhideGUI ();
- }
core->DrawWindows();
Sprite2D* preview = video->SpriteScaleDown ( screenshot, 5 );
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|