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

NUM_KeyboardRow

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-27 04:35:27 +00:00
parent 9e879c57a6
commit 527cd01034
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenTextEntry.cpp
+3 -3
View File
@@ -13,7 +13,7 @@
#include "RageInput.h" #include "RageInput.h"
#include "LocalizedString.h" #include "LocalizedString.h"
static const char* g_szKeys[NUM_KEYBOARD_ROWS][KEYS_PER_ROW] = static const char* g_szKeys[NUM_KeyboardRow][KEYS_PER_ROW] =
{ {
{"A","B","C","D","E","F","G","H","I","J","K","L","M"}, {"A","B","C","D","E","F","G","H","I","J","K","L","M"},
{"N","O","P","Q","R","S","T","U","V","W","X","Y","Z"}, {"N","O","P","Q","R","S","T","U","V","W","X","Y","Z"},
@@ -360,7 +360,7 @@ void ScreenTextEntryVisual::BeginScreen()
{ {
BitmapText &bt = *m_ptextKeys[r][x]; BitmapText &bt = *m_ptextKeys[r][x];
float fX = roundf( SCALE( x, 0, KEYS_PER_ROW-1, ROW_START_X, ROW_END_X ) ); float fX = roundf( SCALE( x, 0, KEYS_PER_ROW-1, ROW_START_X, ROW_END_X ) );
float fY = roundf( SCALE( r, 0, NUM_KEYBOARD_ROWS-1, ROW_START_Y, ROW_END_Y ) ); float fY = roundf( SCALE( r, 0, NUM_KeyboardRow-1, ROW_START_Y, ROW_END_Y ) );
bt.SetXY( fX, fY ); bt.SetXY( fX, fY );
} }
} }
@@ -406,7 +406,7 @@ void ScreenTextEntryVisual::MoveY( int iDir )
do do
{ {
m_iFocusY = enum_add2( m_iFocusY, +iDir ); m_iFocusY = enum_add2( m_iFocusY, +iDir );
wrap( (int&)m_iFocusY, NUM_KEYBOARD_ROWS ); wrap( (int&)m_iFocusY, NUM_KeyboardRow );
// HACK: Round to nearest option so that we always stop // HACK: Round to nearest option so that we always stop
// on KEYBOARD_ROW_SPECIAL. // on KEYBOARD_ROW_SPECIAL.
stepmania/src/ScreenTextEntry.h
+4 -3
View File
@@ -13,9 +13,10 @@ enum KeyboardRow
{ {
R1, R2, R3, R4, R5, R6, R7, R1, R2, R3, R4, R5, R6, R7,
KEYBOARD_ROW_SPECIAL, KEYBOARD_ROW_SPECIAL,
NUM_KEYBOARD_ROWS NUM_KeyboardRow,
KeyboardRow_Invalid
}; };
#define FOREACH_KeyboardRow( i ) FOREACH_ENUM( KeyboardRow, NUM_KEYBOARD_ROWS, i ) #define FOREACH_KeyboardRow( i ) FOREACH_ENUM( KeyboardRow, NUM_KeyboardRow, i )
const int KEYS_PER_ROW = 13; const int KEYS_PER_ROW = 13;
enum KeyboardRowSpecialKey enum KeyboardRowSpecialKey
{ {
@@ -120,7 +121,7 @@ protected:
KeyboardRow m_iFocusY; KeyboardRow m_iFocusY;
AutoActor m_sprCursor; AutoActor m_sprCursor;
BitmapText *m_ptextKeys[NUM_KEYBOARD_ROWS][KEYS_PER_ROW]; BitmapText *m_ptextKeys[NUM_KeyboardRow][KEYS_PER_ROW];
RageSound m_sndChange; RageSound m_sndChange;