actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use OptionsCursorPlus

Browse Source
This commit is contained in:
Chris Danford
2005-07-30 04:49:50 +00:00
parent 27a4d9df27
commit 00b65ce3bc
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+17 -8
View File
@@ -135,7 +135,7 @@ void ScreenOptions::Init()
// init cursors // init cursors
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
m_Cursor[p].Load( m_sName, OptionsCursor::cursor ); m_Cursor[p].Load( m_sName, OptionsCursorPlus::cursor );
m_Cursor[p].Set( p ); m_Cursor[p].Set( p );
m_framePage.AddChild( &m_Cursor[p] ); m_framePage.AddChild( &m_Cursor[p] );
} }
@@ -427,10 +427,10 @@ void ScreenOptions::PositionCursors()
continue; continue;
ASSERT_M( iRow >= 0 && iRow < (int)m_pRows.size(), ssprintf("%i < %i", iRow, (int)m_pRows.size() ) ); ASSERT_M( iRow >= 0 && iRow < (int)m_pRows.size(), ssprintf("%i < %i", iRow, (int)m_pRows.size() ) );
OptionRow &OptionRow = *m_pRows[iRow]; const OptionRow &row = *m_pRows[iRow];
OptionsCursor &cursor = m_Cursor[pn]; OptionsCursorPlus &cursor = m_Cursor[pn];
const int iChoiceWithFocus = OptionRow.GetChoiceInRowWithFocus(pn); const int iChoiceWithFocus = row.GetChoiceInRowWithFocus(pn);
if( iChoiceWithFocus == -1 ) if( iChoiceWithFocus == -1 )
continue; // skip continue; // skip
@@ -438,6 +438,9 @@ void ScreenOptions::PositionCursors()
GetWidthXY( pn, iRow, iChoiceWithFocus, iWidth, iX, iY ); GetWidthXY( pn, iRow, iChoiceWithFocus, iWidth, iX, iY );
cursor.SetBarWidth( iWidth ); cursor.SetBarWidth( iWidth );
cursor.SetXY( (float)iX, (float)iY ); cursor.SetXY( (float)iX, (float)iY );
bool bCanGoLeft = iChoiceWithFocus > 0;
bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < row.GetRowDef().m_vsChoices.size()-1;
cursor.SetCanGo( bCanGoLeft, bCanGoRight );
} }
} }
@@ -445,7 +448,7 @@ void ScreenOptions::TweenCursor( PlayerNumber pn )
{ {
// Set the position of the cursor showing the current option the user is changing. // Set the position of the cursor showing the current option the user is changing.
const int iRow = m_iCurrentRow[pn]; const int iRow = m_iCurrentRow[pn];
ASSERT_M( iRow < (int)m_pRows.size(), ssprintf("%i < %i", iRow, (int)m_pRows.size() ) ); ASSERT_M( iRow >= 0 && iRow < (int)m_pRows.size(), ssprintf("%i < %i", iRow, (int)m_pRows.size() ) );
const OptionRow &row = *m_pRows[iRow]; const OptionRow &row = *m_pRows[iRow];
const int iChoiceWithFocus = row.GetChoiceInRowWithFocus(pn); const int iChoiceWithFocus = row.GetChoiceInRowWithFocus(pn);
@@ -453,15 +456,21 @@ void ScreenOptions::TweenCursor( PlayerNumber pn )
int iWidth, iX, iY; int iWidth, iX, iY;
GetWidthXY( pn, iRow, iChoiceWithFocus, iWidth, iX, iY ); GetWidthXY( pn, iRow, iChoiceWithFocus, iWidth, iX, iY );
OptionsCursor &cursor = m_Cursor[pn]; OptionsCursorPlus &cursor = m_Cursor[pn];
if( cursor.GetDestX() != (float) iX || cursor.GetDestY() != (float) iY ) if( cursor.GetDestX() != (float) iX ||
cursor.GetDestY() != (float) iY ||
cursor.GetBarWidth() != iWidth )
{ {
cursor.StopTweening(); cursor.StopTweening();
cursor.BeginTweening( CURSOR_TWEEN_SECONDS ); cursor.BeginTweening( CURSOR_TWEEN_SECONDS );
cursor.SetXY( (float)iX, (float)iY ); cursor.SetXY( (float)iX, (float)iY );
cursor.SetBarWidth( iWidth );
} }
cursor.SetBarWidth( iWidth );
bool bCanGoLeft = iChoiceWithFocus > 0;
bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < row.GetRowDef().m_vsChoices.size()-1;
cursor.SetCanGo( bCanGoLeft, bCanGoRight );
if( GAMESTATE->IsHumanPlayer(pn) ) if( GAMESTATE->IsHumanPlayer(pn) )
{ {
stepmania/src/ScreenOptions.h
+2 -1
View File
@@ -9,6 +9,7 @@
#include "DualScrollBar.h" #include "DualScrollBar.h"
#include "ThemeMetric.h" #include "ThemeMetric.h"
#include "OptionRow.h" #include "OptionRow.h"
#include "OptionsCursor.h"
class OptionRowHandler; class OptionRowHandler;
@@ -106,7 +107,7 @@ protected:
ActorFrame m_framePage; ActorFrame m_framePage;
AutoActor m_sprPage; AutoActor m_sprPage;
OptionsCursor m_Cursor[NUM_PLAYERS]; OptionsCursorPlus m_Cursor[NUM_PLAYERS];
Sprite m_sprLineHighlight[NUM_PLAYERS]; Sprite m_sprLineHighlight[NUM_PLAYERS];
BitmapText m_textPlayerName[NUM_PLAYERS]; BitmapText m_textPlayerName[NUM_PLAYERS];