11 files changed, 55 insertions, 53 deletions

diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index f7df544a48..a9aacc48fc 100755
--- a/engines/sword25/fmv/movieplayer.cpp
+++ b/engines/sword25/fmv/movieplayer.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "movieplayer.h"
+#include "sword25/fmv/movieplayer.h"
 
 #define BS_LOG_PREFIX "MOVIEPLAYER"
 
diff --git a/engines/sword25/fmv/movieplayer.h b/engines/sword25/fmv/movieplayer.h
index ed9e94edad..c08969a5a2 100755
--- a/engines/sword25/fmv/movieplayer.h
+++ b/engines/sword25/fmv/movieplayer.h
@@ -17,19 +17,19 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_MOVIEPLAYER_H
-#define BS_MOVIEPLAYER_H
+#ifndef SWORD25_MOVIEPLAYER_H
+#define SWORD25_MOVIEPLAYER_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/service.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/service.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <string>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/fmv/movieplayer_script.cpp b/engines/sword25/fmv/movieplayer_script.cpp
index c5160122d0..43ec6506b4 100755
--- a/engines/sword25/fmv/movieplayer_script.cpp
+++ b/engines/sword25/fmv/movieplayer_script.cpp
@@ -21,12 +21,12 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/kernel.h"
-#include "script/script.h"
-#include "script/luabindhelper.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/script/script.h"
+#include "sword25/script/luabindhelper.h"
 
-#include "movieplayer.h"
+#include "sword25/fmv/movieplayer.h"
 
 namespace
 {
diff --git a/engines/sword25/kernel/filesystemutil.h b/engines/sword25/kernel/filesystemutil.h
index 63f76617c0..1835698d14 100755
--- a/engines/sword25/kernel/filesystemutil.h
+++ b/engines/sword25/kernel/filesystemutil.h
@@ -25,21 +25,21 @@
 	implementieren.
 */
 
-#ifndef BS_FILESYSTEMUTIL_H
-#define BS_FILESYSTEMUTIL_H
+#ifndef SWORD25_FILESYSTEMUTIL_H
+#define SWORD25_FILESYSTEMUTIL_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <string>
 #include <vector>
 #include <ctime>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h
index 8fda511451..6fb77133f6 100755
--- a/engines/sword25/kernel/kernel.h
+++ b/engines/sword25/kernel/kernel.h
@@ -27,20 +27,23 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_KERNEL_H
-#define _BS_KERNEL_H
+#ifndef SWORD25_KERNEL_H
+#define SWORD25_KERNEL_H
+
+#include "common/util.h"
+#include "engines/engine.h"
 
 // Includes
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
 #include <stack>
 #include <string>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "common.h"
-#include "bs_stdint.h"
-#include "window.h"
-#include "resmanager.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/kernel/window.h"
+#include "sword25/kernel/resmanager.h"
 
 
 // Klassendefinition
diff --git a/engines/sword25/kernel/resmanager.h b/engines/sword25/kernel/resmanager.h
index 6bc6b2a8f8..0544950245 100755
--- a/engines/sword25/kernel/resmanager.h
+++ b/engines/sword25/kernel/resmanager.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_RESOURCEMANAGER_H
-#define BS_RESOURCEMANAGER_H
+#ifndef SWORD25_RESOURCEMANAGER_H
+#define SWORD25_RESOURCEMANAGER_H
 
 // Includes
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
 #include <list>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 // Klassendefinition
 class BS_ResourceService;
@@ -35,7 +35,7 @@ class BS_Kernel;
 
 class BS_ResourceManager
 {
-friend BS_Kernel;
+friend class BS_Kernel;
 
 public:
 	/**
diff --git a/engines/sword25/kernel/service.h b/engines/sword25/kernel/service.h
index d79194f41a..c5ca98f747 100755
--- a/engines/sword25/kernel/service.h
+++ b/engines/sword25/kernel/service.h
@@ -31,11 +31,11 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_SERVICE_H
-#define _BS_SERVICE_H
+#ifndef SWORD25_SERVICE_H
+#define SWORD25_SERVICE_H
 
 // Includes
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 // Klassendefinition
 class BS_Kernel;
@@ -54,4 +54,4 @@ public:
 	virtual ~BS_Service(){};
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/sword25/kernel/window.h b/engines/sword25/kernel/window.h
index 6a6121f247..a89d8972c1 100755
--- a/engines/sword25/kernel/window.h
+++ b/engines/sword25/kernel/window.h
@@ -27,11 +27,11 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_WINDOW_H
-#define _BS_WINDOW_H
+#ifndef SWORD25_WINDOW_H
+#define SWORD25_WINDOW_H
 
 // Includes
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 // Klassendefinition
 /**
@@ -173,4 +173,4 @@ public:
 	static BS_Window* CreateBSWindow(int X, int Y, int Width, int Height, bool Visible);
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/sword25/main.cpp b/engines/sword25/main.cpp
index f58421ed64..ae9b3d0a2d 100755
--- a/engines/sword25/main.cpp
+++ b/engines/sword25/main.cpp
@@ -27,12 +27,11 @@
 #include <iostream>
 using namespace std;
 
-#include "kernel/common.h"
-#include "kernel/kernel.h"
-#include "kernel/filesystemutil.h"
-#include "kernel/debug/memorydumper.h"
-#include "script/script.h"
-#include "package/packagemanager.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/filesystemutil.h"
+#include "sword25/script/script.h"
+#include "sword25/package/packagemanager.h"
 
 #define BS_LOG_PREFIX "MAIN"
 
@@ -198,7 +197,7 @@ bool main2(int argc, char ** argv)
 	for (int i = 0; i < argc; ++i) CommandLineParameters.push_back(string(argv[i]));
 	if (!AppStart(CommandLineParameters))
 	{
-		MessageBoxA(0, ENGINE_STARTUP_ERROR_MESSAGE, ENGINE_STARTUP_ERROR_CAPTION, MB_ICONERROR);
+		warning("A fatal error occured during engine startup.");
 		AppEnd();
 		return 1;
 	}
diff --git a/engines/sword25/script/luabindhelper.cpp b/engines/sword25/script/luabindhelper.cpp
index eccc568989..1e68152926 100755
--- a/engines/sword25/script/luabindhelper.cpp
+++ b/engines/sword25/script/luabindhelper.cpp
@@ -21,9 +21,9 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/kernel.h"
-#include "luabindhelper.h"
-#include "luascript.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/script/luabindhelper.h"
+#include "sword25/script/luascript.h"
 #include <sstream>
 
 #define BS_LOG_PREFIX "LUABINDHELPER"
diff --git a/engines/sword25/script/luabindhelper.h b/engines/sword25/script/luabindhelper.h
index c6a8b8e626..0b9d9c75d9 100755
--- a/engines/sword25/script/luabindhelper.h
+++ b/engines/sword25/script/luabindhelper.h
@@ -20,12 +20,12 @@
 #ifndef LUABINDHELPER_H
 #define LUABINDHELPER_H
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
 extern "C"
 {
-	#include <lua.h>
-	#include <lauxlib.h>
+	#include <sword25/util/lua/lua.h>
+	#include <sword25/util/lua/lauxlib.h>
 }
 
 #define lua_pushbooleancpp(L, b) (lua_pushboolean(L, b ? 1 : 0))