Revert "Added first implementation."

Caball009 · Caball009 · commit beea96f4596a · 2026-06-02T16:50:51.000+02:00
This reverts commit 83c3f3b.
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
@@ -1171,13 +1171,9 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 			{
 				if (LANbuttonPushed)
 					break;
-
-				LANGameInfo* myGame = TheLAN->GetMyGame();
-				if (myGame->isGameInProgress())
-					return MSG_IGNORED;
-
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
+				LANGameInfo *myGame = TheLAN->GetMyGame();
 
         if ( controlID == comboBoxStartingCashID )
         {
@@ -1243,11 +1239,6 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 			{
 				if (LANbuttonPushed)
 					break;
-
-				LANGameInfo* myGame = TheLAN->GetMyGame();
-				if (myGame->isGameInProgress())
-					return MSG_IGNORED;
-
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 
@@ -1298,7 +1289,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 						TheLAN->RequestAccept();
 
 						// Disable the accept button
-						EnableAcceptControls(TRUE, myGame, comboBoxPlayer, comboBoxColor, comboBoxPlayerTemplate,
+						EnableAcceptControls(TRUE, TheLAN->GetMyGame(), comboBoxPlayer, comboBoxColor, comboBoxPlayerTemplate,
 							comboBoxTeam, buttonAccept, buttonStart, buttonMapStartPosition);
 
 					}
@@ -1313,10 +1304,11 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 					{
 						if (controlID == buttonMapStartPositionID[i])
 						{
+							LANGameInfo *game = TheLAN->GetMyGame();
 							Int playerIdxInPos = -1;
 							for (Int j=0; j<MAX_SLOTS; ++j)
 							{
-								LANGameSlot *slot = myGame->getLANSlot(j);
+								LANGameSlot *slot = game->getLANSlot(j);
 								if (slot && slot->getStartPos() == i)
 								{
 									playerIdxInPos = j;
@@ -1325,8 +1317,8 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 							}
 							if (playerIdxInPos >= 0)
 							{
-								LANGameSlot *slot = myGame->getLANSlot(playerIdxInPos);
-								if (playerIdxInPos == myGame->getLocalSlotNum() || (myGame->amIHost() && slot && slot->isAI()))
+								LANGameSlot *slot = game->getLANSlot(playerIdxInPos);
+								if (playerIdxInPos == game->getLocalSlotNum() || (game->amIHost() && slot && slot->isAI()))
 								{
 									// it's one of my type.  Try to change it.
 									Int nextPlayer = getNextSelectablePlayer(playerIdxInPos+1);
@@ -1342,7 +1334,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 								// nobody in the slot - put us in
 								Int nextPlayer = getNextSelectablePlayer(0);
 								if (nextPlayer < 0)
-									nextPlayer = getFirstSelectablePlayer(myGame);
+									nextPlayer = getFirstSelectablePlayer(game);
 								handleStartPositionSelection(nextPlayer, i);
 							}
 						}
@@ -1357,21 +1349,17 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 			if (LANbuttonPushed)
 				break;
 
-			LANGameInfo* myGame = TheLAN->GetMyGame();
-			if (myGame->isGameInProgress())
-				return MSG_IGNORED;
-
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-
 			for (Int i = 0; i < MAX_SLOTS; i++)
 			{
 				if (controlID == buttonMapStartPositionID[i])
 				{
+					LANGameInfo *game = TheLAN->GetMyGame();
 					Int playerIdxInPos = -1;
 					for (Int j=0; j<MAX_SLOTS; ++j)
 					{
-						LANGameSlot *slot = myGame->getLANSlot(j);
+						LANGameSlot *slot = game->getLANSlot(j);
 						if (slot && slot->getStartPos() == i)
 						{
 							playerIdxInPos = j;
@@ -1380,8 +1368,8 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 					}
 					if (playerIdxInPos >= 0)
 					{
-						LANGameSlot *slot = myGame->getLANSlot(playerIdxInPos);
-						if (playerIdxInPos == myGame->getLocalSlotNum() || (myGame->amIHost() && slot && slot->isAI()))
+						LANGameSlot *slot = game->getLANSlot(playerIdxInPos);
+						if (playerIdxInPos == game->getLocalSlotNum() || (game->amIHost() && slot && slot->isAI()))
 						{
 							// it's one of my type.  Remove it.
 							handleStartPositionSelection(playerIdxInPos, -1);
@@ -1396,11 +1384,6 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 			{
 				if (LANbuttonPushed)
 					break;
-
-				LANGameInfo* myGame = TheLAN->GetMyGame();
-				if (myGame->isGameInProgress())
-					return MSG_IGNORED;
-
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 

Original file line number	Diff line number	Diff line change
`@@ -1171,13 +1171,9 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m`
`1171`	`1171`	`{`
`1172`	`1172`	`if (LANbuttonPushed)`
`1173`	`1173`	`break;`
`1174`		`-`
`1175`		`- LANGameInfo* myGame = TheLAN->GetMyGame();`
`1176`		`- if (myGame->isGameInProgress())`
`1177`		`- return MSG_IGNORED;`
`1178`		`-`
`1179`	`1174`	`GameWindow control = (GameWindow )mData1;`
`1180`	`1175`	`Int controlID = control->winGetWindowId();`
	`1176`	`+ LANGameInfo *myGame = TheLAN->GetMyGame();`
`1181`	`1177`
`1182`	`1178`	`if ( controlID == comboBoxStartingCashID )`
`1183`	`1179`	`{`
`@@ -1243,11 +1239,6 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m`
`1243`	`1239`	`{`
`1244`	`1240`	`if (LANbuttonPushed)`
`1245`	`1241`	`break;`
`1246`		`-`
`1247`		`- LANGameInfo* myGame = TheLAN->GetMyGame();`
`1248`		`- if (myGame->isGameInProgress())`
`1249`		`- return MSG_IGNORED;`
`1250`		`-`
`1251`	`1242`	`GameWindow control = (GameWindow )mData1;`
`1252`	`1243`	`Int controlID = control->winGetWindowId();`
`1253`	`1244`
`@@ -1298,7 +1289,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m`
`1298`	`1289`	`TheLAN->RequestAccept();`
`1299`	`1290`
`1300`	`1291`	`// Disable the accept button`
`1301`		`- EnableAcceptControls(TRUE, myGame, comboBoxPlayer, comboBoxColor, comboBoxPlayerTemplate,`
	`1292`	`+ EnableAcceptControls(TRUE, TheLAN->GetMyGame(), comboBoxPlayer, comboBoxColor, comboBoxPlayerTemplate,`
`1302`	`1293`	`comboBoxTeam, buttonAccept, buttonStart, buttonMapStartPosition);`
`1303`	`1294`
`1304`	`1295`	`}`
`@@ -1313,10 +1304,11 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m`
`1313`	`1304`	`{`
`1314`	`1305`	`if (controlID == buttonMapStartPositionID[i])`
`1315`	`1306`	`{`
	`1307`	`+ LANGameInfo *game = TheLAN->GetMyGame();`
`1316`	`1308`	`Int playerIdxInPos = -1;`
`1317`	`1309`	`for (Int j=0; j<MAX_SLOTS; ++j)`
`1318`	`1310`	`{`
`1319`		`- LANGameSlot *slot = myGame->getLANSlot(j);`
	`1311`	`+ LANGameSlot *slot = game->getLANSlot(j);`
`1320`	`1312`	`if (slot && slot->getStartPos() == i)`
`1321`	`1313`	`{`
`1322`	`1314`	`playerIdxInPos = j;`
`@@ -1325,8 +1317,8 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m`
`1325`	`1317`	`}`
`1326`	`1318`	`if (playerIdxInPos >= 0)`
`1327`	`1319`	`{`
`1328`		`- LANGameSlot *slot = myGame->getLANSlot(playerIdxInPos);`
`1329`		`- if (playerIdxInPos == myGame->getLocalSlotNum() \|\| (myGame->amIHost() && slot && slot->isAI()))`
	`1320`	`+ LANGameSlot *slot = game->getLANSlot(playerIdxInPos);`
	`1321`	`+ if (playerIdxInPos == game->getLocalSlotNum() \|\| (game->amIHost() && slot && slot->isAI()))`
`1330`	`1322`	`{`
`1331`	`1323`	`// it's one of my type. Try to change it.`
`1332`	`1324`	`Int nextPlayer = getNextSelectablePlayer(playerIdxInPos+1);`
`@@ -1342,7 +1334,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m`
`1342`	`1334`	`// nobody in the slot - put us in`
`1343`	`1335`	`Int nextPlayer = getNextSelectablePlayer(0);`
`1344`	`1336`	`if (nextPlayer < 0)`
`1345`		`- nextPlayer = getFirstSelectablePlayer(myGame);`
	`1337`	`+ nextPlayer = getFirstSelectablePlayer(game);`
`1346`	`1338`	`handleStartPositionSelection(nextPlayer, i);`
`1347`	`1339`	`}`
`1348`	`1340`	`}`
`@@ -1357,21 +1349,17 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m`
`1357`	`1349`	`if (LANbuttonPushed)`
`1358`	`1350`	`break;`
`1359`	`1351`
`1360`		`- LANGameInfo* myGame = TheLAN->GetMyGame();`
`1361`		`- if (myGame->isGameInProgress())`
`1362`		`- return MSG_IGNORED;`
`1363`		`-`
`1364`	`1352`	`GameWindow control = (GameWindow )mData1;`
`1365`	`1353`	`Int controlID = control->winGetWindowId();`
`1366`		`-`
`1367`	`1354`	`for (Int i = 0; i < MAX_SLOTS; i++)`
`1368`	`1355`	`{`
`1369`	`1356`	`if (controlID == buttonMapStartPositionID[i])`
`1370`	`1357`	`{`
	`1358`	`+ LANGameInfo *game = TheLAN->GetMyGame();`
`1371`	`1359`	`Int playerIdxInPos = -1;`
`1372`	`1360`	`for (Int j=0; j<MAX_SLOTS; ++j)`
`1373`	`1361`	`{`
`1374`		`- LANGameSlot *slot = myGame->getLANSlot(j);`
	`1362`	`+ LANGameSlot *slot = game->getLANSlot(j);`
`1375`	`1363`	`if (slot && slot->getStartPos() == i)`
`1376`	`1364`	`{`
`1377`	`1365`	`playerIdxInPos = j;`
`@@ -1380,8 +1368,8 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m`
`1380`	`1368`	`}`
`1381`	`1369`	`if (playerIdxInPos >= 0)`
`1382`	`1370`	`{`
`1383`		`- LANGameSlot *slot = myGame->getLANSlot(playerIdxInPos);`
`1384`		`- if (playerIdxInPos == myGame->getLocalSlotNum() \|\| (myGame->amIHost() && slot && slot->isAI()))`
	`1371`	`+ LANGameSlot *slot = game->getLANSlot(playerIdxInPos);`
	`1372`	`+ if (playerIdxInPos == game->getLocalSlotNum() \|\| (game->amIHost() && slot && slot->isAI()))`
`1385`	`1373`	`{`
`1386`	`1374`	`// it's one of my type. Remove it.`
`1387`	`1375`	`handleStartPositionSelection(playerIdxInPos, -1);`
`@@ -1396,11 +1384,6 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m`
`1396`	`1384`	`{`
`1397`	`1385`	`if (LANbuttonPushed)`
`1398`	`1386`	`break;`
`1399`		`-`
`1400`		`- LANGameInfo* myGame = TheLAN->GetMyGame();`
`1401`		`- if (myGame->isGameInProgress())`
`1402`		`- return MSG_IGNORED;`
`1403`		`-`
`1404`	`1387`	`GameWindow control = (GameWindow )mData1;`
`1405`	`1388`	`Int controlID = control->winGetWindowId();`
`1406`	`1389`