[Gemrb-commits] gemrb: branch master updated. v0.6.2-425-ga455984

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a4559841372ee93ad7ee08bd6da15367f3a762e9 (commit)

Summary of changes:
 gemrb/core/GUI/GameControl.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
      from  907b6876f6de0b073acbfdfcf0220295de10e145 (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=a4559841372ee93ad7ee08bd6da15367f3a762e9

commit a4559841372ee93ad7ee08bd6da15367f3a762e9
Author: Jaka Kranjc <lyn...@us...>
Date:   Thu Nov 11 10:24:46 2010 +0100

    display the selection message only when selecting not also when targetting
     for combat or other actions

diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp
index 5471423..54f0a51 100644
--- a/gemrb/core/GUI/GameControl.cpp
+++ b/gemrb/core/GUI/GameControl.cpp
@@ -1922,7 +1922,9 @@ void GameControl::OnMouseUp(unsigned short x, unsigned short y, unsigned short B
 	if (!actor) return;
 
 	//we got an actor past this point
-	DisplayStringCore(actor, VB_SELECT+core->Roll(1,3,-1), DS_CONST|DS_CONSOLE);
+	if (target_mode == TARGET_MODE_NONE) {
+		DisplayStringCore(actor, VB_SELECT+core->Roll(1,3,-1), DS_CONST|DS_CONSOLE);
+	}
 
 	PerformActionOn(actor);
 }

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


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