This commit is contained in:
Glenn Maynard
2006-09-14 05:18:40 +00:00
parent 6ab3e33490
commit 3fe68d7f7d
7 changed files with 9 additions and 16 deletions
+2 -2
View File
@@ -190,7 +190,7 @@ void Screen::Input( const InputEventPlus &input )
}
/* Don't make the user hold the back button if they're pressing escape and escape is the back button. */
if( input.MenuI.button == MENU_BUTTON_BACK && input.DeviceI.device == DEVICE_KEYBOARD && input.DeviceI.button == KEY_ESC )
if( input.MenuI == MENU_BUTTON_BACK && input.DeviceI.device == DEVICE_KEYBOARD && input.DeviceI.button == KEY_ESC )
{
this->MenuBack( input.pn );
return;
@@ -247,7 +247,7 @@ bool Screen::JoinInput( const InputEventPlus &input )
if( !GAMESTATE->PlayersCanJoin() )
return false;
if( input.MenuI.IsValid() && input.MenuI.button==MENU_BUTTON_START )
if( input.MenuI.IsValid() && input.MenuI == MENU_BUTTON_START )
{
/* If this side is already in, don't re-join (and re-pay!). */
if(GAMESTATE->m_bSideIsJoined[input.pn])