move MadeChoice to a command played on the screen. Broadcasting it doesn't work if there are prepared screens.
This commit is contained in:
@@ -50,8 +50,6 @@ static const char *MessageNames[] = {
|
|||||||
"MenuRightP1",
|
"MenuRightP1",
|
||||||
"MenuRightP2",
|
"MenuRightP2",
|
||||||
"MenuSelectionChanged",
|
"MenuSelectionChanged",
|
||||||
"MadeChoiceP1",
|
|
||||||
"MadeChoiceP2",
|
|
||||||
"CoinInserted",
|
"CoinInserted",
|
||||||
"SideJoinedP1",
|
"SideJoinedP1",
|
||||||
"SideJoinedP2",
|
"SideJoinedP2",
|
||||||
|
|||||||
@@ -45,8 +45,6 @@ enum Message
|
|||||||
Message_MenuRightP1,
|
Message_MenuRightP1,
|
||||||
Message_MenuRightP2,
|
Message_MenuRightP2,
|
||||||
Message_MenuSelectionChanged,
|
Message_MenuSelectionChanged,
|
||||||
Message_MadeChoiceP1,
|
|
||||||
Message_MadeChoiceP2,
|
|
||||||
Message_CoinInserted,
|
Message_CoinInserted,
|
||||||
Message_SideJoinedP1,
|
Message_SideJoinedP1,
|
||||||
Message_SideJoinedP2,
|
Message_SideJoinedP2,
|
||||||
|
|||||||
@@ -679,7 +679,7 @@ float ScreenSelectMaster::DoMenuStart( PlayerNumber pn )
|
|||||||
|
|
||||||
m_bChosen[pn] = true;
|
m_bChosen[pn] = true;
|
||||||
|
|
||||||
MESSAGEMAN->Broadcast( (Message)(Message_MadeChoiceP1+pn) );
|
this->PlayCommand( "MadeChoice"+PlayerNumberToString(pn) );
|
||||||
|
|
||||||
bool bIsFirstToChoose = bAnyChosen;
|
bool bIsFirstToChoose = bAnyChosen;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user