[Gemrb-commits] gemrb: branch master updated. v0.7.1-16-gd3aeba7

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  d3aeba7d614ba7fa8ef13cc8d022873ab7cc42a4 (commit)

Summary of changes:
 gemrb/core/GameScript/GSUtils.cpp       |    2 +-
 gemrb/core/Scriptable/Actor.cpp         |    2 +-
 gemrb/core/Scriptable/Actor.h           |    4 ++--
 gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
      from  fd2a68ea80ae89b3b1350d701abb5bf016fbe744 (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=d3aeba7d614ba7fa8ef13cc8d022873ab7cc42a4

commit d3aeba7d614ba7fa8ef13cc8d022873ab7cc42a4
Author: Jaka Kranjc <lyn...@us...>
Date:   Mon Jul 23 17:59:22 2012 +0200

    renamed SetTarget to FaceTarget to reflect what it really does

diff --git a/gemrb/core/GameScript/GSUtils.cpp b/gemrb/core/GameScript/GSUtils.cpp
index 285a14a..698f900 100644
--- a/gemrb/core/GameScript/GSUtils.cpp
+++ b/gemrb/core/GameScript/GSUtils.cpp
@@ -1325,7 +1325,7 @@ void AttackCore(Scriptable *Sender, Scriptable *target, int flags)
 		}
 	}
 	//action performed
-	actor->SetTarget( target );
+	actor->FaceTarget( target );
 
 	if ( Sender->GetCurrentArea()!=target->GetCurrentArea() ||
 		(PersonalDistance(Sender, target) > wi.range) ||
diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 277b50d..943927a 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -5198,7 +5198,7 @@ void Actor::AttackedBy( Actor *attacker)
 	}
 }
 
-void Actor::SetTarget( Scriptable *target)
+void Actor::FaceTarget( Scriptable *target)
 {
 	SetOrientation( GetOrient( target->Pos, Pos ), false );
 }
diff --git a/gemrb/core/Scriptable/Actor.h b/gemrb/core/Scriptable/Actor.h
index b20724b..f0998d2 100644
--- a/gemrb/core/Scriptable/Actor.h
+++ b/gemrb/core/Scriptable/Actor.h
@@ -599,8 +599,8 @@ public:
 	int GetAttackStyle() const;
 	/* adds the combatants to the attackers list */
 	void AttackedBy(Actor *actor);
-	/* sets target for immediate attack */
-	void SetTarget( Scriptable *actor);
+	/* reorients to face target (for immediate attack) */
+	void FaceTarget(Scriptable *actor);
 	/* returns the number of attacks (handles monk barehanded bonus) */
 	ieDword GetNumberOfAttacks() const;
 	/* starts combat round*/
diff --git a/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp b/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
index 688bbd0..a5bdaac 100644
--- a/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
+++ b/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
@@ -1941,7 +1941,7 @@ int fx_animal_rage (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 		}
 		//see the nearest enemy
 		if (SeeCore(target, Enemy, false)) {
-			target->SetTarget(target->GetCurrentArea()->GetActorByGlobalID(target->LastSeen));
+			target->FaceTarget(target->GetCurrentArea()->GetActorByGlobalID(target->LastSeen));
 			//this is highly unsure
 			//fx->Parameter1=1;
 		}
@@ -3337,7 +3337,7 @@ int fx_cleave (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 		if (enemy && (PersonalDistance(enemy, target)<50) && target->LastSeen!=target->LastTarget) {
 			displaymsg->DisplayConstantStringNameValue(STR_CLEAVE, DMC_WHITE, target, fx->Parameter1);
 			target->attackcount=fx->Parameter1;
-			target->SetTarget(enemy);
+			target->FaceTarget(enemy);
 			target->LastTarget=target->LastSeen;
 			//linger around for more
 			return FX_APPLIED;

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


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