[Gemrb-commits] gemrb: branch master updated. v0.7.2-242-gc39697d

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  c39697d42cfd3e138a634f422d1eef4f63b4351a (commit)
       via  7524a93ac7d9cea458c6f814babc43448c715a67 (commit)

Summary of changes:
 gemrb/core/Scriptable/Actor.cpp |    6 ++++--
 gemrb/core/Scriptable/Actor.h   |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
      from  740bca7a037d2e4594e9d05e3397cf49c404ef95 (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=c39697d42cfd3e138a634f422d1eef4f63b4351a

commit c39697d42cfd3e138a634f422d1eef4f63b4351a
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Jan 1 21:01:49 2013 +0100

    add missing change from 7524a93ac

diff --git a/gemrb/core/Scriptable/Actor.h b/gemrb/core/Scriptable/Actor.h
index b4e7681..4820bf1 100644
--- a/gemrb/core/Scriptable/Actor.h
+++ b/gemrb/core/Scriptable/Actor.h
@@ -238,7 +238,7 @@ typedef std::vector< ScriptedAnimation*> vvcVector;
 
 struct WeaponInfo {
 	int slot;
-	int enchantment;
+	ieDword enchantment;
 	unsigned int range;
 	ieDword itemflags;
 	ieDword prof;

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

commit 7524a93ac7d9cea458c6f814babc43448c715a67
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Jan 1 20:38:34 2013 +0100

    Actor::GetRangedWeapon: enchantment of launchers and ammo do not add up

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 0fa128f..af514ff 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -5196,8 +5196,10 @@ ITMExtHeader *Actor::GetRangedWeapon(WeaponInfo &wi) const
 		Log(WARNING, "Actor", "Missing or invalid ranged weapon item: %s!", wield->ItemResRef);
 		return NULL;
 	}
-	//The magic of the bow and the arrow add up?
-	wi.enchantment += item->Enchantment;
+	//The magic of the bow and the arrow do not add up
+	if (item->Enchantment > wi.enchantment) {
+		wi.enchantment = item->Enchantment;
+	}
 	wi.itemflags = wield->Flags;
 	//wi.range is not set, the projectile has no effect on range?
 

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


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