Commit 31-player lobby support (untested, needs follow-up)

Carry the remaining CTCL, lobby, and player-limit updates onto the new moreplayers branch.

This change set is intentionally marked untested and may still be broken. It needs follow-up validation and likely further work before it should be considered stable.

Co-authored-by: Claude Sonnet 4.6 (Anthropic) <noreply@anthropic.com>
Co-authored-by: GitHub Copilot <copilot@github.com>
This commit is contained in:
2026-07-19 14:38:58 -05:00
co-authored by Claude Sonnet 4.6 GitHub Copilot
parent 106bb5b59f
commit acd4e40fa2
10 changed files with 48 additions and 47 deletions
@@ -72,8 +72,8 @@
#define USE_O_MORE_PODS $$g_nMechPodNum$$ // 0 = use only 8
#if USE_O_MORE_PODS
#define MAX_ROSTER_COUNT 16 // Was 8
#define MAX_TEAMMATE_COUNT 8 // Was 4
#define MAX_ROSTER_COUNT 31 // max within 5-bit bitstream (0-31)
#define MAX_TEAMMATE_COUNT 15 // Was 4, then 8
#else
#define MAX_ROSTER_COUNT 8
#define MAX_TEAMMATE_COUNT 4 // Was 4
@@ -364,7 +364,7 @@ main
cur_team_val = callback($$CTCL_GetTeamParams$$, cur_team_count[0])
int skin_id ///////VERY IMPORTANT FOR NEW SKIN INTERFACE
int skin_ids[17]
int skin_ids[32]
int update_skin = false
// MSL 5.05
int decal_id ///////VERY IMPORTANT FOR NEW DECAL INTERFACE
@@ -522,7 +522,7 @@ main
///---------holds faction name for scroll list
string faction_name[17]
string faction_name[32]
callback($$Shell_CallbackHandler$$, ShellInitMPScreen)
@@ -645,12 +645,12 @@ main
team_legal_to_join[8] = TRUE
int update_team = 0
int max_players = 16
int max_players = 31 // max within 5-bit bitstream
int player_num = 0
// int num_of_teams = 8
int mech_id
int name_color[17]
int name_color[32]
int lupe
for lupe = 0; lupe < nRosterCount;lupe++
@@ -675,33 +675,33 @@ main
player_num = -1
// ComboBox for the Player Type
object o_BotList[17]
object o_BotList_bu[17]
int m_naLastSelected[17]
object o_BotList[32]
object o_BotList_bu[32]
int m_naLastSelected[32]
for x = 0; x < nRosterCount; x++
{
m_naLastSelected[x] = 0
}
object o_Editbox[17]
object o_print_text[17]
object o_mech_variant[17]
object o_mech_variant_bu[17]
object o_Editbox[32]
object o_print_text[32]
object o_mech_variant[32]
object o_mech_variant_bu[32]
#if USE_O_MECH_VARIANT2
object o_mech_variant2[17]
object o_mech_variant2_bu[17]
object o_mech_variant2[32]
object o_mech_variant2_bu[32]
#endif // USE_O_MECH_VARIANT2
object o_mech_rand[17]
object o_skins[17]
object o_skins_bu[17]
object o_mech_rand[32]
object o_skins[32]
object o_skins_bu[32]
// MSL 5.05
object o_decal[18]
object o_decal_bu[18]
object o_team[18]
object o_team_bu[18]
object o_decal_box[18]
object o_skin_box[18]
object o_status[18]
int roster_posy[18]
object o_decal[32]
object o_decal_bu[32]
object o_team[32]
object o_team_bu[32]
object o_decal_box[32]
object o_skin_box[32]
object o_status[32]
int roster_posy[32]
int coolbaby
int stock_size = 0
@@ -1005,7 +1005,7 @@ main
o_decal[x].list_item[15] = "16"
o_decal[x].list_item[16] = "17"
for coolbaby = 17;coolbaby < o_decal[x].list_size+1;coolbaby++
for coolbaby = 17;coolbaby < o_decal[x].list_size;coolbaby++
o_decal[x].list_item[coolbaby] = conv$(coolbaby+1)
o_decal[x].nselected = 3
@@ -1072,7 +1072,7 @@ main
o_skins[x].list_item[14] = "15"
o_skins[x].list_item[15] = "16"
for coolbaby = 16;coolbaby < o_skins[x].list_size+1;coolbaby++
for coolbaby = 16;coolbaby < o_skins[x].list_size;coolbaby++
o_skins[x].list_item[coolbaby] = conv$(coolbaby+1)
o_skins[x].nselected = 3
@@ -2714,7 +2714,7 @@ main
}
}
// MSL 5.06
if nLaunchState == 0 && (nTempPlayerCount > 16)
if nLaunchState == 0 && (nTempPlayerCount > 31)
{
o_error_string.text = "Too many player/bots"
nLaunchState = -7