aboutsummaryrefslogtreecommitdiff
path: root/src/game/WaypointMovementGenerator.cpp
diff options
context:
space:
mode:
authorMachiavelli <none@none>2009-06-16 18:40:57 +0200
committerMachiavelli <none@none>2009-06-16 18:40:57 +0200
commitbd054b84533305420e368fae85921e43c2382c78 (patch)
tree3ad43004b3505717781792afcdb80e7bf389bff2 /src/game/WaypointMovementGenerator.cpp
parente6c3d54e2686b4b7ee9f8ae3bd5815e126b8bfa6 (diff)
parent560ca5a2102a082f6712e1a3ec58f9f367532ade (diff)
*Merge
--HG-- branch : trunk
Diffstat (limited to 'src/game/WaypointMovementGenerator.cpp')
-rw-r--r--src/game/WaypointMovementGenerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index d256b01bd5d..cef7fd8d596 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -264,7 +264,7 @@ void FlightPathMovementGenerator::Finalize(Player & player)
player.clearUnitState(UNIT_STAT_IN_FLIGHT);
float x, y, z;
- i_destinationHolder.GetLocationNow(player.GetMapId(), x, y, z);
+ i_destinationHolder.GetLocationNow(player.GetBaseMap(), x, y, z);
player.SetPosition(x, y, z, player.GetOrientation());
}