[Gemrb-commits] gemrb: branch master updated. v0.7.1-364-g07f0386

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  07f0386c41ab4271e528a0b7da0438cb7e8b8a6e (commit)

Summary of changes:
 gemrb/plugins/GUIScript/GUIScript.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
      from  189f28b4480ebde669869be65fdc8237922ae84f (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=07f0386c41ab4271e528a0b7da0438cb7e8b8a6e

commit 07f0386c41ab4271e528a0b7da0438cb7e8b8a6e
Author: Avenger <ave...@so...>
Date:   Sun Nov 11 00:24:05 2012 +0100

    display the cursed string if the item is cursed

diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
index 8590914..d474706 100644
--- a/gemrb/plugins/GUIScript/GUIScript.cpp
+++ b/gemrb/plugins/GUIScript/GUIScript.cpp
@@ -7409,7 +7409,11 @@ CREItem *TryToUnequip(Actor *actor, unsigned int Slot, unsigned int Count)
 	///fixme: make difference between cursed/unmovable
 	if (! actor->inventory.UnEquipItem( Slot, false )) {
 		// Item is currently undroppable/cursed
-		displaymsg->DisplayConstantString(STR_CANT_DROP_ITEM, DMC_WHITE);
+		if (si->Flags&IE_INV_ITEM_CURSED) {
+			displaymsg->DisplayConstantString(STR_CURSED, DMC_WHITE);
+		} else {
+			displaymsg->DisplayConstantString(STR_CANT_DROP_ITEM, DMC_WHITE);
+		}
 		return NULL;
 	}
 	si = actor->inventory.RemoveItem( Slot, Count );

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


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