Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

missionMoveTransporterOffWorld: Clear additional state #3945

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/mission.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1813,6 +1813,13 @@ void missionMoveTransporterOffWorld(DROID *psTransporter)
//stop the droid moving - the moveUpdate happens AFTER the orderUpdate and can cause problems if the droid moves from one tile to another
moveReallyStopDroid(psTransporter);

// clear targets / action targets
setDroidTarget(psTransporter, nullptr);
for (int i = 0; i < MAX_WEAPONS; i++)
{
setDroidActionTarget(psTransporter, nullptr, i);
}

//if offworld mission, then add the timer
//if (mission.type == LDS_MKEEP || mission.type == LDS_MCLEAR)
if (missionCanReEnforce() && psTransporter->player == selectedPlayer)
Expand Down
Loading