From: Jaka K. <lyn...@us...> - 2012-06-10 08:08:42
|
gemrb: Infinity Engine emulator The branch master has been updated via 874f72880a8ab34a37cf7cbee4224517e8537821 (commit) Summary of changes: gemrb/plugins/GUIScript/GUIScript.cpp | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) from 29a0423bb34256cabd5d1ffaf52439e6da7f2729 (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=874f72880a8ab34a37cf7cbee4224517e8537821 commit 874f72880a8ab34a37cf7cbee4224517e8537821 Author: Tommy Gunn <ola...@us...> Date: Sun Jun 10 10:02:01 2012 +0200 fixed encumbrance labels showing bad numbers while dragging bad being often zero :) Signed-off-by: Jaka Kranjc <lyn...@us...> diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp index fe480e1..4f46b1b 100644 --- a/gemrb/plugins/GUIScript/GUIScript.cpp +++ b/gemrb/plugins/GUIScript/GUIScript.cpp @@ -7442,6 +7442,8 @@ static PyObject* GemRB_DragItem(PyObject * /*self*/, PyObject* args) } else { si = TryToUnequip( actor, core->QuerySlot(Slot), Count ); actor->RefreshEffects(NULL); + // make sure the encumbrance labels stay correct + actor->CalculateSpeed(false); actor->ReinitQuickSlots(); core->SetEventFlag(EF_SELECTION); } @@ -7605,6 +7607,8 @@ static PyObject* GemRB_DropDraggedItem(PyObject * /*self*/, PyObject* args) if (res) { //release it only when fully placed if (res==ASI_SUCCESS) { + // make sure the encumbrance labels stay correct + actor->CalculateSpeed(false); core->ReleaseDraggedItem (); } // res == ASI_PARTIAL @@ -7629,6 +7633,8 @@ static PyObject* GemRB_DropDraggedItem(PyObject * /*self*/, PyObject* args) res = ASI_SWAPPED; //EquipItem (in AddSlotItem) already called RefreshEffects actor->RefreshEffects(NULL); + // make sure the encumbrance labels stay correct + actor->CalculateSpeed(false); actor->ReinitQuickSlots(); core->SetEventFlag(EF_SELECTION); } else { ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |