[Gemrb-commits] gemrb: branch master updated. v0.6.2-259-gfe08c4d

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  fe08c4d068490d1e713ae055a3784bb46393a522 (commit)
       via  155ca694ef74507a9293807034a9ab7353c1ac2a (commit)

Summary of changes:
 gemrb/GUIScripts/bg2/GUICommonWindows.py |    5 +++++
 gemrb/core/Game.cpp                      |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
      from  460c883af26512dbef5ecd4aca75bd59101186b6 (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=fe08c4d068490d1e713ae055a3784bb46393a522

commit fe08c4d068490d1e713ae055a3784bb46393a522
Author: Jaka Kranjc <lyn...@us...>
Date:   Sat Oct 23 19:01:36 2010 +0200

    Game::SelectPCSingle: allow selection of dead pcs

diff --git a/gemrb/core/Game.cpp b/gemrb/core/Game.cpp
index a7204fa..64dc54b 100644
--- a/gemrb/core/Game.cpp
+++ b/gemrb/core/Game.cpp
@@ -473,7 +473,7 @@ void Game::SetHotKey(unsigned long Key)
 bool Game::SelectPCSingle(int index)
 {
 	Actor* actor = FindPC( index );
-	if (!actor || ! actor->ValidTarget( GA_NO_DEAD | GA_NO_HIDDEN ))
+	if (!actor || ! actor->ValidTarget( GA_NO_HIDDEN ))
 		return false;
 
 	SelectedSingle = index;

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=155ca694ef74507a9293807034a9ab7353c1ac2a

commit 155ca694ef74507a9293807034a9ab7353c1ac2a
Author: Jaka Kranjc <lyn...@us...>
Date:   Sat Oct 23 18:59:43 2010 +0200

    bg2: let dead pcs be visible only in temple type of stores
    somewhat buggy

diff --git a/gemrb/GUIScripts/bg2/GUICommonWindows.py b/gemrb/GUIScripts/bg2/GUICommonWindows.py
index ed3a19d..1d50ee2 100644
--- a/gemrb/GUIScripts/bg2/GUICommonWindows.py
+++ b/gemrb/GUIScripts/bg2/GUICommonWindows.py
@@ -635,6 +635,11 @@ def UpdatePortraitWindow ():
 		pic = GemRB.GetPlayerPortrait (portid+1, 1)
 		if Inventory and pc != portid+1:
 			pic = None
+		if pic and GemRB.GetPlayerStat(portid+1, IE_STATE_ID) & STATE_DEAD:
+			import GUISTORE
+			# dead pcs are hidden in all stores but temples
+			if GUISTORE.StoreWindow and not GUISTORE.StoreHealWindow:
+				pic = None
 
 		if not pic:
 			Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_SET)

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator