Cleanup.
This commit is contained in:
+21
-22
@@ -51,17 +51,15 @@ public:
|
|||||||
static bool MakeValidEditDescription( RString &sPreferredDescription ); // return true if was modified
|
static bool MakeValidEditDescription( RString &sPreferredDescription ); // return true if was modified
|
||||||
|
|
||||||
void SetLoadedFromProfile( ProfileSlot slot ) { m_LoadedFromProfile = slot; }
|
void SetLoadedFromProfile( ProfileSlot slot ) { m_LoadedFromProfile = slot; }
|
||||||
void SetMeter(int meter);
|
void SetMeter( int meter );
|
||||||
void SetCachedRadarValues( const RadarValues v[NUM_PLAYERS] );
|
void SetCachedRadarValues( const RadarValues v[NUM_PLAYERS] );
|
||||||
bool IsAutogen() const; // Was created by autogen?
|
bool IsAutogen() const; // Was created by autogen?
|
||||||
float PredictMeter() const;
|
float PredictMeter() const;
|
||||||
|
|
||||||
StepsType m_StepsType;
|
void GetNoteData( NoteData& noteDataOut ) const;
|
||||||
|
void SetNoteData( const NoteData& noteDataNew );
|
||||||
void GetNoteData( NoteData& noteDataOut ) const;
|
void SetSMNoteData( const RString ¬es_comp );
|
||||||
void SetNoteData( const NoteData& noteDataNew );
|
void GetSMNoteData( RString ¬es_comp_out ) const;
|
||||||
void SetSMNoteData( const RString ¬es_comp );
|
|
||||||
void GetSMNoteData( RString ¬es_comp_out ) const;
|
|
||||||
|
|
||||||
void TidyUpData();
|
void TidyUpData();
|
||||||
void CalculateRadarValues( float fMusicLengthSeconds );
|
void CalculateRadarValues( float fMusicLengthSeconds );
|
||||||
@@ -69,30 +67,31 @@ public:
|
|||||||
// Lua
|
// Lua
|
||||||
void PushSelf( lua_State *L );
|
void PushSelf( lua_State *L );
|
||||||
|
|
||||||
protected:
|
StepsType m_StepsType;
|
||||||
|
private:
|
||||||
|
inline const Steps *Real() const { return parent ? parent : this; }
|
||||||
|
|
||||||
/* If this Steps is autogenerated, this will point to the autogen
|
/* If this Steps is autogenerated, this will point to the autogen
|
||||||
* source. If this is true, m_sNoteDataCompressed will always be empty. */
|
* source. If this is true, m_sNoteDataCompressed will always be empty. */
|
||||||
const Steps *parent;
|
const Steps *parent;
|
||||||
|
|
||||||
/* We can have one or both of these; if we have both, they're always identical.
|
/* We can have one or both of these; if we have both, they're always identical.
|
||||||
* Call Compress() to force us to only have m_sNoteDataCompressed; otherwise, creation of
|
* Call Compress() to force us to only have m_sNoteDataCompressed; otherwise, creation of
|
||||||
* these is transparent. */
|
* these is transparent. */
|
||||||
mutable HiddenPtr<NoteData> m_pNoteData;
|
mutable HiddenPtr<NoteData> m_pNoteData;
|
||||||
mutable bool m_bNoteDataIsFilled;
|
mutable bool m_bNoteDataIsFilled;
|
||||||
mutable RString m_sNoteDataCompressed;
|
mutable RString m_sNoteDataCompressed;
|
||||||
|
|
||||||
inline const Steps *Real() const { return parent ? parent : this; }
|
RString m_sFilename;
|
||||||
|
bool m_bSavedToDisk; // true if this was loaded from disk or has been saved to disk.
|
||||||
RString m_sFilename;
|
|
||||||
bool m_bSavedToDisk; // true if this was loaded from disk or has been saved to disk.
|
|
||||||
|
|
||||||
/* These values are pulled from the autogen source first, if there is one. */
|
/* These values are pulled from the autogen source first, if there is one. */
|
||||||
ProfileSlot m_LoadedFromProfile; // ProfileSlot_INVALID if wasn't loaded from a profile
|
ProfileSlot m_LoadedFromProfile; // ProfileSlot_INVALID if wasn't loaded from a profile
|
||||||
unsigned m_uHash; // only used if m_Difficulty == DIFFICULTY_EDIT
|
unsigned m_uHash; // only used if m_Difficulty == DIFFICULTY_EDIT
|
||||||
RString m_sDescription; // Step author, edit name, or something meaningful
|
RString m_sDescription; // Step author, edit name, or something meaningful
|
||||||
Difficulty m_Difficulty; // difficulty classification
|
Difficulty m_Difficulty; // difficulty classification
|
||||||
int m_iMeter; // difficulty rating from MIN_METER to MAX_METER
|
int m_iMeter; // difficulty rating from MIN_METER to MAX_METER
|
||||||
RadarValues m_CachedRadarValues[NUM_PLAYERS];
|
RadarValues m_CachedRadarValues[NUM_PLAYERS];
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user