[Gemrb-commits] gemrb: branch master updated. v0.6.6-160-gc7520b9

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  c7520b918ac372341e226b08a93fc0c354442c3d (commit)
       via  15a8db84d7750137f5f1e046ec00a1c395299af2 (commit)

Summary of changes:
 gemrb/GUIScripts/include.py |    3 +++
 gemrb/core/Interface.cpp    |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)
      from  699271890864d7f548d5a6092865d820d29b79ce (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=c7520b918ac372341e226b08a93fc0c354442c3d

commit c7520b918ac372341e226b08a93fc0c354442c3d
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Nov 27 19:20:28 2011 +0100

    Interface: added a default value for bpp

diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index 3fbe5bc..788cc4c 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -197,6 +197,7 @@ Interface::Interface(int iargc, char* iargv[])
 	NumFingScroll = 2;
 	TooltipDelay = 100;
 	IgnoreOriginalINI = 0;
+	Bpp = 32;
 	FullScreen = 0;
 	GUIScriptsPath[0] = 0;
 	GamePath[0] = 0;

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

commit 15a8db84d7750137f5f1e046ec00a1c395299af2
Author: Jaka Kranjc <lyn...@us...>
Date:   Sat Nov 26 23:25:23 2011 +0100

    include.py: added a checkvar shorthand

diff --git a/gemrb/GUIScripts/include.py b/gemrb/GUIScripts/include.py
index 6b84f55..230f490 100644
--- a/gemrb/GUIScripts/include.py
+++ b/gemrb/GUIScripts/include.py
@@ -16,3 +16,6 @@ def cc(cre, px=-1, py=-1):
 
 def ci(item, slot=-1, c0=1, c1=0, c2=0):
 	GemRB.CreateItem(GemRB.GameGetFirstSelectedPC(), item, slot, c0, c1, c2)
+
+def cv(var, context="GLOBAL"):
+	GemRB.CheckVar(var, context)

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


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