ctor transition (stage 3 ...)
This commit is contained in:
@@ -25,15 +25,6 @@ void Screen::InitScreen( Screen *pScreen )
|
|||||||
pScreen->Init();
|
pScreen->Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
Screen::Screen()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Screen::Screen( CString sName )
|
|
||||||
{
|
|
||||||
SetName( sName );
|
|
||||||
}
|
|
||||||
|
|
||||||
Screen::~Screen()
|
Screen::~Screen()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -43,8 +43,6 @@ class Screen : public ActorFrame
|
|||||||
public:
|
public:
|
||||||
static void InitScreen( Screen *pScreen );
|
static void InitScreen( Screen *pScreen );
|
||||||
|
|
||||||
Screen();
|
|
||||||
Screen( CString sName ); // enforce that all screens have m_sName filled in
|
|
||||||
virtual ~Screen();
|
virtual ~Screen();
|
||||||
|
|
||||||
/* This is called immediately after construction, to allow initializing after all
|
/* This is called immediately after construction, to allow initializing after all
|
||||||
|
|||||||
@@ -30,15 +30,6 @@ ScreenWithMenuElements::ScreenWithMenuElements()
|
|||||||
m_MenuTimer = NULL;
|
m_MenuTimer = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( sClassName )
|
|
||||||
{
|
|
||||||
m_MenuTimer = NULL;
|
|
||||||
m_textHelp = new HelpDisplay;
|
|
||||||
FOREACH_PlayerNumber( p )
|
|
||||||
m_MemoryCardDisplay[p] = NULL;
|
|
||||||
m_MenuTimer = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenWithMenuElements::Init()
|
void ScreenWithMenuElements::Init()
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenWithMenuElements::Init()" );
|
LOG->Trace( "ScreenWithMenuElements::Init()" );
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ class ScreenWithMenuElements : public Screen
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenWithMenuElements();
|
ScreenWithMenuElements();
|
||||||
ScreenWithMenuElements( CString sName );
|
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
virtual void BeginScreen();
|
virtual void BeginScreen();
|
||||||
virtual ~ScreenWithMenuElements();
|
virtual ~ScreenWithMenuElements();
|
||||||
|
|||||||
Reference in New Issue
Block a user