SWORD25: Converted kernel/kernel.cpp to compile under ScummVM

This commit creates a skeleton detection and engine class, as well as code necessary to call the kernel initiation.
The kernel/kernel.cpp has been converted to compile under ScummVM, along with all dependant header files.

svn-id: r53184

1 files changed, 89 insertions, 108 deletions

diff --git a/engines/sword25/kernel/log.cpp b/engines/sword25/kernel/log.cpp
index f5b9ba7e7c..33939483ed 100755
--- a/engines/sword25/kernel/log.cpp
+++ b/engines/sword25/kernel/log.cpp
@@ -1,112 +1,107 @@
-// -----------------------------------------------------------------------------
-// This file is part of Broken Sword 2.5
-// Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdörfer
-//
-// Broken Sword 2.5 is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// Broken Sword 2.5 is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Broken Sword 2.5; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-// -----------------------------------------------------------------------------
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string>
-
-#include "sword25/kernel/filesystemutil.h"
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
 #include "sword25/kernel/log.h"
-#include "sword25/kernel/debug/debugtools.h"
+#include "base/version.h"
+#include "common/config-manager.h"
+#include "common/fs.h"
+
+namespace Sword25 {
 
-// Konstanten
-static const char*	BF_LOG_FILENAME = "log.txt";
+// Constants
+static const char *BF_LOG_FILENAME = "log.txt";
 static const size_t	LOG_BUFFERSIZE = 1024 * 16;
 
-// Logging soll nur stattfinden wenn es aktiviert ist
+// Logging will take place only when it's activated
 #ifdef BS_ACTIVATE_LOGGING
 
-FILE*										BS_Log::_LogFile = NULL;
-bool										BS_Log::_LineBegin = true;
-const char*									BS_Log::_Prefix = NULL;
-const char*									BS_Log::_File = NULL;
-int											BS_Log::_Line = 0;
-bool										BS_Log::_AutoNewline = false;
-std::vector<BS_Log::LOG_LISTENER_CALLBACK>	BS_Log::_LogListener;
-
-bool BS_Log::_CreateLog()
-{
-	// Logfile öffnen
-	BS_FileSystemUtil::GetInstance().CreateDirectory(BS_FileSystemUtil::GetInstance().GetUserdataDirectory());
-	_LogFile = fopen((BS_FileSystemUtil::GetInstance().GetUserdataDirectory() + "\\" + BF_LOG_FILENAME).c_str(), "w");
-
-	if (_LogFile)
-	{
-		// Sicherstellen, dass es beim Beenden geschlossen wird
-		atexit(_CloseLog);
-
-		// Titelzeile in das Logfile schreiben
-		Log("Broken Sword 2.5 Engine - Build: %s - %s - VersionID: %s\n", __DATE__, __TIME__, BS_Debugtools::GetVersionID());
+Common::WriteStream*							BS_Log::_LogFile = NULL;
+bool											BS_Log::_LineBegin = true;
+const char *									BS_Log::_Prefix = NULL;
+const char *									BS_Log::_File = NULL;
+int												BS_Log::_Line = 0;
+bool											BS_Log::_AutoNewline = false;
+Common::Array<BS_Log::LOG_LISTENER_CALLBACK>	BS_Log::_LogListener;
+
+bool BS_Log::_CreateLog() {
+	// Open the log file
+	Common::FSNode dataDir(ConfMan.get("path"));
+	Common::FSNode file = dataDir.getChild(BF_LOG_FILENAME);
+
+	// Open the file for saving
+	_LogFile = file.createWriteStream();
+
+	if (_LogFile) {
+		// Add a title into the log file
+		Log("Broken Sword 2.5 Engine - Build: %s - %s - VersionID: %s\n", __DATE__, __TIME__, gScummVMFullVersion);
 		Log("-----------------------------------------------------------------------------------------------------\n");
 
 		return true;
 	}
 
-	// Log-File konnte nicht erstellt werden
+	// Log file could not be created
 	return false;
 }
 
-void BS_Log::_CloseLog()
-{
-	if (_LogFile) fclose(_LogFile);
+void BS_Log::_CloseLog() {
+	delete _LogFile;
+	_LogFile = NULL;
 }
 
-void BS_Log::Log(const char* Format, ...)
-{
+void BS_Log::Log(const char *Format, ...) {
 	char Message[LOG_BUFFERSIZE];
 
-	// Nachricht erzeugen
+	// Create the message
 	va_list ArgList;
 	va_start(ArgList, Format);
 	_vsnprintf(Message, sizeof(Message), Format, ArgList);
 
-	// Nachricht loggen
+	// Log the message
 	_WriteLog(Message);
 
 	_FlushLog();
 }
 
-void BS_Log::LogPrefix(const char* Prefix, const char* Format, ...)
-{
+void BS_Log::LogPrefix(const char *Prefix, const char *Format, ...) {
 	char Message[LOG_BUFFERSIZE];
 	char ExtFormat[LOG_BUFFERSIZE];
 
-	// Falls die Ausgabe am Anfang einer neuen Zeile aufgehört hat, muss die neue Ausgabe mit dem Präfix
-	// beginnen
+	// If the issue has ceased at the beginning of a new line, the new issue to begin with the prefix
 	ExtFormat[0] = 0;
-	if (_LineBegin)
-	{
+	if (_LineBegin) {
 		_snprintf(ExtFormat, sizeof(ExtFormat), "%s%s: ", ExtFormat, Prefix);
 		_LineBegin = false;
 	}
-	// Formatstring zeilenweise durchgehen und an jeden Zeilenanfang das Präfix setzen
-	for (;;)
-	{
-		const char* NextLine = strstr(Format, "\n");
-		if (!NextLine || *(NextLine + strlen("\n")) == 0)
-		{
+	// Format String pass line by line and each line with the initial prefix
+	for (;;) {
+		const char *NextLine = strstr(Format, "\n");
+		if (!NextLine || *(NextLine + strlen("\n")) == 0) {
 			_snprintf(ExtFormat, sizeof(ExtFormat), "%s%s", ExtFormat, Format);
 			if (NextLine) _LineBegin = true;
 			break;	
-		}
-		else
-		{
+		} else {
 			strncat(ExtFormat, Format, (NextLine - Format) + strlen("\n"));
 			_snprintf(ExtFormat, sizeof(ExtFormat), "%s%s: ", ExtFormat, Prefix);
 		}
@@ -114,19 +109,18 @@ void BS_Log::LogPrefix(const char* Prefix, const char* Format, ...)
 		Format = NextLine + strlen("\n");
 	}
 	
-	// Nachricht erzeugen
+	// Create message
 	va_list ArgList;
 	va_start(ArgList, Format);
 	_vsnprintf(Message, sizeof(Message), ExtFormat, ArgList);
 
-	// Nachricht schreiben
+	// Log the message
 	_WriteLog(Message);
 
 	_FlushLog();
 }
 
-void BS_Log::LogDecorated(const char* Format, ...)
-{
+void BS_Log::LogDecorated(const char *Format, ...) {
 	// Nachricht erzeugen
 	char Message[LOG_BUFFERSIZE];
 	va_list ArgList;
@@ -139,15 +133,12 @@ void BS_Log::LogDecorated(const char* Format, ...)
 		_snprintf(SecondaryPrefix, sizeof(SecondaryPrefix), "(file: %s, line: %d) - ", _File, _Line);
 	
 	// Nachricht zeilenweise ausgeben und an jeden Zeilenanfang das Präfix setzen
-	char* MessageWalker = Message;
-	for (;;)
-	{
-		char* NextLine = strstr(MessageWalker, "\n");
-		if (NextLine)
-		{
+	char *MessageWalker = Message;
+	for (;;) {
+		char *NextLine = strstr(MessageWalker, "\n");
+		if (NextLine) {
 			*NextLine = 0;
-			if (_LineBegin)
-			{
+			if (_LineBegin) {
 				_WriteLog(_Prefix);
 				if (_File && _Line)
 					_WriteLog(SecondaryPrefix);
@@ -156,11 +147,8 @@ void BS_Log::LogDecorated(const char* Format, ...)
 			_WriteLog("\n");
 			MessageWalker = NextLine + sizeof("\n") - 1;
 			_LineBegin = true;
-		}
-		else
-		{
-			if (_LineBegin)
-			{
+		} else {
+			if (_LineBegin) {
 				_WriteLog(_Prefix);
 				if (_File && _Line)
 					_WriteLog(SecondaryPrefix);
@@ -172,8 +160,7 @@ void BS_Log::LogDecorated(const char* Format, ...)
 	}
 
 	// Falls gewünscht, wird ans Ende der Nachricht automatisch ein Newline angehängt.
-	if (_AutoNewline)
-	{
+	if (_AutoNewline) {
 		_WriteLog("\n");
 		_LineBegin = true;
 	}
@@ -187,38 +174,32 @@ void BS_Log::LogDecorated(const char* Format, ...)
 	_FlushLog();
 }
 
-int BS_Log::_WriteLog(const char* Message)
-{
+int BS_Log::_WriteLog(const char * Message) {
 	if (!_LogFile) if (!_CreateLog()) return false;
 
-	std::vector<LOG_LISTENER_CALLBACK>::iterator Iter = _LogListener.begin();
+	Common::Array<LOG_LISTENER_CALLBACK>::iterator Iter = _LogListener.begin();
 	for (; Iter != _LogListener.end(); ++Iter)
 		(*Iter)(Message);
 
-	fprintf(_LogFile, Message);
+	_LogFile->writeString(Message);
 
 	return true;
 }
 
-void BS_Log::_FlushLog()
-{
-	fflush(_LogFile);
+void BS_Log::_FlushLog() {
+	_LogFile->flush();
 }
 
 void (*BS_LogPtr)(const char *, ...) = BS_Log::Log;
-extern "C"
-{
-	void BS_Log_C(const char* Message)
-	{
-		BS_LogPtr(Message);
-	}
+
+void BS_Log_C(const char *Message) {
+	BS_LogPtr(Message);
 }
 
 #else
 
-extern "C"
-{
-	void BS_Log_C(const char* Message) {};
-}
+void BS_Log_C(const char* Message) {};
 
 #endif
+
+} // End of namespace Sword25