[Gemrb-commits] gemrb: branch master updated. v0.6.2-353-g5846542

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  58465422430cb4f2b6d3c0bfc81c38a50820c90d (commit)

Summary of changes:
 gemrb/core/Inventory.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
      from  17e9143ab3ef75448abb2beefae89a77dcac19d8 (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=58465422430cb4f2b6d3c0bfc81c38a50820c90d

commit 58465422430cb4f2b6d3c0bfc81c38a50820c90d
Author: Jaka Kranjc <lyn...@us...>
Date:   Mon Nov 1 21:52:39 2010 +0100

    reverted part of 65e70e91e6 so the bg2 portal key can be picked up again

diff --git a/gemrb/core/Inventory.cpp b/gemrb/core/Inventory.cpp
index f831c27..b1bf807 100644
--- a/gemrb/core/Inventory.cpp
+++ b/gemrb/core/Inventory.cpp
@@ -182,7 +182,8 @@ void Inventory::AddItem(CREItem *item)
 	Slots.push_back(item);
 	HackCharges(item);
 	//this will update the flags (needed for unmovable items in containers)
-	Changed=true;
+	//but those *can* be picked up (like the bg2 portal key), so we skip it
+	//Changed=true;
 }
 
 void Inventory::CalculateWeight()

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


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