Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix docking/undocking (was activated for transporter instead of naval unit).

Browse source
This commit is contained in:
Joris 2012-09-06 19:28:24 +02:00
parent f3697901e2
commit 51b43dfb5a
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/action/action_move.cpp
View file

@ -131,7 +131,6 @@ int DoActionMove(CUnit &unit)
{
Vec2i posd; // movement in tile.
int d;
Vec2i pos;
Assert(unit.CanMove());
@ -168,19 +167,18 @@ int DoActionMove(CUnit &unit)
unit.Moving = 1;
break;
}
pos = unit.tilePos;
int off = unit.Offset;
//
// Transporter (un)docking?
//
// FIXME: This is an ugly hack
if (unit.Type->CanTransport()
&& ((Map.Field(off)->WaterOnMap() && Map.Field(pos + posd)->CoastOnMap())
|| (Map.Field(off)->CoastOnMap() && Map.Field(pos + posd)->WaterOnMap()))) {
PlayUnitSound(unit, VoiceDocking);
}
pos = unit.tilePos + posd;
if (unit.Type->UnitType == UnitTypeNaval) { // Boat (un)docking?
const CMapField& mf_cur = *Map.Field(unit.Offset);
const CMapField& mf_next = *Map.Field(unit.tilePos + posd);
if (mf_cur.WaterOnMap() && mf_next.CoastOnMap()) {
PlayUnitSound(unit, VoiceDocking);
} else if (mf_cur.CoastOnMap() && mf_next.WaterOnMap()) {
PlayUnitSound(unit, VoiceDocking); // undocking
}
}
Vec2i pos = unit.tilePos + posd;
unit.MoveToXY(pos);
// Remove unit from the current selection