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

Use the game queues in campaign mode #3302

Merged

Conversation

past-due
Copy link
Member

@past-due past-due commented Jul 9, 2023

The game queues are partially used in campaign mode, but some special cases exist. Let's see if removing them is a problem.

Current changes:

  • order.cpp: Remove special case for campaign
    • In orderDroid, orderDroidStatsLocDir, orderDroidStatsTwoLocDir

Some other suspicious things that need investigation:

warzone2100/src/droid.cpp

Lines 292 to 303 in 60d4ebc

// This should be sent even if multi messages are turned off, as the group message that was
// sent won't contain the destroyed droid
if (bMultiPlayer && !bMultiMessages)
{
bMultiMessages = true;
destroyDroid(psDroid, impactTime);
bMultiMessages = false;
}
else
{
destroyDroid(psDroid, impactTime);
}

(Possibly because of removeDroidBase->assignFactoryCommandDroid->secondarySetState, which has a if (bMultiMessages && mode == ModeQueue) check?)

In orderDroid, orderDroidStatsLocDir, orderDroidStatsTwoLocDir
@past-due past-due marked this pull request as ready for review July 17, 2023 17:13
@past-due past-due merged commit 814435a into Warzone2100:master Aug 4, 2023
@past-due past-due deleted the 2023_07_campaign_use_the_queues_1 branch August 4, 2023 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant