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.

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

Fix: Do not split departing player research centers with team in non-shared research mode #3542

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Fix: Do not split departing player research centers with team in non-shared research mode #3542

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
37 changes: 36 additions & 1 deletion src/multijoin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,33 @@ void destroyPlayerResources(UDWORD player, bool quietly)
return;
}

static bool destroyMatchingStructs(UDWORD player, std::function<bool (STRUCTURE *)> cmp, bool quietly)
{
bool destroyedAnyStructs = false;
STRUCTURE *psStruct = apsStructLists[player];
while (psStruct)
{
STRUCTURE * psNext = psStruct->psNext;

if (cmp(psStruct))
{
// FIXME: look why destroyStruct() doesn't put back the feature like removeStruct() does
if (quietly || psStruct->pStructureType->type == REF_RESOURCE_EXTRACTOR) // don't show effects
{
removeStruct(psStruct, true);
}
else // show effects
{
destroyStruct(psStruct, gameTime);
}
destroyedAnyStructs = true;
}

psStruct = psNext;
}
return destroyedAnyStructs;
}

bool splitResourcesAmongTeam(UDWORD player)
{
auto team = NetPlay.players[player].team;
Expand Down Expand Up @@ -288,7 +315,15 @@ bool splitResourcesAmongTeam(UDWORD player)
// Distribute key structures
distributeMatchingStructs([](STRUCTURE *psStruct) { return psStruct->pStructureType->type == REF_RESOURCE_EXTRACTOR; });
distributeMatchingStructs([](STRUCTURE *psStruct) { return psStruct->pStructureType->type == REF_POWER_GEN; });
distributeMatchingStructs([](STRUCTURE *psStruct) { return psStruct->pStructureType->type == REF_RESEARCH; });
if (alliancesSharedResearch(game.alliance))
{
distributeMatchingStructs([](STRUCTURE *psStruct) { return psStruct->pStructureType->type == REF_RESEARCH; });
}
else
{
// destroy the research centers in unshared research mode
destroyMatchingStructs(player, [](STRUCTURE *psStruct) { return psStruct->pStructureType->type == REF_RESEARCH; }, false);
}
distributeMatchingStructs([](STRUCTURE *psStruct) { return psStruct->pStructureType->type == REF_COMMAND_CONTROL; });
distributeMatchingStructs([](STRUCTURE *psStruct) { return StructIsFactory(psStruct); });

Expand Down
Loading