[Gemrb-commits] gemrb: branch master updated. 0098e3044dcb3b7eda8d2b7ca44fca83aa1984b8

[Alyssa M. <fu...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  0098e3044dcb3b7eda8d2b7ca44fca83aa1984b8 (commit)

Summary of changes:
 gemrb/core/Scriptable/Actor.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
      from  1d3ccfde399eeccaa7c7c59d2727966a27f9b8ff (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=0098e3044dcb3b7eda8d2b7ca44fca83aa1984b8

commit 0098e3044dcb3b7eda8d2b7ca44fca83aa1984b8
Author: Alyssa Milburn <fu...@fu...>
Date:   Sat Jul 31 21:30:05 2010 +0200

    fix weapon slots in ReinitQuickSlots

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 46e6309..1744d63 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -3419,7 +3419,7 @@ void Actor::ReinitQuickSlots()
 			case ACT_WEAPON2:
 			case ACT_WEAPON3:
 			case ACT_WEAPON4:
-				CheckWeaponQuickSlot(which);
+				CheckWeaponQuickSlot(which-ACT_WEAPON1);
 				slot = 0;
 				break;
 				//WARNING:this cannot be condensed, because the symbols don't come in order!!!

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


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