Skip to content

Commit fba5df7

Browse files
authored
tweak(gui): Disable the combo box for the host's player name (#1368)
1 parent 7d6845f commit fba5df7

File tree

4 files changed

+16
-26
lines changed

4 files changed

+16
-26
lines changed

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -671,11 +671,7 @@ void InitLanGameGadgets( void )
671671
GadgetComboBoxReset(comboBoxPlayer[i]);
672672
GadgetComboBoxGetEditBox(comboBoxPlayer[i])->winSetTooltipFunc(playerTooltip);
673673

674-
if(localSlotNum == i)
675-
{
676-
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheLAN->GetMyName(),white);
677-
}
678-
else
674+
if(localSlotNum != i)
679675
{
680676
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Open"),white);
681677
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Closed"),white);
@@ -819,6 +815,9 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
819815
lanUpdateSlotList();
820816
updateGameOptions();
821817
start = 1; // leave my combo boxes usable
818+
819+
// TheSuperHackers @tweak disable the combo box for the host's player name
820+
comboBoxPlayer[0]->winEnable(FALSE);
822821
}
823822
else
824823
{

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,14 +1057,7 @@ void InitWOLGameGadgets( void )
10571057
if (TheGameSpyInfo->amIHost())
10581058
staticTextPlayer[i]->winHide(TRUE);
10591059

1060-
if(i==0 && TheGameSpyInfo->amIHost())
1061-
{
1062-
UnicodeString uName;
1063-
uName.translate(TheGameSpyInfo->getLocalName());
1064-
GadgetComboBoxAddEntry(comboBoxPlayer[i],uName,GameSpyColor[GSCOLOR_PLAYER_OWNER]);
1065-
GadgetComboBoxSetSelectedPos(comboBoxPlayer[0],0);
1066-
}
1067-
else
1060+
if(theGameInfo->getLocalSlotNum() != i)
10681061
{
10691062
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Open"),GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
10701063
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Closed"),GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
@@ -1257,6 +1250,9 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
12571250

12581251
WOLDisplaySlotList();
12591252
WOLDisplayGameOptions();
1253+
1254+
// TheSuperHackers @tweak disable the combo box for the host's player name
1255+
comboBoxPlayer[0]->winEnable(FALSE);
12601256
}
12611257
else
12621258
{

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -741,11 +741,7 @@ void InitLanGameGadgets( void )
741741
GadgetComboBoxReset(comboBoxPlayer[i]);
742742
GadgetComboBoxGetEditBox(comboBoxPlayer[i])->winSetTooltipFunc(playerTooltip);
743743

744-
if(localSlotNum == i)
745-
{
746-
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheLAN->GetMyName(),white);
747-
}
748-
else
744+
if(localSlotNum != i)
749745
{
750746
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Open"),white);
751747
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Closed"),white);
@@ -897,6 +893,9 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
897893
lanUpdateSlotList();
898894
updateGameOptions();
899895
start = 1; // leave my combo boxes usable
896+
897+
// TheSuperHackers @tweak disable the combo box for the host's player name
898+
comboBoxPlayer[0]->winEnable(FALSE);
900899
}
901900
else
902901
{

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,14 +1206,7 @@ void InitWOLGameGadgets( void )
12061206
if (TheGameSpyInfo->amIHost())
12071207
staticTextPlayer[i]->winHide(TRUE);
12081208

1209-
if(i==0 && TheGameSpyInfo->amIHost())
1210-
{
1211-
UnicodeString uName;
1212-
uName.translate(TheGameSpyInfo->getLocalName());
1213-
GadgetComboBoxAddEntry(comboBoxPlayer[i],uName,GameSpyColor[GSCOLOR_PLAYER_OWNER]);
1214-
GadgetComboBoxSetSelectedPos(comboBoxPlayer[0],0);
1215-
}
1216-
else
1209+
if(theGameInfo->getLocalSlotNum() != i)
12171210
{
12181211
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Open"),GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
12191212
GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Closed"),GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
@@ -1434,6 +1427,9 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
14341427

14351428
WOLDisplaySlotList();
14361429
WOLDisplayGameOptions();
1430+
1431+
// TheSuperHackers @tweak disable the combo box for the host's player name
1432+
comboBoxPlayer[0]->winEnable(FALSE);
14371433
}
14381434
else
14391435
{

0 commit comments

Comments
 (0)