removing duplicate files
This commit is contained in:
@@ -170,6 +170,6 @@ CString AnnouncerManager::GetPathTo( AnnouncerElement ae, CString sAnnouncerName
|
|||||||
}
|
}
|
||||||
|
|
||||||
CString sFullDir = GetAnnouncerDirFromName( sAnnouncerName ) + sAssetDir;
|
CString sFullDir = GetAnnouncerDirFromName( sAnnouncerName ) + sAssetDir;
|
||||||
ASSERT( DoesFileExist(sFullDir) ); // the announcer directory doesn't exist. Did we type the name wrong above?
|
// ASSERT( DoesFileExist(sFullDir) ); // the announcer directory doesn't exist. Did we type the name wrong above?
|
||||||
return sFullDir;
|
return sFullDir;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
Andrew Livy
|
Andrew Livy
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
#include "ScreenEz2Stage.h"
|
#include "ScreenEz2Stage.h"
|
||||||
#include "ScreenManager.h"
|
#include "ScreenManager.h"
|
||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
@@ -214,3 +214,4 @@ void ScreenEz2Stage::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
*/
|
||||||
@@ -14,6 +14,13 @@
|
|||||||
#include "BitmapText.h"
|
#include "BitmapText.h"
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
Chris: I made big changes to ScreenStage that I don't want to have to
|
||||||
|
duplicate here. Let me know how I can help accomodate working EZ2 specifc
|
||||||
|
changes into the existing ScreenStage. These classes are very similar,
|
||||||
|
and it's silly to duplicate so much code. Sorry.
|
||||||
|
|
||||||
class ScreenEz2Stage : public Screen
|
class ScreenEz2Stage : public Screen
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@@ -31,5 +38,5 @@ private:
|
|||||||
BitmapText m_ez2ukm[2];
|
BitmapText m_ez2ukm[2];
|
||||||
Screen* m_pNextScreen;
|
Screen* m_pNextScreen;
|
||||||
};
|
};
|
||||||
|
*/
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user