[Scummvm-cvs-logs] SF.net SVN: scummvm:[53180] scummvm/trunk/engines/sword25
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Oct 12 23:49:52 CEST 2010
Revision: 53180
http://scummvm.svn.sourceforge.net/scummvm/?rev=53180&view=rev
Author: sev
Date: 2010-10-12 21:49:51 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
SWORD25: Path fixes for includes
Modified Paths:
--------------
scummvm/trunk/engines/sword25/fmv/oggtheora/audiobuffer.cpp
scummvm/trunk/engines/sword25/fmv/oggtheora/audiobuffer.h
scummvm/trunk/engines/sword25/fmv/oggtheora/moviefile.cpp
scummvm/trunk/engines/sword25/fmv/oggtheora/moviefile.h
scummvm/trunk/engines/sword25/fmv/oggtheora/oggstate.cpp
scummvm/trunk/engines/sword25/fmv/oggtheora/oggstate.h
scummvm/trunk/engines/sword25/fmv/oggtheora/oggstreamstate.cpp
scummvm/trunk/engines/sword25/fmv/oggtheora/oggstreamstate.h
scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.cpp
scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.h
scummvm/trunk/engines/sword25/fmv/oggtheora/theorastate.cpp
scummvm/trunk/engines/sword25/fmv/oggtheora/theorastate.h
scummvm/trunk/engines/sword25/fmv/oggtheora/vorbisstate.cpp
scummvm/trunk/engines/sword25/fmv/oggtheora/vorbisstate.h
scummvm/trunk/engines/sword25/fmv/oggtheora/yuvtorgba.cpp
scummvm/trunk/engines/sword25/fmv/oggtheora/yuvtorgba.h
scummvm/trunk/engines/sword25/gfx/panel.h
scummvm/trunk/engines/sword25/input/inputengine.cpp
scummvm/trunk/engines/sword25/input/inputengine.h
scummvm/trunk/engines/sword25/input/inputengine_script.cpp
scummvm/trunk/engines/sword25/input/stdwininput.cpp
scummvm/trunk/engines/sword25/input/stdwininput.h
scummvm/trunk/engines/sword25/kernel/debug/debugtools.cpp
scummvm/trunk/engines/sword25/kernel/debug/debugtools.h
scummvm/trunk/engines/sword25/math/geometry.cpp
scummvm/trunk/engines/sword25/math/geometry.h
scummvm/trunk/engines/sword25/math/geometry_script.cpp
scummvm/trunk/engines/sword25/math/line.h
scummvm/trunk/engines/sword25/math/polygon.cpp
scummvm/trunk/engines/sword25/math/polygon.h
scummvm/trunk/engines/sword25/math/rect.h
scummvm/trunk/engines/sword25/math/region.cpp
scummvm/trunk/engines/sword25/math/region.h
scummvm/trunk/engines/sword25/math/regionregistry.cpp
scummvm/trunk/engines/sword25/math/regionregistry.h
scummvm/trunk/engines/sword25/math/vertex.cpp
scummvm/trunk/engines/sword25/math/vertex.h
scummvm/trunk/engines/sword25/math/walkregion.cpp
scummvm/trunk/engines/sword25/math/walkregion.h
scummvm/trunk/engines/sword25/package/packagemanager.cpp
scummvm/trunk/engines/sword25/package/packagemanager_script.cpp
scummvm/trunk/engines/sword25/package/physfspackagemanager.cpp
scummvm/trunk/engines/sword25/package/physfspackagemanager.h
scummvm/trunk/engines/sword25/script/lua_extensions.cpp
scummvm/trunk/engines/sword25/script/luabindhelper.h
scummvm/trunk/engines/sword25/script/luacallback.cpp
scummvm/trunk/engines/sword25/script/luacallback.h
scummvm/trunk/engines/sword25/script/luascript.cpp
scummvm/trunk/engines/sword25/script/luascript.h
scummvm/trunk/engines/sword25/sfx/fmodexchannel.cpp
scummvm/trunk/engines/sword25/sfx/fmodexchannel.h
scummvm/trunk/engines/sword25/sfx/fmodexexception.h
scummvm/trunk/engines/sword25/sfx/fmodexresource.cpp
scummvm/trunk/engines/sword25/sfx/fmodexresource.h
scummvm/trunk/engines/sword25/sfx/fmodexsound.cpp
scummvm/trunk/engines/sword25/sfx/fmodexsound.h
scummvm/trunk/engines/sword25/sfx/soundengine.cpp
scummvm/trunk/engines/sword25/sfx/soundengine.h
scummvm/trunk/engines/sword25/sfx/soundengine_script.cpp
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/audiobuffer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/audiobuffer.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/audiobuffer.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,7 +21,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "audiobuffer.h"
+#include "sword25/fmv/oggtheora/audiobuffer.h"
#include <windows.h>
#include <queue>
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/audiobuffer.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/audiobuffer.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/audiobuffer.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,14 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_AUDIOBUFFER_H
-#define BS_AUDIOBUFFER_H
+#ifndef SWORD25_AUDIOBUFFER_H
+#define SWORD25_AUDIOBUFFER_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
// -----------------------------------------------------------------------------
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/moviefile.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/moviefile.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/moviefile.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -27,10 +27,10 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/kernel.h"
-#include "package/packagemanager.h"
-#include "oggstate.h"
-#include "moviefile.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/fmv/oggtheora/oggstate.h"
+#include "sword25/fmv/oggtheora/moviefile.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/moviefile.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/moviefile.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/moviefile.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_MOVIEFILE_H
-#define BS_MOVIEFILE_H
+#ifndef SWORD25_MOVIEFILE_H
+#define SWORD25_MOVIEFILE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.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"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/oggstate.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/oggstate.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/oggstate.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,7 +21,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "oggstate.h"
+#include "sword25/fmv/oggtheora/oggstate.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/oggstate.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/oggstate.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/oggstate.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,14 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_OGGSTATE_H
-#define BS_OGGSTATE_H
+#ifndef SWORD25_OGGSTATE_H
+#define SWORD25_OGGSTATE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
#include "ogg/ogg.h"
// XXX
#include <iostream>
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/oggstreamstate.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/oggstreamstate.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/oggstreamstate.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,7 +21,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "oggstreamstate.h"
+#include "sword25/fmv/oggtheora/oggstreamstate.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/oggstreamstate.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/oggstreamstate.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/oggstreamstate.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,14 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_OGGSTREAMSTATE_H
-#define BS_OGGSTREAMSTATE_H
+#ifndef SWORD25_OGGSTREAMSTATE_H
+#define SWORD25_OGGSTREAMSTATE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
#include "ogg/ogg.h"
#include <queue>
// XXX
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -59,18 +59,17 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <algorithm>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
#include <float.h>
-#include "package/packagemanager.h"
-#include "kernel/cpuinfo.h"
-#include "sfx/soundengine.h"
-#include "gfx/graphicengine.h"
-#include "gfx/panel.h"
-#include "oggtheora.h"
-#include "yuvtorgba.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/sfx/soundengine.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/fmv/oggtheora/oggtheora.h"
+#include "sword25/fmv/oggtheora/yuvtorgba.h"
using namespace std;
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,30 +17,30 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_OGGTHEORA_H
-#define BS_OGGTHEORA_H
+#ifndef SWORD25_OGGTHEORA_H
+#define SWORD25_OGGTHEORA_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
#include <memory>
#include <queue>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
-#include "gfx/bitmap.h"
-#include "gfx/renderobjectptr.h"
-#include "fmv/movieplayer.h"
-#include "vorbisstate.h"
-#include "theorastate.h"
-#include "oggstate.h"
-#include "oggstreamstate.h"
-#include "moviefile.h"
-#include "audiobuffer.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/gfx/renderobjectptr.h"
+#include "sword25/fmv/movieplayer.h"
+#include "sword25/fmv/oggtheora/vorbisstate.h"
+#include "sword25/fmv/oggtheora/theorastate.h"
+#include "sword25/fmv/oggtheora/oggstate.h"
+#include "sword25/fmv/oggtheora/oggstreamstate.h"
+#include "sword25/fmv/oggtheora/moviefile.h"
+#include "sword25/fmv/oggtheora/audiobuffer.h"
// -----------------------------------------------------------------------------
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/theorastate.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/theorastate.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/theorastate.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,7 +21,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "theorastate.h"
+#include "sword25/fmv/oggtheora/theorastate.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/theorastate.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/theorastate.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/theorastate.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_THEORASTATE_H
-#define BS_THEORASTATE_H
+#ifndef SWORD25_THEORASTATE_H
+#define SWORD25_THEORASTATE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "theora/theora.h"
+#include "sword25/kernel/common.h"
+#include <theora/theora.h>
// -----------------------------------------------------------------------------
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/vorbisstate.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/vorbisstate.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/vorbisstate.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,7 +21,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "vorbisstate.h"
+#include "sword25/fmv/oggtheora/vorbisstate.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/vorbisstate.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/vorbisstate.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/vorbisstate.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_VORBISSTATE_H
-#define BS_VORBISSTATE_H
+#ifndef SWORD25_VORBISSTATE_H
+#define SWORD25_VORBISSTATE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "vorbis/codec.h"
+#include "sword25/kernel/common.h"
+#include <vorbis/codec.h>
// -----------------------------------------------------------------------------
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/yuvtorgba.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/yuvtorgba.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/yuvtorgba.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,8 +21,8 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/cpuinfo.h"
-#include "yuvtorgba.h"
+#include "sword25/kernel/cpuinfo.h"
+#include "sword25/fmv/ogghteora/yuvtorgba.h"
#include <mmintrin.h>
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/yuvtorgba.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/yuvtorgba.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/yuvtorgba.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_YUVTORGBA_H
-#define BS_YUVTORGBA_H
+#ifndef SWORD25_YUVTORGBA_H
+#define SWORD25_YUVTORGBA_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
#include "theora/theora.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/gfx/panel.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/panel.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/gfx/panel.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -33,7 +33,7 @@
class BS_Panel : public BS_RenderObject
{
-friend BS_RenderObject;
+friend class BS_RenderObject;
private:
BS_Panel(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, int Width, int Height, unsigned int Color);
Modified: scummvm/trunk/engines/sword25/input/inputengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/input/inputengine.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/input/inputengine.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -23,7 +23,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "inputengine.h"
+#include "sword25/input/inputengine.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/input/inputengine.h
===================================================================
--- scummvm/trunk/engines/sword25/input/inputengine.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/input/inputengine.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -26,13 +26,13 @@
Autor: Alex Arnst
**/
-#ifndef BS_INPUTENGINE_H
-#define BS_INPUTENGINE_H
+#ifndef SWORD25_INPUTENGINE_H
+#define SWORD25_INPUTENGINE_H
/// Includes
-#include "kernel/common.h"
-#include "kernel/service.h"
-#include "kernel/persistable.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/service.h"
+#include "sword25/kernel/persistable.h"
/// Klassendefinition
class BS_InputEngine : public BS_Service, public BS_Persistable
Modified: scummvm/trunk/engines/sword25/input/inputengine_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/input/inputengine_script.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/input/inputengine_script.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -24,14 +24,14 @@
#include <string>
#include <algorithm>
-#include "kernel/common.h"
-#include "kernel/kernel.h"
-#include "kernel/callbackregistry.h"
-#include "script/script.h"
-#include "script/luabindhelper.h"
-#include "script/luacallback.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/callbackregistry.h"
+#include "sword25/script/script.h"
+#include "sword25/script/luabindhelper.h"
+#include "sword25/script/luacallback.h"
-#include "inputengine.h"
+#include "sword25/input/inputengine.h"
#define BS_LOG_PREFIX "INPUTENGINE"
Modified: scummvm/trunk/engines/sword25/input/stdwininput.cpp
===================================================================
--- scummvm/trunk/engines/sword25/input/stdwininput.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/input/stdwininput.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,11 +17,11 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "kernel/kernel.h"
-#include "kernel/callbackregistry.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "stdwininput.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/callbackregistry.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/input/stdwininput.h"
#include <algorithm>
using namespace std;
Modified: scummvm/trunk/engines/sword25/input/stdwininput.h
===================================================================
--- scummvm/trunk/engines/sword25/input/stdwininput.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/input/stdwininput.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_STDWININPUT_H
-#define BS_STDWININPUT_H
+#ifndef SWORD25_STDWININPUT_H
+#define SWORD25_STDWININPUT_H
/// Includes
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <list>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "kernel/common.h"
-#include "inputengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/input/inputengine.h"
/// Klassendefinitionen
class BS_Kernel;
Modified: scummvm/trunk/engines/sword25/kernel/debug/debugtools.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/debug/debugtools.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/kernel/debug/debugtools.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -30,9 +30,9 @@
#include <fstream>
using namespace std;
-#include "kernel/md5.h"
-#include "kernel/filesystemutil.h"
-#include "debugtools.h"
+#include "sword25/kernel/md5.h"
+#include "sword25/kernel/filesystemutil.h"
+#include "sword25/kernel/debug/debugtools.h"
// -----------------------------------------------------------------------------
// Konstanten und Hilfsfunktionen
Modified: scummvm/trunk/engines/sword25/kernel/debug/debugtools.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/debug/debugtools.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/kernel/debug/debugtools.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,8 +17,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef DEBUGTOOLS_H
-#define DEBUGTOOLS_H
+#ifndef SWORD25_DEBUGTOOLS_H
+#define SWORD25_DEBUGTOOLS_H
class BS_Debugtools
{
Modified: scummvm/trunk/engines/sword25/math/geometry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/math/geometry.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/geometry.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "geometry.h"
+#include "sword25/math/geometry.h"
#define BS_LOG_PREFIX "GEOMETRY"
Modified: scummvm/trunk/engines/sword25/math/geometry.h
===================================================================
--- scummvm/trunk/engines/sword25/math/geometry.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/geometry.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_GEOMETRY_H
-#define BS_GEOMETRY_H
+#ifndef SWORD25_GEOMETRY_H
+#define SWORD25_GEOMETRY_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/service.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/service.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/math/geometry_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/math/geometry_script.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/geometry_script.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,22 +21,22 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <memory>
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "gfx/graphicengine.h"
-#include "kernel/common.h"
-#include "kernel/kernel.h"
-#include "script/script.h"
-#include "script/luabindhelper.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/script/script.h"
+#include "sword25/script/luabindhelper.h"
-#include "geometry.h"
-#include "region.h"
-#include "regionregistry.h"
-#include "walkregion.h"
-#include "vertex.h"
+#include "sword25/math/geometry.h"
+#include "sword25/math/region.h"
+#include "sword25/math/regionregistry.h"
+#include "sword25/math/walkregion.h"
+#include "sword25/math/vertex.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/math/line.h
===================================================================
--- scummvm/trunk/engines/sword25/math/line.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/line.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -29,14 +29,14 @@
Autor: Malte Thiesen
*/
-#ifndef _BS_LINE_H_
-#define _BS_LINE_H_
+#ifndef SWORD25_LINE_H
+#define SWORD25_LINE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/math/polygon.cpp
===================================================================
--- scummvm/trunk/engines/sword25/math/polygon.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/polygon.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <utility>
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
#include <math.h>
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
-#include "polygon.h"
-#include "line.h"
+#include "sword25/math/polygon.h"
+#include "sword25/math/line.h"
#define max(a,b) (((a) > (b)) ? (a) : (b))
Modified: scummvm/trunk/engines/sword25/math/polygon.h
===================================================================
--- scummvm/trunk/engines/sword25/math/polygon.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/polygon.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,13 +17,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_POLYGON_H
-#define BS_POLYGON_H
+#ifndef SWORD25_POLYGON_H
+#define SWORD25_POLYGON_H
// Includes
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "vertex.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/math/vertex.h"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/math/rect.h
===================================================================
--- scummvm/trunk/engines/sword25/math/rect.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/rect.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,12 +17,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_RECT_H
-#define BS_RECT_H
+#ifndef SWORD25_RECT_H
+#define SWORD25_RECT_H
// Includes
-#include "kernel/common.h"
-#include "vertex.h"
+#include "sword25/kernel/common.h"
+#include "sword25/math/vertex.h"
// Klassendefinition
/**
Modified: scummvm/trunk/engines/sword25/math/region.cpp
===================================================================
--- scummvm/trunk/engines/sword25/math/region.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/region.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,12 +17,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
-#include "region.h"
-#include "walkregion.h"
-#include "regionregistry.h"
+#include "sword25/math/region.h"
+#include "sword25/math/walkregion.h"
+#include "sword25/math/regionregistry.h"
#define BS_LOG_PREFIX "REGION"
Modified: scummvm/trunk/engines/sword25/math/region.h
===================================================================
--- scummvm/trunk/engines/sword25/math/region.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/region.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_REGION_H
-#define BS_REGION_H
+#ifndef SWORD25_REGION_H
+#define SWORD25_REGION_H
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "vertex.h"
-#include "polygon.h"
-#include "rect.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/math/vertex.h"
+#include "sword25/math/polygon.h"
+#include "sword25/math/rect.h"
/**
@brief Diese Klasse ist die Basisklasse aller Regionen.
Modified: scummvm/trunk/engines/sword25/math/regionregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/math/regionregistry.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/regionregistry.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -27,10 +27,10 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
-#include "regionregistry.h"
-#include "region.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/math/regionregistry.h"
+#include "sword25/math/region.h"
// -----------------------------------------------------------------------------
// Implementation
Modified: scummvm/trunk/engines/sword25/math/regionregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/math/regionregistry.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/regionregistry.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,20 +17,20 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_REGIONREGISTRY_H
-#define BS_REGIONREGISTRY_H
+#ifndef SWORD25_REGIONREGISTRY_H
+#define SWORD25_REGIONREGISTRY_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "kernel/objectregistry.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/kernel/objectregistry.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <memory>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
// -----------------------------------------------------------------------------
// Forward Deklarationen
Modified: scummvm/trunk/engines/sword25/math/vertex.cpp
===================================================================
--- scummvm/trunk/engines/sword25/math/vertex.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/vertex.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,12 +17,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "vertex.h"
+#include "sword25/math/vertex.h"
extern "C"
{
- #include <lua.h>
- #include <lauxlib.h>
+ #include "sword25/util/lua/lua.h"
+ #include "sword25/util/lua/lauxlib.h"
}
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/math/vertex.h
===================================================================
--- scummvm/trunk/engines/sword25/math/vertex.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/vertex.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -24,12 +24,12 @@
Autor: Malte Thiesen
*/
-#ifndef _BS_VERTEX_H
-#define _BS_VERTEX_H
+#ifndef SWORD25_VERTEX_H
+#define SWORD25_VERTEX_H
// Includes
#include <math.h>
-#include "../kernel/common.h"
+#include "sword25/kernel/common.h"
// Forward-Declarations
struct lua_State;
Modified: scummvm/trunk/engines/sword25/math/walkregion.cpp
===================================================================
--- scummvm/trunk/engines/sword25/math/walkregion.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/walkregion.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -19,10 +19,10 @@
#include <list>
#include <algorithm>
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "walkregion.h"
-#include "line.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/math/walkregion.h"
+#include "sword25/math/line.h"
#define BS_LOG_PREFIX "WALKREGION"
Modified: scummvm/trunk/engines/sword25/math/walkregion.h
===================================================================
--- scummvm/trunk/engines/sword25/math/walkregion.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/math/walkregion.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_WALKREGION_H
-#define BS_WALKREGION_H
+#ifndef SWORD25_WALKREGION_H
+#define SWORD25_WALKREGION_H
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "kernel/common.h"
-#include "region.h"
+#include "sword25/kernel/common.h"
+#include "sword25/math/region.h"
// -----------------------------------------------------------------------------
// Typdefinitionen
Modified: scummvm/trunk/engines/sword25/package/packagemanager.cpp
===================================================================
--- scummvm/trunk/engines/sword25/package/packagemanager.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/package/packagemanager.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -23,7 +23,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "packagemanager.h"
+#include "sword25/package/packagemanager.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/package/packagemanager_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/package/packagemanager_script.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/package/packagemanager_script.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -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 "packagemanager.h"
+#include "sword25/package/packagemanager.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/package/physfspackagemanager.cpp
===================================================================
--- scummvm/trunk/engines/sword25/package/physfspackagemanager.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/package/physfspackagemanager.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,17 +21,12 @@
// Includes
// -----------------------------------------------------------------------------
-#include "physfspackagemanager.h"
-#include "util/physfs/physfs.h"
-extern "C"
-{
- #include "util/physfs/extras/globbing.h"
-};
+#include "sword25/package/physfspackagemanager.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
#include <sstream>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
using namespace std;
Modified: scummvm/trunk/engines/sword25/package/physfspackagemanager.h
===================================================================
--- scummvm/trunk/engines/sword25/package/physfspackagemanager.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/package/physfspackagemanager.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_PHYSFS_PACKAGE_MANAGER_H
-#define BS_PHYSFS_PACKAGE_MANAGER_H
+#ifndef SWORD25_PHYSFS_PACKAGE_MANAGER_H
+#define SWORD25_PHYSFS_PACKAGE_MANAGER_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "packagemanager.h"
+#include "sword25/kernel/common.h"
+#include "sword25/package/packagemanager.h"
// -----------------------------------------------------------------------------
// Forward declarations
Modified: scummvm/trunk/engines/sword25/script/lua_extensions.cpp
===================================================================
--- scummvm/trunk/engines/sword25/script/lua_extensions.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/script/lua_extensions.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,8 +21,8 @@
// Includes
// -----------------------------------------------------------------------------
-#include "luascript.h"
-#include "luabindhelper.h"
+#include "sword25/script/luascript.h"
+#include "sword25/script/luabindhelper.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/script/luabindhelper.h
===================================================================
--- scummvm/trunk/engines/sword25/script/luabindhelper.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/script/luabindhelper.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef LUABINDHELPER_H
-#define LUABINDHELPER_H
+#ifndef SWORD25_LUABINDHELPER_H
+#define SWORD25_LUABINDHELPER_H
#include "sword25/kernel/common.h"
extern "C"
{
- #include <sword25/util/lua/lua.h>
- #include <sword25/util/lua/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))
Modified: scummvm/trunk/engines/sword25/script/luacallback.cpp
===================================================================
--- scummvm/trunk/engines/sword25/script/luacallback.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/script/luacallback.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -21,13 +21,13 @@
// Includes
// -----------------------------------------------------------------------------
-#include "luacallback.h"
-#include "luabindhelper.h"
+#include "sword25/script/luacallback.h"
+#include "sword25/script/luabindhelper.h"
extern "C"
{
- #include <lua.h>
- #include <lauxlib.h>
+ #include "sword25/util/lua/lua.h"
+ #include "sword25/util/lua/lauxlib.h"
}
#define BS_LOG_PREFIX "LUA"
Modified: scummvm/trunk/engines/sword25/script/luacallback.h
===================================================================
--- scummvm/trunk/engines/sword25/script/luacallback.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/script/luacallback.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,14 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_LUACALLBACK_H
-#define BS_LUACALLBACK_H
+#ifndef SWORD25_LUACALLBACK_H
+#define SWORD25_LUACALLBACK_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
// -----------------------------------------------------------------------------
// Forward Deklarationen
Modified: scummvm/trunk/engines/sword25/script/luascript.cpp
===================================================================
--- scummvm/trunk/engines/sword25/script/luascript.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/script/luascript.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -25,22 +25,22 @@
extern "C"
{
- #include <lua.h>
- #include <lualib.h>
- #include <lauxlib.h>
- #include "util/pluto/pluto.h"
+ #include "sword25/util/lua/lua.h"
+ #include "sword25/util/lua/lualib.h"
+ #include "sword25/util/lua/lauxlib.h"
+ #include "sword25/util/pluto/pluto.h"
}
-#include "package/packagemanager.h"
-#include "luascript.h"
-#include "luabindhelper.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/script/luascript.h"
+#include "sword25/script/luabindhelper.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
using namespace std;
Modified: scummvm/trunk/engines/sword25/script/luascript.h
===================================================================
--- scummvm/trunk/engines/sword25/script/luascript.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/script/luascript.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef LUASCRIPT_H
-#define LUASCRIPT_H
+#ifndef SWORD25_LUASCRIPT_H
+#define SWORD25_LUASCRIPT_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "script.h"
+#include "sword25/kernel/common.h"
+#include "sword25/script/script.h"
// -----------------------------------------------------------------------------
// Forward declarations
Modified: scummvm/trunk/engines/sword25/sfx/fmodexchannel.cpp
===================================================================
--- scummvm/trunk/engines/sword25/sfx/fmodexchannel.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/fmodexchannel.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -27,9 +27,8 @@
// Includes
// -----------------------------------------------------------------------------
-#include "fmod.h"
-#include "fmodexexception.h"
-#include "fmodexchannel.h"
+#include "sword25/sfx/fmodexexception.h"
+#include "sword25/sfx/fmodexchannel.h"
// -----------------------------------------------------------------------------
// Konstruktion / Destruktion
Modified: scummvm/trunk/engines/sword25/sfx/fmodexchannel.h
===================================================================
--- scummvm/trunk/engines/sword25/sfx/fmodexchannel.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/fmodexchannel.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,14 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef FMODEXCHANNEL_H
-#define FMODEXCHANNEL_H
+#ifndef SWORD25_FMODEXCHANNEL_H
+#define SWORD25_FMODEXCHANNEL_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/sfx/fmodexexception.h
===================================================================
--- scummvm/trunk/engines/sword25/sfx/fmodexexception.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/fmodexexception.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,15 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_FMODEXEXCEPTION_H
-#define BS_FMODEXEXCEPTION_H
+#ifndef SWORD25_FMODEXEXCEPTION_H
+#define SWROD25_FMODEXEXCEPTION_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "fmod_errors.h"
+#include "sword25/kernel/common.h"
// -----------------------------------------------------------------------------
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/sfx/fmodexresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/sfx/fmodexresource.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/fmodexresource.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -28,11 +28,10 @@
// -----------------------------------------------------------------------------
#include <memory>
-#include "fmod.h"
-#include "fmodexexception.h"
-#include "fmodexchannel.h"
-#include "package/packagemanager.h"
-#include "fmodexresource.h"
+#include "sword25/sfx/fmodexexception.h"
+#include "sword25/sfx/fmodexchannel.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/sfx/fmodexresource.h"
// -----------------------------------------------------------------------------
// Konstanten
Modified: scummvm/trunk/engines/sword25/sfx/fmodexresource.h
===================================================================
--- scummvm/trunk/engines/sword25/sfx/fmodexresource.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/fmodexresource.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_FMODRESOURCE_H
-#define BS_FMODRESOURCE_H
+#ifndef SWORD25_FMODRESOURCE_H
+#define SWORD25_FMODRESOURCE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/resource.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resource.h"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/sfx/fmodexsound.cpp
===================================================================
--- scummvm/trunk/engines/sword25/sfx/fmodexsound.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/fmodexsound.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -31,16 +31,14 @@
// Includes
// -----------------------------------------------------------------------------
-#include "fmod.h"
-#include "fmod_errors.h"
-#include "fmodexexception.h"
-#include "fmodexchannel.h"
-#include "fmodexresource.h"
-#include "kernel/string.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "package/packagemanager.h"
-#include "fmodexsound.h"
+#include "sword25/sfx/fmodexexception.h"
+#include "sword25/sfx/fmodexchannel.h"
+#include "sword25/sfx/fmodexresource.h"
+#include "sword25/kernel/string.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/sfx/fmodexsound.h"
// -----------------------------------------------------------------------------
// Konstanten und lokale Funktionen
Modified: scummvm/trunk/engines/sword25/sfx/fmodexsound.h
===================================================================
--- scummvm/trunk/engines/sword25/sfx/fmodexsound.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/fmodexsound.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -17,24 +17,22 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef FMODEXSOUND_H
-#define FMODEXSOUND_H
+#ifndef SWORD25_FMODEXSOUND_H
+#define SWORD25_FMODEXSOUND_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
#include <map>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "kernel/common.h"
-#include "kernel/hashmap.h"
-#include "soundengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/hashmap.h"
+#include "sword25/sfx/soundengine.h"
-#include "fmod.h"
-
// -----------------------------------------------------------------------------
// Forward Declarations
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/sfx/soundengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/sfx/soundengine.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/soundengine.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -23,7 +23,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "soundengine.h"
+#include "sword25/sfx/soundengine.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/sfx/soundengine.h
===================================================================
--- scummvm/trunk/engines/sword25/sfx/soundengine.h 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/soundengine.h 2010-10-12 21:49:51 UTC (rev 53180)
@@ -29,16 +29,16 @@
Autor: Malte Thiesen
*/
-#ifndef BS_SOUNDENGINE_H
-#define BS_SOUNDENGINE_H
+#ifndef SWORD25_SOUNDENGINE_H
+#define SWORD25_SOUNDENGINE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/resservice.h"
-#include "kernel/persistable.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resservice.h"
+#include "sword25/kernel/persistable.h"
// -----------------------------------------------------------------------------
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/sfx/soundengine_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/sfx/soundengine_script.cpp 2010-10-12 21:47:48 UTC (rev 53179)
+++ scummvm/trunk/engines/sword25/sfx/soundengine_script.cpp 2010-10-12 21:49:51 UTC (rev 53180)
@@ -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 "soundengine.h"
+#include "sword25/sfx/soundengine.h"
// -----------------------------------------------------------------------------
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