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

Style to match the rest of the code.

Browse Source
This commit is contained in:
Steve Checkoway
2007-02-17 13:03:59 +00:00
parent bcbb72cfe0
commit 515bb3b263
2 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RoomWheel.cpp
+8 -10
View File
@@ -40,8 +40,8 @@ WheelItemBase *RoomWheel::MakeItem()
return new RoomWheelItem; return new RoomWheelItem;
} }
RoomWheelItem::RoomWheelItem( RString sType ) RoomWheelItem::RoomWheelItem( RString sType ):
:WheelItemBase( sType ) WheelItemBase( sType )
{ {
Load( sType ); Load( sType );
} }
@@ -77,14 +77,12 @@ void RoomWheelItem::Load( RString sType )
void RoomWheel::BuildWheelItemsData( vector<WheelItemBaseData*> &arrayWheelItemDatas ) void RoomWheel::BuildWheelItemsData( vector<WheelItemBaseData*> &arrayWheelItemDatas )
{ {
if( arrayWheelItemDatas.empty() ) if( arrayWheelItemDatas.empty() )
{
arrayWheelItemDatas.push_back( new RoomWheelData(TYPE_GENERIC, "- EMPTY -", "", RageColor(1,0,0,1)) ); arrayWheelItemDatas.push_back( new RoomWheelData(TYPE_GENERIC, "- EMPTY -", "", RageColor(1,0,0,1)) );
} }
}
void RoomWheel::AddPerminateItem( RoomWheelData *itemdata ) void RoomWheel::AddPerminateItem( RoomWheelData *itemdata )
{ {
m_offset++; ++m_offset;
AddItem( itemdata ); AddItem( itemdata );
} }
@@ -103,10 +101,8 @@ void RoomWheel::AddItem( WheelItemBaseData* pItemData )
// If the item was shown in the wheel, rebuild the wheel // If the item was shown in the wheel, rebuild the wheel
if( 0 <= iIndex - iVisible && iIndex - iVisible < NUM_WHEEL_ITEMS ) if( 0 <= iIndex - iVisible && iIndex - iVisible < NUM_WHEEL_ITEMS )
{
RebuildWheelItems(); RebuildWheelItems();
} }
}
void RoomWheel::RemoveItem( int index ) void RoomWheel::RemoveItem( int index )
{ {
@@ -142,7 +138,7 @@ bool RoomWheel::Select()
if( m_iSelection > 0 ) if( m_iSelection > 0 )
return WheelBase::Select(); return WheelBase::Select();
else if( m_iSelection == 0 ) if( m_iSelection == 0 )
{ {
// Since this is not actually an option outside of this wheel, NULL is a good idea. // Since this is not actually an option outside of this wheel, NULL is a good idea.
m_LastSelection = NULL; m_LastSelection = NULL;
@@ -153,7 +149,7 @@ bool RoomWheel::Select()
void RoomWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWID, int iIndex, bool bHasFocus ) void RoomWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWID, int iIndex, bool bHasFocus )
{ {
const RoomWheelData* tmpdata = (RoomWheelData*) pWID; const RoomWheelData *tmpdata = dynamic_cast<const RoomWheelData*>( pWID );
WheelItemBase::LoadFromWheelItemData( pWID, iIndex, bHasFocus ); WheelItemBase::LoadFromWheelItemData( pWID, iIndex, bHasFocus );
m_Desc.SetText( tmpdata->m_sDesc ); m_Desc.SetText( tmpdata->m_sDesc );
m_Desc.SetDiffuseColor( pWID->m_color ); m_Desc.SetDiffuseColor( pWID->m_color );
@@ -162,14 +158,16 @@ void RoomWheelItem::LoadFromWheelItemData( const WheelItemBaseData* pWID, int iI
void RoomWheel::Move( int n ) void RoomWheel::Move( int n )
{ {
if ((n == 0) && (m_iSelection >= m_offset)) if( n == 0 && m_iSelection >= m_offset )
{ {
const RoomWheelData* data = GetItem( m_iSelection-m_offset ); const RoomWheelData* data = GetItem( m_iSelection-m_offset );
if( data != NULL ) if( data != NULL )
SCREENMAN->PostMessageToTopScreen( SM_RoomInfoDeploy, 0 ); SCREENMAN->PostMessageToTopScreen( SM_RoomInfoDeploy, 0 );
} }
else else
{
SCREENMAN->PostMessageToTopScreen( SM_RoomInfoRetract, 0 ); SCREENMAN->PostMessageToTopScreen( SM_RoomInfoRetract, 0 );
}
WheelBase::Move( n ); WheelBase::Move( n );
} }
stepmania/src/RoomWheel.h
+3 -4
View File
@@ -10,9 +10,8 @@
struct RoomWheelData : public WheelItemBaseData struct RoomWheelData : public WheelItemBaseData
{ {
RoomWheelData() : m_iFlags(0) { WheelItemBaseData::WheelItemBaseData(); } RoomWheelData() : m_iFlags(0) { WheelItemBaseData::WheelItemBaseData(); }
RoomWheelData( WheelItemType wit, const RString& sTitle, const RString& sDesc, RageColor color ) RoomWheelData( WheelItemType wit, const RString& sTitle, const RString& sDesc, RageColor color ):
: WheelItemBaseData( wit, sTitle, color ), m_sDesc(sDesc), m_iFlags(0) WheelItemBaseData( wit, sTitle, color ), m_sDesc(sDesc), m_iFlags(0) { };
{};
RString m_sDesc; RString m_sDesc;
unsigned int m_iFlags; unsigned int m_iFlags;
@@ -52,7 +51,7 @@ public:
virtual bool Select(); virtual bool Select();
virtual void Move( int n ); virtual void Move( int n );
inline RoomWheelData* GetItem(unsigned int i) { return (RoomWheelData*)WheelBase::GetItem(i + m_offset); } inline RoomWheelData *GetItem( unsigned int i ) { return dynamic_cast<RoomWheelData*>( WheelBase::GetItem(i + m_offset) ); }
void AddPerminateItem( RoomWheelData *itemdata ); void AddPerminateItem( RoomWheelData *itemdata );
int GetCurrentIndex() const { return m_iSelection; } int GetCurrentIndex() const { return m_iSelection; }
int GetPerminateOffset() const { return m_offset; } int GetPerminateOffset() const { return m_offset; }