[Gemrb-commits] gemrb: branch master updated. v0.6.2-311-ge4d3531

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  e4d353184dffbca4ad895540b14c7779abb2fec5 (commit)

Summary of changes:
 gemrb/override/pst/gemrb.ini          |    1 +
 gemrb/override/pst/item_use.2da       |   50 ++++++++++++++++----------------
 gemrb/plugins/GUIScript/GUIScript.cpp |    5 ++-
 3 files changed, 30 insertions(+), 26 deletions(-)
      from  7d531dc872b0c23a32d3e7eeed84a971c8ad13fe (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=e4d353184dffbca4ad895540b14c7779abb2fec5

commit e4d353184dffbca4ad895540b14c7779abb2fec5
Author: Avenger <ave...@so...>
Date:   Sat Oct 30 23:26:20 2010 +0200

    implemented swap-only items in pst

diff --git a/gemrb/override/pst/gemrb.ini b/gemrb/override/pst/gemrb.ini
index fe6ae43..4a820fe 100644
--- a/gemrb/override/pst/gemrb.ini
+++ b/gemrb/override/pst/gemrb.ini
@@ -82,6 +82,7 @@ HasWisdomBonusTable = 1
 AutoSearchHidden = 1
 CutsceneAreascripts = 1
 PSTStateFlags = 1
+NoDropCanMove = 1
 
 [charset]
 CharCount = 31
diff --git a/gemrb/override/pst/item_use.2da b/gemrb/override/pst/item_use.2da
index 4eb2efe..749c8fd 100644
--- a/gemrb/override/pst/item_use.2da
+++ b/gemrb/override/pst/item_use.2da
@@ -1,27 +1,27 @@
 2DA V1.0
 *
-           USER       STRREF     
-AVEST      ANNAH      59142      
-JER_BR     ANNAH      61795      
-           ANNAH      61796      
-JER_FS     ANNAH      61797      
-           ANNAH      61798      
-ZERTH      DAKKON     59143      
-           GRACE      59144      
-BOD_PQ     GRACE      59145      
-BOD_GP     GRACE      59146      
-CHASTITY   GRACE      59147      
-VHAILOR    VHAILOR    59148      
-CIRCLEZ    DAKKON     59149      
-KARACH     DAKKON     59149      
-KARACH2    DAKKON     59149      
-GDIARY     GRACE      59150      
-GDIARY     GRACE      59151      
-GDIARY     GRACE      59152      
-NORDBOLT   NORDOM     59153      
-EYEBALL    NAMELESS   59154      
-EYEGLAS1   NAMELESS   59154      
-EYEGLAS2   NAMELESS   59154      
-EYEKAL     NAMELESS   59154      
-EYEKALEM   NAMELESS   59154      
-EYEVECNA   NAMELESS   59154      
+           USER       STRREF     FLAG
+AVEST      ANNAH      59142      7
+JER_BR     ANNAH      61795      7
+           ANNAH      61796      7
+JER_FS     ANNAH      61797      7
+           ANNAH      61798      7
+ZERTH      DAKKON     59143      7
+           GRACE      59144      7
+BOD_PQ     GRACE      59145      7
+BOD_GP     GRACE      59146      7
+CHASTITY   GRACE      59147      7
+VHAILOR    VHAILOR    59148      7
+CIRCLEZ    DAKKON     59149      2
+KARACH     DAKKON     59149      7
+KARACH2    DAKKON     59149      7
+GDIARY     GRACE      59150      1
+GDIARY     GRACE      59151      1
+GDIARY     GRACE      59152      1
+NORDBOLT   NORDOM     59153      7
+EYEBALL    NAMELESS   59154      7
+EYEGLAS1   NAMELESS   59154      7
+EYEGLAS2   NAMELESS   59154      7
+EYEKAL     NAMELESS   59154      7
+EYEKALEM   NAMELESS   59154      7
+EYEVECNA   NAMELESS   59154      7
diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
index 028b293..9e5261c 100644
--- a/gemrb/plugins/GUIScript/GUIScript.cpp
+++ b/gemrb/plugins/GUIScript/GUIScript.cpp
@@ -7142,19 +7142,22 @@ int CheckRemoveItem(Actor *actor, CREItem *si, int action)
 		int nomatch = (UsedItems[i].username[0] && strnicmp(UsedItems[i].username, actor->GetScriptName(), 32) );
 
 		switch(action) {
+		//the named actor cannot remove it
 		case CRI_REMOVE:
 			if (UsedItems[i].flags&1) {
 				if (nomatch) continue;
 			} else continue;
 			break;
+		//the named actor can equip it
 		case CRI_EQUIP:
 			if (UsedItems[i].flags&2) {
 				if (!nomatch) continue;
 			} else continue;
 			break;
+		//the named actor can swap it
 		case CRI_SWAP:
 			if (UsedItems[i].flags&4) {
-				if (nomatch) continue;
+				if (!nomatch) continue;
 			} else continue;
 			break;
 		}

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


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