[Gemrb-commits] gemrb: branch master updated. v0.6.2-1656-g56083f1

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  56083f18df7eff32342982cdcb696e736298b268 (commit)
       via  e9f73367525a2dc23ebaa55e64bee2a019540367 (commit)

Summary of changes:
 gemrb/core/GUI/GameControl.cpp |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
      from  1e790f69c17c773f413b56e927b9f77d9083faf8 (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=56083f18df7eff32342982cdcb696e736298b268

commit 56083f18df7eff32342982cdcb696e736298b268
Author: Jaka Kranjc <lyn...@us...>
Date:   Wed Sep 7 11:21:23 2011 +0200

    do not rotate single-actor formations

diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp
index f49525a..45703a5 100644
--- a/gemrb/core/GUI/GameControl.cpp
+++ b/gemrb/core/GUI/GameControl.cpp
@@ -1921,9 +1921,11 @@ void GameControl::OnMouseDown(unsigned short x, unsigned short y, unsigned short
 		if (target_mode == TARGET_MODE_NONE) {
 			DrawSelectionRect = false;
 			MouseIsDown = false;
-			FormationRotation = true;
-			FormationPivotPoint.x = px;
-			FormationPivotPoint.y = py;
+			if (core->GetGame()->selected.size() > 1) {
+				FormationRotation = true;
+				FormationPivotPoint.x = px;
+				FormationPivotPoint.y = py;
+			}
 		}
 		break;
 	case GEM_MB_ACTION|GEM_MB_DOUBLECLICK:

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=e9f73367525a2dc23ebaa55e64bee2a019540367

commit e9f73367525a2dc23ebaa55e64bee2a019540367
Author: Brad Allred <brada@IT4.local>
Date:   Tue Sep 6 19:12:43 2011 -0600

    prevent mouse up from interacting with actors when rotating formation.
    
    Signed-off-by: Jaka Kranjc <lyn...@us...>

diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp
index e0d5485..f49525a 100644
--- a/gemrb/core/GUI/GameControl.cpp
+++ b/gemrb/core/GUI/GameControl.cpp
@@ -2010,7 +2010,8 @@ void GameControl::OnMouseUp(unsigned short x, unsigned short y, unsigned short B
 	}
 
 	//hidden actors are not selectable by clicking on them
-	Actor* actor = area->GetActor( p, GA_DEFAULT /*| GA_NO_DEAD */| GA_NO_HIDDEN | target_types);
+	Actor* actor = NULL;
+	if (!FormationRotation) actor = area->GetActor( p, GA_DEFAULT /*| GA_NO_DEAD */| GA_NO_HIDDEN | target_types);
 	if (Button == GEM_MB_MENU) {
 		if (actor) {
 			//from GSUtils

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


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