[Gemrb-commits] gemrb: branch master updated. v0.6.2-208-g43df04e

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  43df04e7c2788a56c264ebc5a6c2b8e056a59813 (commit)

Summary of changes:
 gemrb/GUIScripts/GUISTORE.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
      from  0fec994f9b5b6810fedbd4cb2f96c3e468f9e53f (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=43df04e7c2788a56c264ebc5a6c2b8e056a59813

commit 43df04e7c2788a56c264ebc5a6c2b8e056a59813
Author: Jaka Kranjc <lyn...@us...>
Date:   Mon Sep 27 17:21:37 2010 +0200

    GUISTORE: always use the talking pc for price calculation

diff --git a/gemrb/GUIScripts/GUISTORE.py b/gemrb/GUIScripts/GUISTORE.py
index d19310f..87004ee 100644
--- a/gemrb/GUIScripts/GUISTORE.py
+++ b/gemrb/GUIScripts/GUISTORE.py
@@ -61,6 +61,7 @@ else:
 	ItemButtonCount = 4
 RepModTable = None
 PreviousPC = 0
+BarteringPC = 0
 
 # 0 - Store
 # 1 - Tavern
@@ -128,7 +129,7 @@ def OpenStoreWindow ():
 	global StoreWindow, ActionWindow, PortraitWindow
 	global OldPortraitWindow
 	global store_funcs
-	global Inventory, RepModTable
+	global Inventory, RepModTable, BarteringPC
 
 	#these are function pointers, not strings
 	#can't put this in global init, doh!
@@ -165,6 +166,7 @@ def OpenStoreWindow ():
 	ActionWindow.SetFrame ()
 
 	Store = GemRB.GetStore ()
+	BarteringPC = GemRB.GameGetFirstSelectedPC ()
 
 	# Done
 	Button = Window.GetControl (0)
@@ -1182,7 +1184,7 @@ def GetRealPrice (pc, mode, Item, Slot):
 			mod -= count * Store['Depreciation']
 
 	# charisma modifier (in percent)
-	mod += GemRB.GetAbilityBonus (IE_CHR, GemRB.GetPlayerStat (pc, IE_CHR) - 1, 0)
+	mod += GemRB.GetAbilityBonus (IE_CHR, GemRB.GetPlayerStat (BarteringPC, IE_CHR) - 1, 0)
 
 	# reputation modifier (in percent, but absolute)
 	mod = mod * RepModTable.GetValue (0, GemRB.GameGetReputation()/10 - 1) / 100

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


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