[Gemrb-commits] gemrb: branch master updated. v0.7.1-255-g3703ea5

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  3703ea5af6a05956974db40f11cc57cba104c580 (commit)
       via  e765dfba1356fb2d1adf834a05eddbb89a286422 (commit)
       via  2728fe1b3492543da48b235c9d95b408f992d350 (commit)
       via  6af477bc11534f55a991ba397ed7548bb02b154a (commit)

Summary of changes:
 gemrb/GUIScripts/InventoryCommon.py   |    2 +-
 gemrb/core/Scriptable/Actor.cpp       |    2 +-
 gemrb/plugins/FXOpcodes/FXOpcodes.cpp |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
      from  545c713fd2e169109932afd3b72da09464491532 (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=3703ea5af6a05956974db40f11cc57cba104c580

commit 3703ea5af6a05956974db40f11cc57cba104c580
Merge: e765dfb 545c713
Author: Avenger <ave...@so...>
Date:   Fri Oct 12 21:00:50 2012 +0200

    Merge branch 'master' of ssh://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb


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

commit e765dfba1356fb2d1adf834a05eddbb89a286422
Author: Avenger <ave...@so...>
Date:   Fri Oct 12 20:48:30 2012 +0200

    int check is default for fx_learn_spell

diff --git a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
index 917e77e..44d1e2a 100644
--- a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
+++ b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
@@ -4275,8 +4275,8 @@ int fx_learn_spell (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 	//probably we should also let this via a game flag if we want
 	//full compatibility with bg1
 	//parameter2 is used in bg1 and pst to specify the spell type; bg2 and iwd2 figure it out from the resource
-
-	int x= target->LearnSpell(fx->Resource, fx->Parameter1);
+	//LS_STATS is on by default (int check)
+	int x= target->LearnSpell(fx->Resource, fx->Parameter1^LS_STATS);
 	print("Learnspell returned: %d", x);
 	return FX_NOT_APPLIED;
 }

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

commit 2728fe1b3492543da48b235c9d95b408f992d350
Author: Avenger <ave...@so...>
Date:   Fri Oct 12 20:47:34 2012 +0200

    check int only on difficulty > normal

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 403efd2..89a4e1b 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -5093,7 +5093,7 @@ int Actor::LearnSpell(const ieResRef spellname, ieDword flags)
 
 	ieDword kit = GetStat(IE_KIT);
 
-	if (flags & LS_STATS) {
+	if ((flags & LS_STATS) && (GameDifficulty>DIFF_NORMAL) ) {
 		// chance to learn roll
 		int roll = LuckyRoll(1, 100, 0);
 		// adjust the roll for specialist mages

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

commit 6af477bc11534f55a991ba397ed7548bb02b154a
Author: Avenger <ave...@so...>
Date:   Fri Oct 12 20:46:48 2012 +0200

    HasSpell returns spell index (-1 equals no spell)

diff --git a/gemrb/GUIScripts/InventoryCommon.py b/gemrb/GUIScripts/InventoryCommon.py
index e6a5dee..5b6a30f 100644
--- a/gemrb/GUIScripts/InventoryCommon.py
+++ b/gemrb/GUIScripts/InventoryCommon.py
@@ -746,7 +746,7 @@ def DelayedReadItemWindow ():
 	global level, spell_ref
 
 	pc = GemRB.GameGetSelectedPCSingle ()
-	if Spellbook.HasSpell (pc, IE_SPELL_TYPE_WIZARD, level, spell_ref):
+	if Spellbook.HasSpell (pc, IE_SPELL_TYPE_WIZARD, level, spell_ref)!=-1:
 		strref = 10830
 	else:
 		ret = LSR_FAILED

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


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