From: Laszlo T. <ave...@us...> - 2011-02-26 22:02:56
|
gemrb: Infinity Engine emulator The branch master has been updated via e2437d07e0587a4dc8d48e46fb810d271f9c9dea (commit) via c3208b182a1dfd7ffca191a9991bde2e0862115d (commit) Summary of changes: gemrb/core/GUI/GameControl.cpp | 6 +++--- gemrb/plugins/GUIScript/GUIScript.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) from d0e56d14c23241007186942a7a7216d0eeb793be (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=e2437d07e0587a4dc8d48e46fb810d271f9c9dea commit e2437d07e0587a4dc8d48e46fb810d271f9c9dea Author: Avenger <ave...@so...> Date: Sat Feb 26 23:02:11 2011 +0100 fixed using items with target self diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp index a0d300d..5dc91c4 100644 --- a/gemrb/plugins/GUIScript/GUIScript.cpp +++ b/gemrb/plugins/GUIScript/GUIScript.cpp @@ -9107,7 +9107,8 @@ static PyObject* GemRB_UseItem(PyObject * /*self*/, PyObject* args) // switch (forcetarget) { case TARGET_SELF: - actor->UseItem(itemdata.slot, itemdata.headerindex, actor, flags); + gc->SetupItemUse(itemdata.slot, itemdata.headerindex, actor, GA_POINT, itemdata.TargetNumber); + gc->TryToCast(actor, actor); break; case TARGET_NONE: gc->ResetTargetMode(); http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c3208b182a1dfd7ffca191a9991bde2e0862115d commit c3208b182a1dfd7ffca191a9991bde2e0862115d Author: Avenger <ave...@so...> Date: Sat Feb 26 22:54:11 2011 +0100 reset targetmode instead of just update diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp index b80d467..b68b12b 100644 --- a/gemrb/core/GUI/GameControl.cpp +++ b/gemrb/core/GUI/GameControl.cpp @@ -1725,7 +1725,7 @@ void GameControl::HandleContainer(Container *container, Actor *actor) return; } - core->SetEventFlag(EF_TARGETMODE); + core->SetEventFlag(EF_RESETTARGET); if (target_mode == TARGET_MODE_ATTACK) { actor->ClearPath(); @@ -1763,7 +1763,7 @@ void GameControl::HandleDoor(Door *door, Actor *actor) return; } - core->SetEventFlag(EF_TARGETMODE); + core->SetEventFlag(EF_RESETTARGET); if (target_mode == TARGET_MODE_ATTACK) { actor->ClearPath(); @@ -1998,7 +1998,7 @@ void GameControl::OnMouseUp(unsigned short x, unsigned short y, unsigned short B } } else { if (HandleActiveRegion(overInfoPoint, pc, p)) { - core->SetEventFlag(EF_TARGETMODE); + core->SetEventFlag(EF_RESETTARGET); return; } } ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |