From 0495b83ecff7cd3fab3f4c148ff79215d434d535 Mon Sep 17 00:00:00 2001 From: Charles Lohr Date: Thu, 10 Mar 2005 16:55:11 +0000 Subject: [PATCH] Fix: VC6 compile. Maybe we should try to figure out a clean way of doing this in VC6 insted of having these nasty GetValue()'s everywhere. --- stepmania/src/ScreenGameplay.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index ed182409a9..5dbff9a1a0 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1722,8 +1722,8 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ * * However, if this is also a style button, don't do this. (pump center = start) */ bool bHoldingGiveUp = false; - bHoldingGiveUp |= (MenuI.button == MENU_BUTTON_START && !StyleI.IsValid() && START_GIVES_UP); - bHoldingGiveUp |= (MenuI.button == MENU_BUTTON_BACK && !StyleI.IsValid() && BACK_GIVES_UP); + bHoldingGiveUp |= (MenuI.button == MENU_BUTTON_START && !StyleI.IsValid() && START_GIVES_UP.GetValue()); + bHoldingGiveUp |= (MenuI.button == MENU_BUTTON_BACK && !StyleI.IsValid() && BACK_GIVES_UP.GetValue()); if( bHoldingGiveUp ) { @@ -1745,7 +1745,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ /* Only handle MENU_BUTTON_BACK as a regular BACK button if BACK_GIVES_UP is * disabled. */ - if( MenuI.button == MENU_BUTTON_BACK && !BACK_GIVES_UP ) + if( MenuI.button == MENU_BUTTON_BACK && !BACK_GIVES_UP.GetValue() ) { if( ((!PREFSMAN->m_bDelayedBack && type==IET_FIRST_PRESS) || (DeviceI.device==DEVICE_KEYBOARD && (type==IET_SLOW_REPEAT||type==IET_FAST_REPEAT)) ||