From: Jaka K. <lyn...@us...> - 2012-07-31 20:46:10
|
gemrb: Infinity Engine emulator The branch master has been updated via e36991919ac404c11df8cd0ef0b1eed3965010dc (commit) Summary of changes: gemrb/core/GUI/GameControl.cpp | 8 ++++---- gemrb/core/Scriptable/Actor.cpp | 2 +- gemrb/core/Scriptable/Actor.h | 2 +- gemrb/plugins/GUIScript/GUIScript.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) from ca52224f8aab9ba91b994a75f50ce767d4584617 (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=e36991919ac404c11df8cd0ef0b1eed3965010dc commit e36991919ac404c11df8cd0ef0b1eed3965010dc Author: Jaka Kranjc <lyn...@us...> Date: Tue Jul 31 22:41:21 2012 +0200 renamed Actor::SelectActor to reflect what it really does diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp index 988124c..00be239 100644 --- a/gemrb/core/GUI/GameControl.cpp +++ b/gemrb/core/GUI/GameControl.cpp @@ -760,7 +760,7 @@ void GameControl::SelectActor(int whom, int type) } if (type==1) { game->SelectActor( actor, true, SELECT_NORMAL ); - actor->SelectActor(); + actor->PlaySelectionSound(); return; } @@ -769,7 +769,7 @@ void GameControl::SelectActor(int whom, int type) if (was_selected || (ScreenFlags & SF_ALWAYSCENTER)) { ScreenFlags |= SF_CENTERONACTOR; } - actor->SelectActor(); + actor->PlaySelectionSound(); } } @@ -2077,7 +2077,7 @@ void GameControl::OnMouseUp(unsigned short x, unsigned short y, unsigned short B if (Button == GEM_MB_MENU && (!core->HasFeature(GF_HAS_FLOAT_MENU) || Mod)) { if (actor) { //play select sound on right click on actor - actor->SelectActor(); + actor->PlaySelectionSound(); return; } // reset the action bar @@ -2213,7 +2213,7 @@ void GameControl::OnMouseUp(unsigned short x, unsigned short y, unsigned short B //we got an actor past this point if (target_mode == TARGET_MODE_NONE) { //play select sound - actor->SelectActor(); + actor->PlaySelectionSound(); } PerformActionOn(actor); diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp index 943927a..f75f07b 100644 --- a/gemrb/core/Scriptable/Actor.cpp +++ b/gemrb/core/Scriptable/Actor.cpp @@ -3235,7 +3235,7 @@ bool Actor::GetPartyComment() } //call this only from gui selects -void Actor::SelectActor() +void Actor::PlaySelectionSound() { playedCommandSound = false; switch (sel_snd_freq) { diff --git a/gemrb/core/Scriptable/Actor.h b/gemrb/core/Scriptable/Actor.h index f0998d2..b733bcc 100644 --- a/gemrb/core/Scriptable/Actor.h +++ b/gemrb/core/Scriptable/Actor.h @@ -500,7 +500,7 @@ public: /* receives undead turning message */ void Turn(Scriptable *cleric, ieDword turnlevel); /* call this on gui selects */ - void SelectActor(); + void PlaySelectionSound(); /* call this when adding actions via gui */ void CommandActor(); /** handle panic and other involuntary actions that mess with scripting */ diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp index 203235a..b6f3ff2 100644 --- a/gemrb/plugins/GUIScript/GUIScript.cpp +++ b/gemrb/plugins/GUIScript/GUIScript.cpp @@ -5071,7 +5071,7 @@ static PyObject* GemRB_GameSelectPC(PyObject * /*self*/, PyObject* args) game->SelectActor( actor, (bool) Select, Flags ); if (actor && (bool) Select && !(Flags&SELECT_QUIET)) { - actor->SelectActor(); + actor->PlaySelectionSound(); } Py_INCREF( Py_None ); ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |