Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move kick button back into its proper place. Closes ticket:2506

master
Per Inge Mathisen 2011-02-27 10:26:26 +01:00
parent bfe900b78e
commit 88788ad501
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/multiint.cpp
View File

@ -2038,10 +2038,7 @@ static void addTeamChooser(UDWORD player)
initChooser(player); initChooser(player);
// add form. // add form.
addBlueForm(MULTIOP_PLAYERS,MULTIOP_TEAMCHOOSER_FORM,"", addBlueForm(MULTIOP_PLAYERS, MULTIOP_TEAMCHOOSER_FORM, "", 7, playerBoxHeight(player), MULTIOP_ROW_WIDTH, MULTIOP_TEAMSHEIGHT);
7,
playerBoxHeight(player),
MULTIOP_ROW_WIDTH,MULTIOP_TEAMSHEIGHT);
// tally up the team counts // tally up the team counts
for (i=0; i< game.maxPlayers ; i++) for (i=0; i< game.maxPlayers ; i++)
@ -2076,11 +2073,10 @@ static void addTeamChooser(UDWORD player)
// add a kick button // add a kick button
if (player != selectedPlayer && NetPlay.bComms && NetPlay.isHost && NetPlay.players[player].allocated) if (player != selectedPlayer && NetPlay.bComms && NetPlay.isHost && NetPlay.players[player].allocated)
{ {
addMultiBut(psWScreen,MULTIOP_TEAMCHOOSER_FORM, MULTIOP_TEAMCHOOSER_KICK, const int imgwidth = iV_GetImageWidth(FrontImages, IMAGE_NOJOIN);
8*(teamW + 5) + 7, 8, const int imgheight = iV_GetImageHeight(FrontImages, IMAGE_NOJOIN);
iV_GetImageWidth(FrontImages,IMAGE_NOJOIN), //w addMultiBut(psWScreen, MULTIOP_TEAMCHOOSER_FORM, MULTIOP_TEAMCHOOSER_KICK, MULTIOP_ROW_WIDTH - imgwidth - 4, 8, imgwidth, imgheight,
iV_GetImageHeight(FrontImages,IMAGE_NOJOIN), //h ("Kick player"), IMAGE_NOJOIN, IMAGE_NOJOIN, IMAGE_NOJOIN);
_("Kick player"), IMAGE_NOJOIN, IMAGE_NOJOIN, IMAGE_NOJOIN);
} }
teamChooserUp = player; teamChooserUp = player;