[Gemrb-commits] gemrb: branch master updated. v0.6.2-309-g335e77f

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  335e77f16ed88c47fc54cdd835f71b4bee5f85cc (commit)

Summary of changes:
 gemrb/core/CharAnimations.cpp     |    1 -
 gemrb/core/GameScript/Actions.cpp |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
      from  1116b29a39cd3a9693ac274b29ee39816d799750 (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=335e77f16ed88c47fc54cdd835f71b4bee5f85cc

commit 335e77f16ed88c47fc54cdd835f71b4bee5f85cc
Author: Avenger <ave...@so...>
Date:   Sat Oct 30 22:41:24 2010 +0200

    cleanup

diff --git a/gemrb/core/CharAnimations.cpp b/gemrb/core/CharAnimations.cpp
index c4923cc..5f41037 100644
--- a/gemrb/core/CharAnimations.cpp
+++ b/gemrb/core/CharAnimations.cpp
@@ -2042,7 +2042,6 @@ void CharAnimations::GetLREquipmentRef(char* ResRef, unsigned char& Cycle,
 	Cycle = equip->Cycle;
 	//hackhackhack
 	sprintf( ResRef, "%4s%c%s", this->ResRef, equipRef[0], equip->Suffix );
-printf("LREquipment resref: %s\n", ResRef);
 }
 
 //Only for the ogre animation (MOGR)
diff --git a/gemrb/core/GameScript/Actions.cpp b/gemrb/core/GameScript/Actions.cpp
index a1e01ee..ecf3116 100644
--- a/gemrb/core/GameScript/Actions.cpp
+++ b/gemrb/core/GameScript/Actions.cpp
@@ -5918,7 +5918,7 @@ void GameScript::PickUpItem(Scriptable* Sender, Action* parameters)
 	if (Slot<0) {
 		return;
 	}
-	int res = core->CanMoveItem(c->inventory.GetSlotItem(Slot)/*, false*/ );
+	int res = core->CanMoveItem(c->inventory.GetSlotItem(Slot) );
 	if (!res) { //cannot move
 		return;
 	}

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


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