[Scummvm-cvs-logs] SF.net SVN: scummvm:[53179] scummvm/trunk/engines/sword25
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Oct 12 23:47:49 CEST 2010
Revision: 53179
http://scummvm.svn.sourceforge.net/scummvm/?rev=53179&view=rev
Author: sev
Date: 2010-10-12 21:47:48 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
SWORD25: Make couple file compilable
Modified Paths:
--------------
scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
scummvm/trunk/engines/sword25/fmv/movieplayer.h
scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
scummvm/trunk/engines/sword25/kernel/filesystemutil.h
scummvm/trunk/engines/sword25/kernel/kernel.h
scummvm/trunk/engines/sword25/kernel/resmanager.h
scummvm/trunk/engines/sword25/kernel/service.h
scummvm/trunk/engines/sword25/kernel/window.h
scummvm/trunk/engines/sword25/main.cpp
scummvm/trunk/engines/sword25/script/luabindhelper.cpp
scummvm/trunk/engines/sword25/script/luabindhelper.h
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-12 21:47:48 UTC (rev 53179)
@@ -21,7 +21,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "movieplayer.h"
+#include "sword25/fmv/movieplayer.h"
#define BS_LOG_PREFIX "MOVIEPLAYER"
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.h 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.h 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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
{
Modified: scummvm/trunk/engines/sword25/kernel/filesystemutil.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/filesystemutil.h 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/kernel/filesystemutil.h 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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
Modified: scummvm/trunk/engines/sword25/kernel/kernel.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel.h 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/kernel/kernel.h 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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
Modified: scummvm/trunk/engines/sword25/kernel/resmanager.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/resmanager.h 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/kernel/resmanager.h 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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_ResourceManager
{
-friend BS_Kernel;
+friend class BS_Kernel;
public:
/**
Modified: scummvm/trunk/engines/sword25/kernel/service.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/service.h 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/kernel/service.h 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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 @@
virtual ~BS_Service(){};
};
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/sword25/kernel/window.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/window.h 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/kernel/window.h 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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 @@
static BS_Window* CreateBSWindow(int X, int Y, int Width, int Height, bool Visible);
};
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/sword25/main.cpp
===================================================================
--- scummvm/trunk/engines/sword25/main.cpp 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/main.cpp 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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 @@
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;
}
Modified: scummvm/trunk/engines/sword25/script/luabindhelper.cpp
===================================================================
--- scummvm/trunk/engines/sword25/script/luabindhelper.cpp 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/script/luabindhelper.cpp 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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"
Modified: scummvm/trunk/engines/sword25/script/luabindhelper.h
===================================================================
--- scummvm/trunk/engines/sword25/script/luabindhelper.h 2010-10-12 21:47:06 UTC (rev 53178)
+++ scummvm/trunk/engines/sword25/script/luabindhelper.h 2010-10-12 21:47:48 UTC (rev 53179)
@@ -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))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list