From 69331992571f00f7be58cce4e8928b896b10471c Mon Sep 17 00:00:00 2001
From: silver1ce <none@none>
Date: Wed, 6 Jan 2010 12:26:18 +0200
Subject: call SetPosition when player relocated by movement generator.
 SetPosition should interrupt auras with movement or turn interrupt flags,
 update position for group, etc

--HG--
branch : trunk
---
 src/game/Map.cpp     | 4 ----
 src/game/Traveller.h | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 4fe35bd889b..c4845657eac 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1110,10 +1110,6 @@ Map::PlayerRelocation(Player *player, float x, float y, float z, float orientati
     {
         DEBUG_LOG("Player %s relocation grid[%u,%u]cell[%u,%u]->grid[%u,%u]cell[%u,%u]", player->GetName(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY());
 
-        // update player position for group at taxi flight
-        if (player->GetGroup() && player->isInFlight())
-            player->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
-
         NGridType* oldGrid = getNGrid(old_cell.GridX(), old_cell.GridY());
         RemoveFromGrid(player, oldGrid,old_cell);
         if (!old_cell.DiffGrid(new_cell))
diff --git a/src/game/Traveller.h b/src/game/Traveller.h
index 22200c719ec..5fb31df83e0 100644
--- a/src/game/Traveller.h
+++ b/src/game/Traveller.h
@@ -139,7 +139,7 @@ inline float Traveller<Player>::GetMoveDestinationTo(float x, float y, float z)
 template<>
 inline void Traveller<Player>::Relocation(float x, float y, float z, float orientation)
 {
-    i_traveller.GetMap()->PlayerRelocation(&i_traveller, x, y, z, orientation);
+    i_traveller.SetPosition(x, y, z, orientation);
 }
 
 template<>
-- 
cgit v1.2.3