[GEN][ZH] Fix reselection of group not always working

[roossienb]

• Resolves Centering the camera on a group does not (re)select the group #1332

From the issue:

When selecting a group via the 0 - 9 group hotkeys, the initial press selects the group. Double-pressing the respective group hotkey centers the camera on the group. However, the single-press vs double-press logic are two separate blocks, and the double-press logic does not (re)select the group.

Double pressing logic always assumed the group already is selected.
Rewrote the logic by breaking the if / else, now always (re)selecting the group - even on double press

Due to the re-arrangement of code, Github is not showing the changes very well. It is better to use compare next to each other.

[Mauller]

That bit of code you posted was backported from zero hour in selectionxlat to begin with, maybe it's just in a different place to where you were looking. #1305

[roossienb]

That bit of code you posted was backported from zero hour in selectionxlat to begin with, maybe it's just in a different place to where you were looking. #1305

It was backported in ADD_TEAM.
In generals it is also present in SELECT_TEAM

Not sure if it is needed. If not, than no point in backporting it to ZH.
Edit: yes it is exploitable by putting a building in a team, then select units and using SHIFT to add the team (building) to the units. So it does need to be backported to ZH.

Never mind, as @xezon remarked, I fixed the wrong section in Generals 😵.

But it seems like the exploit is still possible. Will still make a full PR for that.

[Mauller]

Not sure if it is needed. If not, than no point in backporting it to ZH. Edit: yes it is exploitable by putting a building in a team, then select units and using SHIFT to add the team (building) to the units. So it does need to be backported to ZH.

Never mind, as @xezon remarked, I fixed the wrong section in Generals 😵.

But it seems like the exploit is still possible. Will still make a full PR for that.

Yeah, preventing the building being added using shift to a new team will prevent the normal way of scud bugging.

[Stubbjax]

My apologies @roossienb! I actually already have a working solution here. I was just wanted to create the issue and have it triaged first before opening a PR.

[roossienb]

My apologies @roossienb! I actually already have a working solution here. I was just wanted to create the issue and have it triaged first before opening a PR.

Looks like you have a different solution to the issue. My suggestion would be to create a PR as an alternative to this one (and link it) and let the reviewers decide which implementation they like best. I don't mind either way.

[xezon]

What about the GameMessage::MSG_META_ADD_TEAM ? Shouldn't that be treated equally or similarly?

[roossienb]

What about the GameMessage::MSG_META_ADD_TEAM ? Shouldn't that be treated equally or similarly?

I'm not sure how that would work.

• select a group of units
• keep pressing shift + 1 to add the team to the selection
• deselect all units
• keep double tapping shift + 1
• ....
• what is the expected behaviour here? The original group of units cannot be selected anymore. Just select the group? Why would anyone keep tapping shift + 1?

[Mauller]

I think the stubjax version got merged for this in the end, so this could be closed.