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

Add room flags to data and clean up

Browse Source
This commit is contained in:
Josh Allen
2006-07-22 00:26:11 +00:00
parent d822f66078
commit 8c7e01eb08
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RoomWheel.cpp
-11
View File
@@ -35,12 +35,6 @@ void RoomWheel::Load( RString sType )
RebuildWheelItems(); RebuildWheelItems();
} }
RoomWheelData::RoomWheelData( WheelItemType wit, RString sTitle, RString sDesc, RageColor color ):
WheelItemBaseData( wit, sTitle, color )
{
m_sDesc = sDesc;
}
RoomWheelItem::RoomWheelItem( RString sType ): RoomWheelItem::RoomWheelItem( RString sType ):
WheelItemBase(sType) WheelItemBase(sType)
{ {
@@ -107,11 +101,6 @@ void RoomWheelItem::LoadFromWheelItemBaseData( WheelItemBaseData* pWID )
m_text.SetDiffuseColor( pWID->m_color ); m_text.SetDiffuseColor( pWID->m_color );
} }
void RoomWheel::Update( float fDeltaTime )
{
WheelBase::Update(fDeltaTime);
}
void RoomWheel::Move(int n) void RoomWheel::Move(int n)
{ {
if ((n == 0) && (m_iSelection >= m_offset)) if ((n == 0) && (m_iSelection >= m_offset))
stepmania/src/RoomWheel.h
+5 -5
View File
@@ -3,18 +3,19 @@
#ifndef ROOMWHEEL_H #ifndef ROOMWHEEL_H
#define ROOMWHEEL_H #define ROOMWHEEL_H
#include "Quad.h"
#include "WheelBase.h" #include "WheelBase.h"
#include "WheelItemBase.h" #include "WheelItemBase.h"
#include "ThemeMetric.h" #include "ThemeMetric.h"
struct RoomWheelData : public WheelItemBaseData struct RoomWheelData : public WheelItemBaseData
{ {
RoomWheelData() { WheelItemBaseData::WheelItemBaseData(); } RoomWheelData() : m_iFlags(0) { WheelItemBaseData::WheelItemBaseData(); }
RoomWheelData( WheelItemType wit, RString title, RString SubTitle, RageColor color ); RoomWheelData( WheelItemType wit, const RString& sTitle, const RString& sDesc, RageColor color )
: m_iFlags(0), m_sDesc(sDesc), WheelItemBaseData( wit, sTitle, color )
{};
RString m_sDesc; RString m_sDesc;
WheelNotifyIcon::Flags m_Flags; unsigned int m_iFlags;
}; };
class RoomWheelItem : public WheelItemBase class RoomWheelItem : public WheelItemBase
@@ -95,7 +96,6 @@ public:
virtual unsigned int GetNumItems() const; virtual unsigned int GetNumItems() const;
virtual void RemoveItem( int index ); virtual void RemoveItem( int index );
virtual bool Select(); virtual bool Select();
virtual void Update( float fDeltaTime );
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 (RoomWheelData*)WheelBase::GetItem(i + m_offset); }