diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
commit | b1c4118a33f669f8be7131c7d37b34dbe63ff545 (patch) | |
tree | 468fdf51066947dd8254753ee98163be97d0d0b8 /src/server/game/Maps/Map.cpp | |
parent | f237a57f51c0473bda90bae7a06bd5b9c187754b (diff) | |
parent | 8d049545de87595a84e6e2c54d7b44b354644144 (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rwxr-xr-x | src/server/game/Maps/Map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 7e5a2ebb220..50218c8ba83 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -727,7 +727,7 @@ void Map::PlayerRelocation(Player* player, float x, float y, float z, float orie player->Relocate(x, y, z, orientation); if (player->IsVehicle()) - player->GetVehicleKit()->RelocatePassengers(x, y, z, orientation); + player->GetVehicleKit()->RelocatePassengers(); if (old_cell.DiffGrid(new_cell) || old_cell.DiffCell(new_cell)) { @@ -773,7 +773,7 @@ void Map::CreatureRelocation(Creature* creature, float x, float y, float z, floa { creature->Relocate(x, y, z, ang); if (creature->IsVehicle()) - creature->GetVehicleKit()->RelocatePassengers(x, y, z, ang); + creature->GetVehicleKit()->RelocatePassengers(); creature->UpdateObjectVisibility(false); RemoveCreatureFromMoveList(creature); } |