This commit is contained in:
Glenn Maynard
2004-08-24 22:29:47 +00:00
parent 4ce71a6aef
commit 536da0dcf7
3 changed files with 4 additions and 7 deletions
-3
View File
@@ -156,8 +156,6 @@ void ThemeManager::LoadThemeRecursive( deque<Theme> &theme, CString sThemeName )
if( m_sCurLanguage.CompareNoCase(BASE_LANGUAGE) )
t.iniMetrics.ReadFile( GetLanguageIniPath(sThemeName,m_sCurLanguage) );
LOG->Trace("load '%s', %i",
sThemeName.c_str(), loaded_base);
/* Read the fallback theme. If no fallback theme is specified, and we havn't
* already loaded it, fall back on BASE_THEME_NAME. That way, default theme
* fallbacks can be disabled with "FallbackTheme=". */
@@ -166,7 +164,6 @@ void ThemeManager::LoadThemeRecursive( deque<Theme> &theme, CString sThemeName )
{
if( sThemeName.CompareNoCase( BASE_THEME_NAME ) && !loaded_base )
sFallback = BASE_THEME_NAME;
LOG->Trace("no fallback, '%s'", sFallback.c_str());
}
if( !sFallback.empty() )
LoadThemeRecursive( theme, sFallback );
@@ -12,6 +12,9 @@
#include "GameState.h"
#include "Game.h"
static const int PORT_ADDRESS = 0x378;
static const bool SCREEN_DEBUG = false;
LightsDriver_LinuxParallel::LightsDriver_LinuxParallel()
{
// Give port's permissions and reset all bits to zero
@@ -10,12 +10,9 @@
#include "LightsDriver.h"
const int PORT_ADDRESS = 0x378;
const bool SCREEN_DEBUG = false;
class LightsDriver_LinuxParallel : public LightsDriver
{
public:
public:
LightsDriver_LinuxParallel();
virtual ~LightsDriver_LinuxParallel();