[Gemrb-commits] gemrb: branch master updated. v0.7.0-398-gea21569

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  ea215698e985178696cfe366b0ef97a2fe2672f5 (commit)
       via  f08390346c3e778aa8fa0d7fd8c36b891dba9d07 (commit)
       via  26bebb1908ada40e2c654c9a9a168c2d89462700 (commit)

Summary of changes:
 gemrb/core/Inventory.cpp         |    4 ++--
 gemrb/override/iwd2/slottype.2da |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
      from  c38751cf90812158a1f1f9ba6450fbf1076cea1a (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=ea215698e985178696cfe366b0ef97a2fe2672f5

commit ea215698e985178696cfe366b0ef97a2fe2672f5
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Feb 26 14:11:29 2012 +0100

    iwd2: allow equipping of weapons in the shield slots

diff --git a/gemrb/override/iwd2/slottype.2da b/gemrb/override/iwd2/slottype.2da
index bb9600a..694fbd9 100644
--- a/gemrb/override/iwd2/slottype.2da
+++ b/gemrb/override/iwd2/slottype.2da
@@ -12,13 +12,13 @@
 2          64         21         STONBELT   12001      1	0
 3          128        25         STONBOOT   12005      1	0
 43         256        101        STONWEAP   12010      4	1
-44         4          102        STONSHIL   12010      6	0
+44         260        102        STONSHIL   12010      6	0
 45         256        103        STONWEAP   12010      4	1
-46         4          104        STONSHIL   12010      6	0
+46         260        104        STONSHIL   12010      6	0
 47         256        105        STONWEAP   12010      4	1
-48         4          106        STONSHIL   12010      6	0
+48         260        106        STONSHIL   12010      6	0
 49         256        107        STONWEAP   12010      4	1
-50         4          108        STONSHIL   12010      6	0
+50         260        108        STONSHIL   12010      6	0
 4          1024       24         STONCLOK   12004      1	0
 11         512        15         STONQUIV   12009      5	1
 12         512        16         STONQUIV   12009      5	1

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

commit f08390346c3e778aa8fa0d7fd8c36b891dba9d07
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Feb 26 14:11:00 2012 +0100

    iwd2: WhyCantEquip was checking the wrong slot for 2handedness

diff --git a/gemrb/core/Inventory.cpp b/gemrb/core/Inventory.cpp
index 0b73e6a..958097f 100644
--- a/gemrb/core/Inventory.cpp
+++ b/gemrb/core/Inventory.cpp
@@ -1777,7 +1777,7 @@ int Inventory::WhyCantEquip(int slot, int twohanded) const
 		//see GetShieldSlot
 		int otherslot;
 		if (IWD2) {
-			otherslot = ++i;
+			otherslot = i+1;
 		} else {
 			otherslot = SLOT_LEFT;
 		}

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

commit 26bebb1908ada40e2c654c9a9a168c2d89462700
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Feb 26 13:50:57 2012 +0100

    iwd2: fixed equipping twohanded weapons

diff --git a/gemrb/core/Inventory.cpp b/gemrb/core/Inventory.cpp
index ea94ce8..0b73e6a 100644
--- a/gemrb/core/Inventory.cpp
+++ b/gemrb/core/Inventory.cpp
@@ -1790,7 +1790,7 @@ int Inventory::WhyCantEquip(int slot, int twohanded) const
 
 	if (twohanded) {
 		if (IWD2) {
-			if (slot>=SLOT_MELEE&&slot<=LAST_MELEE && (slot&1) ) {
+			if (slot>=SLOT_MELEE&&slot<=LAST_MELEE && (slot-SLOT_MELEE)&1) {
 				return STR_NOT_IN_OFFHAND;
 			}
 		} else {

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


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