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

covariant Copy()

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-20 00:17:51 +00:00
parent 7a95f5da5b
commit cd3f228338
47 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ class HiddenActor: public Actor
{
public:
HiddenActor() { SetHidden(true); }
virtual Actor *Copy() const;
virtual HiddenActor *Copy() const;
};
REGISTER_ACTOR_CLASS_WITH_NAME( HiddenActor, Actor )
stepmania/src/ActorFrame.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
*/
//REGISTER_ACTOR_CLASS( ActorFrame )
REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameAutoDeleteChildren, ActorFrame )
Actor *ActorFrame::Copy() const { return new ActorFrame(*this); }
ActorFrame *ActorFrame::Copy() const { return new ActorFrame(*this); }
ActorFrame::ActorFrame()
stepmania/src/ActorFrame.h
+2 -2
View File
@@ -14,7 +14,7 @@ public:
virtual void InitState();
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual ActorFrame *Copy() const;
virtual void AddChild( Actor* pActor );
virtual void RemoveChild( Actor* pActor );
@@ -89,7 +89,7 @@ class ActorFrameAutoDeleteChildren : public ActorFrame
public:
ActorFrameAutoDeleteChildren() { DeleteChildrenWhenDone(true); }
virtual bool AutoLoadChildren() const { return true; }
virtual Actor *Copy() const;
virtual ActorFrameAutoDeleteChildren *Copy() const;
};
#endif
stepmania/src/ActorFrameTexture.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "ActorUtil.h"
REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameTextureAutoDeleteChildren, ActorFrameTexture )
Actor *ActorFrameTexture::Copy() const { return new ActorFrameTexture(*this); }
ActorFrameTexture *ActorFrameTexture::Copy() const { return new ActorFrameTexture(*this); }
ActorFrameTexture::ActorFrameTexture()
{
stepmania/src/ActorFrameTexture.h
+2 -2
View File
@@ -10,7 +10,7 @@ public:
ActorFrameTexture();
ActorFrameTexture( const ActorFrameTexture &cpy );
virtual ~ActorFrameTexture();
virtual Actor *Copy() const;
virtual ActorFrameTexture *Copy() const;
/* Set the texture name, which can be used with RageTextureManager (and users,
* eg. Sprite) to load the texture. If no name is supplied, a unique one will
@@ -46,7 +46,7 @@ class ActorFrameTextureAutoDeleteChildren : public ActorFrameTexture
public:
ActorFrameTextureAutoDeleteChildren() { DeleteChildrenWhenDone(true); }
virtual bool AutoLoadChildren() const { return true; }
virtual Actor *Copy() const;
virtual ActorFrameTextureAutoDeleteChildren *Copy() const;
};
#endif
stepmania/src/ActorProxy.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
virtual void DrawPrimitives();
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual ActorProxy *Copy() const;
Actor *GetTarget() { return m_pActorTarget; }
void SetTarget( Actor *pTarget ) { m_pActorTarget = pTarget; }
stepmania/src/ActorScroller.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
*/
//REGISTER_ACTOR_CLASS( ActorScroller )
REGISTER_ACTOR_CLASS_WITH_NAME( ActorScrollerAutoDeleteChildren, ActorScroller )
Actor *ActorScroller::Copy() const { return new ActorScroller(*this); }
ActorScroller *ActorScroller::Copy() const { return new ActorScroller(*this); }
ActorScroller::ActorScroller()
stepmania/src/ActorScroller.h
+2 -2
View File
@@ -28,7 +28,7 @@ public:
void PositionItems();
void LoadFromNode( const XNode *pNode );
virtual Actor *Copy() const;
virtual ActorScroller *Copy() const;
void SetLoop( bool bLoop ) { m_bLoop = bLoop; }
void SetNumItemsToDraw( float fNumItemsToDraw ) { m_fNumItemsToDraw = fNumItemsToDraw; }
@@ -79,7 +79,7 @@ class ActorScrollerAutoDeleteChildren : public ActorScroller
public:
ActorScrollerAutoDeleteChildren() { DeleteChildrenWhenDone(true); }
virtual bool AutoLoadChildren() const { return true; }
virtual Actor *Copy() const;
virtual ActorScrollerAutoDeleteChildren *Copy() const;
};
#endif
stepmania/src/ActorSound.h
+1 -1
View File
@@ -10,7 +10,7 @@ class ActorSound: public Actor
{
public:
virtual ~ActorSound() { }
virtual Actor *Copy() const;
virtual ActorSound *Copy() const;
void Load( const RString &sPath );
void Play();
stepmania/src/ActorUtil.h
+1 -1
View File
@@ -19,7 +19,7 @@ Actor *CreateActor() { return new T; }
Register##className() { ActorUtil::Register(#externalClassName, CreateActor<className>); } \
}; \
static Register##className register##className; \
Actor *className::Copy() const { return new className(*this); }
className *className::Copy() const { return new className(*this); }
#define REGISTER_ACTOR_CLASS( className ) REGISTER_ACTOR_CLASS_WITH_NAME( className, className )
stepmania/src/BGAnimation.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
void LoadFromAniDir( const RString &sAniDir );
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual BGAnimation *Copy() const;
protected:
void AddLayersFromAniDir( const RString &_sAniDir, const XNode *pNode );
stepmania/src/BPMDisplay.h
+1 -1
View File
@@ -15,7 +15,7 @@ class BPMDisplay : public BitmapText
{
public:
BPMDisplay();
virtual Actor *Copy() const;
virtual BPMDisplay *Copy() const;
void Load();
virtual void Update( float fDeltaTime );
void LoadFromNode( const XNode *pNode );
stepmania/src/Banner.h
+1 -1
View File
@@ -15,7 +15,7 @@ class Banner : public Sprite
public:
Banner();
virtual ~Banner() { }
virtual Actor *Copy() const;
virtual Banner *Copy() const;
void Load( RageTextureID ID, bool bIsBanner );
virtual void Load( RageTextureID ID ) { Load( ID, true ); }
stepmania/src/BitmapText.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
virtual ~BitmapText();
virtual void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual BitmapText *Copy() const;
bool LoadFromFont( const RString& sFontName );
bool LoadFromTextureAndChars( const RString& sTexturePath, const RString& sChars );
stepmania/src/ComboGraph.h
+1 -1
View File
@@ -13,7 +13,7 @@ public:
ComboGraph();
void Load( const StageStats &s, const PlayerStageStats &pss );
virtual void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual ComboGraph *Copy() const;
virtual bool AutoLoadChildren() const { return true; }
//
stepmania/src/ControllerStateDisplay.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
virtual void Update( float fDelta );
bool IsLoaded() const { return m_bIsLoaded; }
virtual Actor *Copy() const;
virtual ControllerStateDisplay *Copy() const;
//
// Lua
stepmania/src/CourseContentsList.h
+1 -1
View File
@@ -11,7 +11,7 @@ class CourseContentsList : public ActorScroller
public:
CourseContentsList();
~CourseContentsList();
virtual Actor *Copy() const;
virtual CourseContentsList *Copy() const;
void Load();
void LoadFromNode( const XNode* pNode );
stepmania/src/CourseEntryDisplay.h
+1 -1
View File
@@ -16,7 +16,7 @@ class CourseEntryDisplay : public ActorFrame
{
public:
CourseEntryDisplay();
virtual Actor *Copy() const;
virtual CourseEntryDisplay *Copy() const;
void Load();
void LoadFromNode( const XNode* pNode );
stepmania/src/DifficultyIcon.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
bool Load( RString sFilePath );
virtual void Load( RageTextureID ID ) { Load( ID.filename ); }
virtual void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual DifficultyIcon *Copy() const;
void SetPlayer( PlayerNumber pn );
void Unset();
stepmania/src/DifficultyList.h
+1 -1
View File
@@ -16,7 +16,7 @@ class DifficultyList: public ActorFrame
public:
DifficultyList();
virtual ~DifficultyList();
virtual Actor *Copy() const;
virtual DifficultyList *Copy() const;
virtual void LoadFromNode( const XNode* pNode );
void SetFromGameState();
stepmania/src/DifficultyMeter.h
+1 -1
View File
@@ -23,7 +23,7 @@ public:
void Load( const RString &sType );
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual DifficultyMeter *Copy() const;
void SetFromGameState( PlayerNumber pn );
void SetFromMeterAndDifficulty( int iMeter, Difficulty dc );
stepmania/src/DynamicActorScroller.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "RageUtil.h"
#include "LuaBinding.h"
Actor *DynamicActorScroller::Copy() const { return new DynamicActorScroller(*this); }
DynamicActorScroller *DynamicActorScroller::Copy() const { return new DynamicActorScroller(*this); }
void DynamicActorScroller::LoadFromNode( const XNode *pNode )
{
stepmania/src/DynamicActorScroller.h
+2 -2
View File
@@ -9,7 +9,7 @@
class DynamicActorScroller: public ActorScroller
{
public:
virtual Actor *Copy() const;
virtual DynamicActorScroller *Copy() const;
void LoadFromNode( const XNode *pNode );
protected:
@@ -24,7 +24,7 @@ class DynamicActorScrollerAutoDeleteChildren: public DynamicActorScroller
public:
DynamicActorScrollerAutoDeleteChildren() { DeleteChildrenWhenDone(true); }
virtual bool AutoLoadChildren() const { return true; }
virtual Actor *Copy() const;
virtual DynamicActorScrollerAutoDeleteChildren *Copy() const;
};
#endif
stepmania/src/FadingBanner.h
+1 -1
View File
@@ -11,7 +11,7 @@ class FadingBanner : public ActorFrame
{
public:
FadingBanner();
virtual Actor *Copy() const;
virtual FadingBanner *Copy() const;
void ScaleToClipped( float fWidth, float fHeight );
stepmania/src/GraphDisplay.cpp
+2 -2
View File
@@ -102,7 +102,7 @@ public:
}
virtual Actor *Copy() const;
virtual GraphLine *Copy() const;
private:
vector<RageSpriteVertex> m_Quads;
@@ -136,7 +136,7 @@ public:
DISPLAY->DrawQuadStrip( m_Slices, ARRAYLEN(m_Slices) );
}
virtual Actor *Copy() const;
virtual GraphBody *Copy() const;
RageSpriteVertex m_Slices[2*VALUE_RESOLUTION];
};
stepmania/src/GraphDisplay.h
+1 -1
View File
@@ -13,7 +13,7 @@ class GraphDisplay: public ActorFrame
public:
GraphDisplay();
~GraphDisplay();
virtual Actor *Copy() const;
virtual GraphDisplay *Copy() const;
virtual void LoadFromNode( const XNode* pNode );
void LoadFromStageStats( const StageStats &ss, const PlayerStageStats &s );
stepmania/src/GrooveRadar.h
+1 -1
View File
@@ -14,7 +14,7 @@ class GrooveRadar : public ActorFrame
{
public:
GrooveRadar();
virtual Actor *Copy() const;
virtual GrooveRadar *Copy() const;
virtual void LoadFromNode( const XNode* pNode );
void SetEmpty( PlayerNumber pn );
stepmania/src/HelpDisplay.h
+1 -1
View File
@@ -13,7 +13,7 @@ public:
HelpDisplay();
void Load( const RString &sType );
virtual Actor *Copy() const;
virtual HelpDisplay *Copy() const;
void SetTips( const vector<RString> &arrayTips ) { SetTips( arrayTips, arrayTips ); }
void SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt );
stepmania/src/HoldJudgment.h
+1 -1
View File
@@ -10,7 +10,7 @@ class HoldJudgment : public ActorFrame
{
public:
HoldJudgment();
virtual Actor *Copy() const;
virtual HoldJudgment *Copy() const;
void Load( const RString &sPath );
void LoadFromNode( const XNode* pNode );
stepmania/src/Judgment.h
+1 -1
View File
@@ -12,7 +12,7 @@ class Judgment : public ActorFrame
{
public:
Judgment();
virtual Actor *Copy() const;
virtual Judgment *Copy() const;
void LoadNormal();
void LoadNormal( const RString &sPath );
void LoadFromMultiPlayer( MultiPlayer mp );
stepmania/src/MemoryCardDisplay.h
+1 -1
View File
@@ -13,7 +13,7 @@ public:
MemoryCardDisplay();
void Load( PlayerNumber pn );
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual MemoryCardDisplay *Copy() const;
void Update( float fDelta );
protected:
stepmania/src/MeterDisplay.h
+2 -2
View File
@@ -11,7 +11,7 @@ public:
MeterDisplay();
void Load( RString sStreamPath, float fStreamWidth, RString sTipPath );
virtual void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual MeterDisplay *Copy() const;
void SetPercent( float fPercent );
@@ -26,7 +26,7 @@ class SongMeterDisplay: public MeterDisplay
{
public:
virtual void Update( float fDeltaTime );
virtual Actor *Copy() const;
virtual SongMeterDisplay *Copy() const;
};
#endif
stepmania/src/Model.h
+1 -1
View File
@@ -17,7 +17,7 @@ class Model : public Actor
public:
Model();
virtual ~Model();
virtual Actor *Copy() const;
virtual Model *Copy() const;
void Clear();
void Load( const RString &sFile );
stepmania/src/MusicSortDisplay.h
+1 -1
View File
@@ -10,7 +10,7 @@ class MusicSortDisplay : public Sprite
{
public:
MusicSortDisplay();
virtual Actor *Copy() const;
virtual MusicSortDisplay *Copy() const;
void Set( SortOrder so );
virtual void HandleMessage( const RString& sMessage );
stepmania/src/MusicWheelItem.h
+1 -1
View File
@@ -23,7 +23,7 @@ public:
MusicWheelItem(RString sType = "MusicWheelItem");
MusicWheelItem( const MusicWheelItem &cpy );
virtual ~MusicWheelItem();
virtual Actor *Copy() const { return new MusicWheelItem(*this); }
virtual MusicWheelItem *Copy() const { return new MusicWheelItem(*this); }
virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID );
virtual void HandleMessage( const RString& sMessage );
stepmania/src/OptionIconRow.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
void Load();
virtual void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual OptionIconRow *Copy() const;
void SetFromGameState( PlayerNumber pn );
//
stepmania/src/PaneDisplay.h
+1 -1
View File
@@ -51,7 +51,7 @@ class PaneDisplay: public ActorFrame
{
public:
PaneDisplay();
virtual Actor *Copy() const;
virtual PaneDisplay *Copy() const;
void Load( const RString &sMetricsGroup, PlayerNumber pn );
void SetFromGameState();
stepmania/src/PercentageDisplay.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
void Load( const PlayerState *pPlayerState, const PlayerStageStats *pPlayerStageStats, const RString &sMetricsGroup, bool bAutoRefresh );
void Update( float fDeltaTime );
virtual void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual PercentageDisplay *Copy() const;
static RString FormatPercentScore( float fPercentDancePoints );
stepmania/src/Quad.h
+1 -1
View File
@@ -15,7 +15,7 @@ public:
}
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual Quad *Copy() const;
};
#endif
stepmania/src/RollingNumbers.h
+1 -1
View File
@@ -11,7 +11,7 @@ public:
RollingNumbers();
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual RollingNumbers *Copy() const;
virtual void Update( float fDeltaTime );
stepmania/src/RoomWheel.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
void Load( RString sType );
virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID );
virtual Actor *Copy() const { return new RoomWheelItem(*this); }
virtual RoomWheelItem *Copy() const { return new RoomWheelItem(*this); }
private:
BitmapText m_Desc;
stepmania/src/ScoreDisplayAliveTime.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
virtual void Update( float fDelta );
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual ScoreDisplayAliveTime *Copy() const;
void PlayCommand( const RString &sCommandName );
stepmania/src/ScoreDisplayCalories.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
virtual void Update( float fDelta );
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual ScoreDisplayCalories *Copy() const;
void PlayCommand( const RString &sCommandName );
stepmania/src/ScreenTestInput.cpp
+2 -2
View File
@@ -27,7 +27,7 @@ public:
BitmapText::Update( fDeltaTime );
}
virtual Actor *Copy() const;
virtual DeviceList *Copy() const;
};
REGISTER_ACTOR_CLASS( DeviceList );
@@ -37,7 +37,7 @@ static LocalizedString SECONDARY ( "ScreenTestInput", "secondary" );
static LocalizedString NOT_MAPPED ( "ScreenTestInput", "not mapped" );
class InputList: public BitmapText
{
virtual Actor *Copy() const;
virtual InputList *Copy() const;
void Update( float fDeltaTime )
{
stepmania/src/Sprite.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
virtual ~Sprite();
void LoadFromNode( const XNode* pNode );
virtual Actor *Copy() const;
virtual Sprite *Copy() const;
virtual bool EarlyAbortDraw() const;
virtual void DrawPrimitives();
stepmania/src/WheelItemBase.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
WheelItemBase( RString sType = "WheelItemBase" );
WheelItemBase( const WheelItemBase &cpy );
virtual void DrawPrimitives();
virtual Actor *Copy() const { return new WheelItemBase(*this); }
virtual WheelItemBase *Copy() const { return new WheelItemBase(*this); }
void Load( RString sType );
void DrawGrayBar( Actor& bar );
stepmania/src/WorkoutGraph.h
+1 -1
View File
@@ -12,7 +12,7 @@ class WorkoutGraph : public ActorFrame
public:
WorkoutGraph();
~WorkoutGraph();
virtual Actor *Copy() const;
virtual WorkoutGraph *Copy() const;
void Load();
void LoadFromNode( const XNode* pNode );