From 1430f261796a779878128910f10f00dc7c66e6cc Mon Sep 17 00:00:00 2001 From: Ryan Dortmans Date: Thu, 9 Sep 2004 16:14:21 +0000 Subject: [PATCH] Added Xbox implementation --- stepmania/src/PrefsManager.cpp | 1 + stepmania/src/PrefsManager.h | 1 + stepmania/src/ScreenCenterImage.cpp | 35 +++++++++++++++++++++++++++-- stepmania/src/ScreenCenterImage.h | 1 - 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 54e9afbfe5..19c7e6342e 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -240,6 +240,7 @@ void PrefsManager::Init() m_fScreenPosY = 0; m_fScreenWidth = 640; m_fScreenHeight = 480; + resizing = false; #else m_bInterlaced = false; #endif diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 353d5715e1..75f7ba5c45 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -37,6 +37,7 @@ public: float m_fScreenPosY; float m_fScreenWidth; float m_fScreenHeight; + bool resizing; // true when in the screen center screen #endif bool m_bDelayedTextureDelete; bool m_bTexturePreload; diff --git a/stepmania/src/ScreenCenterImage.cpp b/stepmania/src/ScreenCenterImage.cpp index 2c571fc0f8..05ac3d8196 100644 --- a/stepmania/src/ScreenCenterImage.cpp +++ b/stepmania/src/ScreenCenterImage.cpp @@ -10,11 +10,19 @@ #include "GameSoundManager.h" #include "ThemeManager.h" #include "RageDisplay.h" - +#include "HelpDisplay.h" ScreenCenterImage::ScreenCenterImage( CString sClassName ) : ScreenWithMenuElements( sClassName ) { LOG->Trace( "ScreenCenterImage::ScreenCenterImage()" ); + +#ifdef _XBOX + PREFSMAN->resizing = true; + CStringArray strArray; + CString text("Use the left analog stick to translate the screen and right right analog stick to scale"); + strArray.push_back(text); + m_textHelp->SetTips(strArray); +#endif m_textInstructions.LoadFromFont( THEME->GetPathToF("Common normal") ); m_textInstructions.SetText( "" ); @@ -31,6 +39,9 @@ ScreenCenterImage::ScreenCenterImage( CString sClassName ) : ScreenWithMenuEleme ScreenCenterImage::~ScreenCenterImage() { LOG->Trace( "ScreenCenterImage::~ScreenCenterImage()" ); +#ifdef _XBOX + PREFSMAN->resizing = false; +#endif } @@ -48,7 +59,6 @@ void ScreenCenterImage::Input( const DeviceInput& DeviceI, const InputEventType if( type == IET_RELEASE ) return; - bool bHoldingShift = INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_RSHIFT)) || INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_LSHIFT)); @@ -61,6 +71,27 @@ void ScreenCenterImage::Input( const DeviceInput& DeviceI, const InputEventType default: iScale = 1; break; } +#ifdef _XBOX + switch(DeviceI.button) + { + case JOY_9: + if(!IsTransitioning()) + { + SCREENMAN->PlayStartSound(); + StartTransitioning( SM_GoToNextScreen ); + } + break; + case JOY_10: + if(!IsTransitioning()) + { + SCREENMAN->PlayBackSound(); + StartTransitioning( SM_GoToPrevScreen ); + } + break; + } + return; +#endif + switch( DeviceI.button ) { case SDLK_SPACE: diff --git a/stepmania/src/ScreenCenterImage.h b/stepmania/src/ScreenCenterImage.h index 8d342ab794..8261824cc7 100644 --- a/stepmania/src/ScreenCenterImage.h +++ b/stepmania/src/ScreenCenterImage.h @@ -20,7 +20,6 @@ public: void DrawPrimitives(); private: - BitmapText m_textInstructions; };