source/locale/textdbase.cpp

@@ -88,6 +88,7 @@ static void dumpDatabase(void);
 	---- */
 static TransHeader *	s_database;
 static bool				s_loaded;
+static int				s_langType;
 static TransHeader *	s_idDatabase;
 static bool				s_idShow;
 /*----------------------------------------------------------------------
@@ -171,7 +172,7 @@ void TranslationDatabase::loadLanguage(unsigned int langType)
 		dumpDatabase();
 
 	loadDatabase(FileEquate(s_languageFileEquates[langType]));
-
+	s_langType=langType;
 	s_loaded=true;
 }
 
@@ -197,6 +198,34 @@ char const * TranslationDatabase::getString(unsigned int strNum)
 	}
 }
 
+
+/*----------------------------------------------------------------------
+	Function:	
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+int TranslationDatabase::isLoaded(void)
+{
+	return s_loaded;
+}
+
+
+/*----------------------------------------------------------------------
+	Function:	
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+int TranslationDatabase::getLanguage(void)
+{
+	ASSERT(s_loaded);
+
+	return s_langType;
+}
+
+
+
 /*----------------------------------------------------------------------
 	Function:	
 	Purpose:
@@ -229,5 +258,6 @@ static void dumpDatabase(void)
 	s_loaded=false;
 }
 
+
 /*===========================================================================
  end */

source/locale/textdbase.h

@@ -58,6 +58,8 @@ public:
 	static void loadLanguage(unsigned int langType);
 	static char const * getString(unsigned int strNum);
 	static void setShowIds(bool idShowVal);
+	static int isLoaded();
+	static int getLanguage();
 };
 
 /*----------------------------------------------------------------------

source/system/dbg.cpp

@@ -68,7 +68,8 @@ Available options are:
 	#define DBG_LOG_LINES			8
 	#define DBG_SHOW_MESSAGE_ORIGIN
 	#define	DBG_FILENAME_LENGTH		12
-	#define DBG_DEFAULT_CHANNEL		DC_PAUL|DC_SYSTEM|DC_SOUND|DC_GUI|DC_MEMCARD
+	#define DBG_DEFAULT_CHANNEL		DC_PAUL|DC_MEMCARD
+//	#define DBG_DEFAULT_CHANNEL		DC_PAUL|DC_SYSTEM|DC_SOUND|DC_GUI|DC_MEMCARD
 #else
 	#define DBG_OUTPUT_TO_DEBUGGER
 	#define	DBG_FILENAME_LENGTH		16

source/system/main.cpp

@@ -79,10 +79,10 @@ void	InitSystem()	// reordered to reduce black screen (hope all is well
 //	SetDispMask(0);
 
 	MemInit();
-//	MemCardInit( 1 );
-//	MemCardStart();
+	MemCardInit( 1 );
+	MemCardStart();
 	PadsInit();
-//	MemCardStop();
+	MemCardStop();
 
 	CFileIO::Init();
 	TranslationDatabase::initialise(false);