Skip to content

Fix docking safety being increased twice in PBEM games #701

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 11, 2022
Merged

Fix docking safety being increased twice in PBEM games #701

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 5 additions & 15 deletions src/game/prest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,20 +483,10 @@ char Set_Goal(char plr, char which, char control)
case Prestige_Duration_D:
case Prestige_Duration_E:
case Prestige_Duration_F:
if (MAIL == 0 || MAIL == 3) {
pd = Mev[0].pad;
qt = Data->P[0].Udp[pd].Qty;
Data->P[0].Udp[pd].HInd = Data->P[0].PastMissionCount;
Data->P[0].Udp[pd].Poss[qt] = which;
Data->P[0].Udp[pd].PossVal[qt] = 0;
Data->P[0].Udp[pd].Mnth = tMo;
++Data->P[0].Udp[pd].Qty;
} else {
Data->Prestige[which].Place = plr;
Data->Prestige[which].Index = Data->P[plr].PastMissionCount;
Data->Prestige[which].Year = tYr;
Data->Prestige[which].Month = tMo;
}
Data->Prestige[which].Place = plr;
Data->Prestige[which].Index = Data->P[plr].PastMissionCount;
Data->Prestige[which].Year = tYr;
Data->Prestige[which].Month = tMo;

default:
break;
Expand Down Expand Up @@ -1205,7 +1195,7 @@ int U_AllotPrest(char plr, char mis)
} // if

// Don't increase docking safety twice in mail games
if (!(MAIL == 1 && plr == 0)) {
if (!((MAIL == 1 && plr == 0) || (MAIL == 2 && plr == 1))) {
if (Check_Dock(2) == 2) {
Data->P[plr].Misc[MISC_HW_DOCKING_MODULE].Safety += 10;
Data->P[plr].Misc[MISC_HW_DOCKING_MODULE].Safety = MIN(Data->P[plr].Misc[MISC_HW_DOCKING_MODULE].Safety, Data->P[plr].Misc[MISC_HW_DOCKING_MODULE].MaxSafety);
Expand Down