From 93cda2e331ea91272e7ae76fae9b62d75d717884 Mon Sep 17 00:00:00 2001 From: Per Inge Mathisen Date: Mon, 10 Jan 2011 19:15:27 +0100 Subject: [PATCH] Fix position changer, broken by a bad git stash merge (presumably). --- src/multiint.cpp | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/src/multiint.cpp b/src/multiint.cpp index 40a05dd88..5595a0f8b 100644 --- a/src/multiint.cpp +++ b/src/multiint.cpp @@ -2917,33 +2917,6 @@ static void processMultiopWidgets(UDWORD id) addPlayerBox(!ingame.bHostSetup || bHosted); } - if((id >= MULTIOP_PLAYER_START) && (id <= MULTIOP_PLAYER_END)) // clicked on a player - { - int player = id - MULTIOP_PLAYER_START; - - if (player == selectedPlayer && positionChooserUp < 0) - { - addPositionChooser(player); - } - else if (positionChooserUp == player) - { - closePositionChooser(); // changed his mind - addPlayerBox(!ingame.bHostSetup || bHosted); - } - else if (positionChooserUp >= 0) - { - // Switch player - resetReadyStatus(false); // will reset only locally if not a host - SendPositionRequest(positionChooserUp, NetPlay.players[player].position); - closePositionChooser(); - addPlayerBox(!ingame.bHostSetup || bHosted); - } - else if (!NetPlay.players[id - MULTIOP_PLAYER_START].allocated && !challengeActive) - { - addAiChooser(player); - } - } - if((id >= MULTIOP_COLCHOOSER) && (id <= MULTIOP_COLCHOOSER_END)) // chose a new colour. { resetReadyStatus(false); // will reset only locally if not a host