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

ScreenNetSelectBase metric name changes:

Browse Source 
UsersDX -> UserSpacingX
UsersAY -> UsersLine2Y
This commit is contained in:
AJ Kelly
2010-09-10 15:42:52 -05:00
parent 5fbacf5690
commit 377d559413
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm-ssc.txt
+5
View File
@@ -13,6 +13,11 @@ _____________________________________________________________________________
sm-ssc v1.0 "final" | to be released 20100910 sm-ssc v1.0 "final" | to be released 20100910
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
20100910
--------
* [ScreenNetSelectBase] Metric name changes: UsersDX -> UserSpacingX,
UsersAY -> UsersLine2Y
20100907 20100907
-------- --------
* [StepsDisplay] Make everything else (that isn't the frame) react to the * [StepsDisplay] Make everything else (that isn't the frame) react to the
src/ScreenNetSelectBase.cpp
+11 -10
View File
@@ -21,10 +21,10 @@
#define CHAT_TEXT_INPUT_WIDTH THEME->GetMetricF(m_sName,"ChatTextInputWidth") #define CHAT_TEXT_INPUT_WIDTH THEME->GetMetricF(m_sName,"ChatTextInputWidth")
#define SHOW_CHAT_LINES THEME->GetMetricI(m_sName,"ChatOutputLines") #define SHOW_CHAT_LINES THEME->GetMetricI(m_sName,"ChatOutputLines")
#define USERSALT_Y THEME->GetMetricF(m_sName,"UsersAY")
#define USERSDELT_X THEME->GetMetricF(m_sName,"UsersDX")
#define USERS_Y THEME->GetMetricF(m_sName,"UsersY")
#define USERS_X THEME->GetMetricF(m_sName,"UsersX") #define USERS_X THEME->GetMetricF(m_sName,"UsersX")
#define USERS_Y THEME->GetMetricF(m_sName,"UsersY")
#define USER_SPACING_X THEME->GetMetricF(m_sName,"UserSpacingX")
#define USER_ADD_Y THEME->GetMetricF(m_sName,"UserLine2Y")
AutoScreenMessage( SM_AddToChat ) AutoScreenMessage( SM_AddToChat )
AutoScreenMessage( SM_UsersUpdate ) AutoScreenMessage( SM_UsersUpdate )
@@ -79,7 +79,7 @@ void ScreenNetSelectBase::Input( const InputEventPlus &input )
bool bHoldingCtrl = bool bHoldingCtrl =
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL)) || INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL)) || INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL)) ||
(!NSMAN->useSMserver); //If we are disconnected, assume no chatting (!NSMAN->useSMserver); // If we are disconnected, assume no chatting.
switch( input.DeviceI.button ) switch( input.DeviceI.button )
{ {
@@ -109,7 +109,9 @@ void ScreenNetSelectBase::Input( const InputEventPlus &input )
UpdateTextInput(); UpdateTextInput();
} }
//Tricky: If both players are playing, allow the 2 button through to the keymapper // Tricky: If both players are playing, allow the 2 button through to
// the keymapper. (who? -aj)
// What purpose does this serve? -aj
if( c == '2' && GAMESTATE->IsPlayerEnabled( PLAYER_2 ) && GAMESTATE->IsPlayerEnabled( PLAYER_1 ) ) if( c == '2' && GAMESTATE->IsPlayerEnabled( PLAYER_2 ) && GAMESTATE->IsPlayerEnabled( PLAYER_1 ) )
break; break;
@@ -117,7 +119,7 @@ void ScreenNetSelectBase::Input( const InputEventPlus &input )
return; return;
break; break;
} }
Screen::Input( input ); // default input handler Screen::Input( input );
} }
void ScreenNetSelectBase::HandleScreenMessage( const ScreenMessage SM ) void ScreenNetSelectBase::HandleScreenMessage( const ScreenMessage SM )
@@ -155,7 +157,7 @@ void ScreenNetSelectBase::UpdateTextInput()
void ScreenNetSelectBase::UpdateUsers() void ScreenNetSelectBase::UpdateUsers()
{ {
float tX = USERS_X - USERSDELT_X; float tX = USERS_X - USER_SPACING_X;
float tY = USERS_Y; float tY = USERS_Y;
for( unsigned i=0; i< m_textUsers.size(); i++) for( unsigned i=0; i< m_textUsers.size(); i++)
@@ -173,10 +175,10 @@ void ScreenNetSelectBase::UpdateUsers()
m_textUsers[i].SetShadowLength( 0 ); m_textUsers[i].SetShadowLength( 0 );
m_textUsers[i].SetName( "Users" ); m_textUsers[i].SetName( "Users" );
tX += USERSDELT_X; tX += USER_SPACING_X;
if ( (i % 2) == 1) if ( (i % 2) == 1)
tY = USERSALT_Y + USERS_Y; tY = USER_ADD_Y + USERS_Y;
else else
tY = USERS_Y; tY = USERS_Y;
m_textUsers[i].SetXY( tX, tY ); m_textUsers[i].SetXY( tX, tY );
@@ -397,7 +399,6 @@ void ColorBitmapText::SetMaxLines( int iNumLines, int iDirection )
for( unsigned i = 0; i < m_wTextLines.size() - iNumLines; i++ ) for( unsigned i = 0; i < m_wTextLines.size() - iNumLines; i++ )
shift += m_wTextLines[i].length(); shift += m_wTextLines[i].length();
// When we're cutting out text, we need to maintain the last // When we're cutting out text, we need to maintain the last
// color, so our text at the top doesn't become colorless. // color, so our text at the top doesn't become colorless.
RageColor LastColor; RageColor LastColor;