Skip to content

[GEN] Backport structure multi selection fix from Zero Hour #334

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 5 commits into
base: main
Choose a base branch
from

Conversation

ShizCalev
Copy link

@ShizCalev ShizCalev commented Mar 3, 2025

Squash and merge

syncs the two codebases up by backporting the (partial) fix. the exploit can still be performed, but it's harder according to @Mauller .

@ShizCalev ShizCalev changed the title Backports zh 1.03 scud storm exploit fix to base generals Fix: Backports zh 1.03 scud storm exploit fix to base generals Mar 4, 2025
@Generalcamo Generalcamo added Bug Something is not working right, typically is user facing GLA Affects GLA faction Major Severity: Minor < Major < Critical < Blocker Gen Relates to Generals labels Mar 6, 2025
@xezon xezon changed the title Fix: Backports zh 1.03 scud storm exploit fix to base generals [GEN] Fix GLA Scud Storm exploit by backporting Zero Hour 1.03 fix Mar 30, 2025
@ShizCalev ShizCalev changed the title [GEN] Fix GLA Scud Storm exploit by backporting Zero Hour 1.03 fix [GEN] Backports Zero Hour 1.03 GLA Scud Storm exploit fix Jul 2, 2025
@ShizCalev ShizCalev changed the title [GEN] Backports Zero Hour 1.03 GLA Scud Storm exploit fix [GEN] Backports Zero Hour 1.03 GLA Scud Storm exploit partial fix Jul 2, 2025
Copy link

@Mauller Mauller left a comment

Choose a reason for hiding this comment

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

This looks good, just needs a slight tweak on the white space.

return STATE_FAILURE;
}


Copy link

Choose a reason for hiding this comment

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

If you can remove the extra added white space before and after this block, then this should be good to go.

@Mauller Mauller changed the title [GEN] Backports Zero Hour 1.03 GLA Scud Storm exploit partial fix [GEN] Backport structure multi selection block from zero hour Jul 11, 2025
@xezon xezon changed the title [GEN] Backport structure multi selection block from zero hour [GEN] Backport structure multi selection fix from Zero Hour Jul 11, 2025
@xezon xezon added this to the Code foundation build up milestone Jul 11, 2025
@xezon xezon added the Unify Unifies code between Generals and Zero Hour label Jul 11, 2025
@xezon
Copy link

xezon commented Jul 11, 2025

The code does not align with Zero Hour in terms of white space. I suggest use WinMerge or similar tool to copy code without discrepancies. It is easy to do mistakes when done by hand..

@Mauller
Copy link

Mauller commented Jul 15, 2025

Still needs tweaking before this can be merged

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 Gen Relates to Generals GLA Affects GLA faction Major Severity: Minor < Major < Critical < Blocker Unify Unifies code between Generals and Zero Hour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants