Skip to content

[ZH] Fix multiplayer mismatch on starting a new game after exiting the previous game when power sabotaged #1238

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

Mauller
Copy link

@Mauller Mauller commented Jul 7, 2025

This PR prevents a mismatch from occuring in a new game when a previous game had the players power sabotaged.

Since the m_powerSabotagedTillFrame variable was not being reset, the game would think the players power was still sabotaged when starting a new game.
This is due to the m_powerSabotagedTillFrame value being greater than the current frame number, this then makes the game think the power is sabotaged.

@Mauller Mauller force-pushed the fix-power-sabotage-mismatch branch from e76ee47 to 807285e Compare July 7, 2025 16:52
@Mauller
Copy link
Author

Mauller commented Jul 7, 2025

Tweaked

@Mauller Mauller self-assigned this Jul 7, 2025
@Mauller Mauller added Major Severity: Minor < Major < Critical < Blocker Bug Something is not working right, typically is user facing ZH Relates to Zero Hour labels Jul 7, 2025
@Caball009
Copy link

This only applies to Zero Hour as the saboteur only exists there. I don't always remember which units were added in Zero Hour so I figured I mention it here in case anyone else was wondering whether this needs to be applied to Generals as well.

@xezon xezon added this to the Stability fixes milestone Jul 7, 2025
@xezon xezon changed the title [ZH] Fix power sabotage mismatch [ZH] Fix multiplayer mismatch on starting a new game after exiting the previous game when power sabotaged Jul 7, 2025
Copy link

@xezon xezon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good.

I tried improving the title but it is hard.

@Mauller
Copy link
Author

Mauller commented Jul 7, 2025

Very good.

I tried improving the title but it is hard.

I get it, i was trying to not go over the top with the title.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something is not working right, typically is user facing Major Severity: Minor < Major < Critical < Blocker ZH Relates to Zero Hour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Multiplayer match can mismatch if Saboteur was used to disable Power Plant in previous match
3 participants