Skip to content

Increased Team Sizes (ITS)#331

Merged
Asdow merged 197 commits into
masterfrom
ExtraMercs
Sep 24, 2025
Merged

Increased Team Sizes (ITS)#331
Asdow merged 197 commits into
masterfrom
ExtraMercs

Conversation

@Asdow
Copy link
Copy Markdown
Contributor

@Asdow Asdow commented Nov 9, 2024

BREAKS SAVEGAME COMPATIBILITY

Change SOLDIERTYPE ubID to UINT16, lifting the restrictions on max amount of mercs, enemies, civs, creatures in tactical mode.

Asdow added 30 commits October 10, 2022 10:08
uint8 -> uint16
Fix an access to member variable that prevented compilation
Fix missing variable declaration
Pressing Shift and right or left arrow buttons, 'a' or 'd' buttons, or previous or next ingame buttons now advance one whole page. Without shift pressed down, all three function as original and move one merc at a time.
Unimplemented feature of browsing 4 mercs forward/backwards in personnel page.
ubEnemyKilledOnAttacker is size UINT16 but loading function was reading only UINT8 worth for it
As per the old comment, even though the field value is updated partially according to whether there are known enemies present or not, it's not used for anything.
Goal is to convert all use of SOLDIERTYPE->ubID and any other ID fields that reference the same ID to a safer type than UINT16. Same with any function that's supposed to take ubID
All raw array accesses should be done with these instead.
Mainly aimed for strategic movement popup box to accommodate increased team sizes
@Asdow Asdow force-pushed the ExtraMercs branch 2 times, most recently from 63a6ab2 to 97fdf79 Compare April 13, 2025 18:53
* Use the new columns added to Text instead
* Changed most functions to allow choosing a column
* Removed unneeded SecondColumn specific functions to lessen code duplication
* Lots of formatting changes to Popupbox.cpp, indentation was messed up in majority of the functions
@Asdow Asdow marked this pull request as ready for review August 8, 2025 16:11
@Asdow Asdow requested a review from majcosta August 8, 2025 18:26
@Asdow Asdow merged commit f52ab32 into master Sep 24, 2025
12 checks passed
@Asdow Asdow deleted the ExtraMercs branch September 24, 2025 21:16
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.

Increased team sizes

1 participant