[Scummvm-cvs-logs] SF.net SVN: scummvm:[53181] scummvm/trunk/engines/sword25
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Oct 12 23:52:42 CEST 2010
Revision: 53181
http://scummvm.svn.sourceforge.net/scummvm/?rev=53181&view=rev
Author: sev
Date: 2010-10-12 21:52:41 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
SWORD25: Fixed rest of the include paths
Modified Paths:
--------------
scummvm/trunk/engines/sword25/gfx/animation.cpp
scummvm/trunk/engines/sword25/gfx/animation.h
scummvm/trunk/engines/sword25/gfx/animationdescription.cpp
scummvm/trunk/engines/sword25/gfx/animationdescription.h
scummvm/trunk/engines/sword25/gfx/animationresource.cpp
scummvm/trunk/engines/sword25/gfx/animationresource.h
scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
scummvm/trunk/engines/sword25/gfx/animationtemplate.h
scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp
scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h
scummvm/trunk/engines/sword25/gfx/bitmap.cpp
scummvm/trunk/engines/sword25/gfx/bitmap.h
scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
scummvm/trunk/engines/sword25/gfx/bitmapresource.h
scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
scummvm/trunk/engines/sword25/gfx/fontresource.cpp
scummvm/trunk/engines/sword25/gfx/fontresource.h
scummvm/trunk/engines/sword25/gfx/framecounter.cpp
scummvm/trunk/engines/sword25/gfx/framecounter.h
scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
scummvm/trunk/engines/sword25/gfx/graphicengine.h
scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp
scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp
scummvm/trunk/engines/sword25/gfx/image/b25sloader.h
scummvm/trunk/engines/sword25/gfx/image/image.h
scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp
scummvm/trunk/engines/sword25/gfx/image/imageloader.h
scummvm/trunk/engines/sword25/gfx/image/imageloader_ids.h
scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp
scummvm/trunk/engines/sword25/gfx/image/pngloader.h
scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp
scummvm/trunk/engines/sword25/gfx/image/vectorimage.h
scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.cpp
scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.h
scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp
scummvm/trunk/engines/sword25/gfx/opengl/glimage.h
scummvm/trunk/engines/sword25/gfx/opengl/glvectorimageblit.cpp
scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp
scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h
scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp
scummvm/trunk/engines/sword25/gfx/opengl/swimage.h
scummvm/trunk/engines/sword25/gfx/panel.cpp
scummvm/trunk/engines/sword25/gfx/panel.h
scummvm/trunk/engines/sword25/gfx/renderobject.cpp
scummvm/trunk/engines/sword25/gfx/renderobject.h
scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp
scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
scummvm/trunk/engines/sword25/gfx/renderobjectptr.h
scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp
scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
scummvm/trunk/engines/sword25/gfx/rootrenderobject.h
scummvm/trunk/engines/sword25/gfx/screenshot.cpp
scummvm/trunk/engines/sword25/gfx/screenshot.h
scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp
scummvm/trunk/engines/sword25/gfx/staticbitmap.h
scummvm/trunk/engines/sword25/gfx/text.cpp
scummvm/trunk/engines/sword25/gfx/text.h
scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp
scummvm/trunk/engines/sword25/gfx/timedrenderobject.h
scummvm/trunk/engines/sword25/kernel/bs_stdint.h
scummvm/trunk/engines/sword25/kernel/callbackregistry.cpp
scummvm/trunk/engines/sword25/kernel/callbackregistry.h
scummvm/trunk/engines/sword25/kernel/common.h
scummvm/trunk/engines/sword25/kernel/filesystemutil_win32.cpp
scummvm/trunk/engines/sword25/kernel/hashmap.h
scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.cpp
scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h
scummvm/trunk/engines/sword25/kernel/kernel.cpp
scummvm/trunk/engines/sword25/kernel/kernel_script.cpp
scummvm/trunk/engines/sword25/kernel/log.cpp
scummvm/trunk/engines/sword25/kernel/log.h
scummvm/trunk/engines/sword25/kernel/md5.cpp
scummvm/trunk/engines/sword25/kernel/md5.h
scummvm/trunk/engines/sword25/kernel/memleaks.cpp
scummvm/trunk/engines/sword25/kernel/memleaks.h
scummvm/trunk/engines/sword25/kernel/objectregistry.h
scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.cpp
scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.h
scummvm/trunk/engines/sword25/kernel/persistable.h
scummvm/trunk/engines/sword25/kernel/persistenceblock.h
scummvm/trunk/engines/sword25/kernel/persistenceservice.cpp
scummvm/trunk/engines/sword25/kernel/persistenceservice.h
scummvm/trunk/engines/sword25/kernel/resmanager.cpp
scummvm/trunk/engines/sword25/kernel/resource.cpp
scummvm/trunk/engines/sword25/kernel/resource.h
scummvm/trunk/engines/sword25/kernel/resservice.h
scummvm/trunk/engines/sword25/kernel/service_ids.h
scummvm/trunk/engines/sword25/kernel/string.h
scummvm/trunk/engines/sword25/kernel/timer.cpp
scummvm/trunk/engines/sword25/kernel/timer.h
scummvm/trunk/engines/sword25/kernel/win32window.cpp
scummvm/trunk/engines/sword25/kernel/win32window.h
scummvm/trunk/engines/sword25/kernel/wincodegenerator.cpp
scummvm/trunk/engines/sword25/kernel/wincodegenerator.h
scummvm/trunk/engines/sword25/kernel/wincodegenerator_win32.cpp
scummvm/trunk/engines/sword25/kernel/window.cpp
Modified: scummvm/trunk/engines/sword25/gfx/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -19,21 +19,21 @@
#include <memory>
-#include "animation.h"
+#include "sword25/gfx/animation.h"
-#include "kernel/kernel.h"
-#include "kernel/resmanager.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/callbackregistry.h"
-#include "package/packagemanager.h"
-#include "util/tinyxml/tinyxml.h"
-#include "image/image.h"
-#include "animationtemplate.h"
-#include "animationtemplateregistry.h"
-#include "animationresource.h"
-#include "bitmapresource.h"
-#include "graphicengine.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/resmanager.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/callbackregistry.h"
+#include "sword25/package/packagemanager.h"
+#include <tinyxml.h>
+#include "sword25/image/image.h"
+#include "sword25/gfx/animationtemplate.h"
+#include "sword25/gfx/animationtemplateregistry.h"
+#include "sword25/gfx/animationresource.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/gfx/graphicengine.h"
#define BS_LOG_PREFIX "ANIMATION"
Modified: scummvm/trunk/engines/sword25/gfx/animation.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,16 +17,16 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_ANIMATION_H
-#define BS_ANIMATION_H
+#ifndef SWORD25_ANIMATION_H
+#define SWORD25_ANIMATION_H
// Includes
-#include "kernel/common.h"
-#include "timedrenderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/timedrenderobject.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"
// Forward declarations
class BS_Kernel;
Modified: scummvm/trunk/engines/sword25/gfx/animationdescription.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationdescription.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animationdescription.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,9 +21,9 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
-#include "animationdescription.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/gfx/animationdescription.h"
// -----------------------------------------------------------------------------
// Persistenz
Modified: scummvm/trunk/engines/sword25/gfx/animationdescription.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,16 +17,16 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_ANIMATIONDESCRIPTION_H
-#define BS_ANIMATIONDESCRIPTION_H
+#ifndef SWORD25_ANIMATIONDESCRIPTION_H
+#define SWORD25_ANIMATIONDESCRIPTION_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "animation.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/gfx/animation.h"
// -----------------------------------------------------------------------------
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/gfx/animationresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationresource.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animationresource.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,13 +21,13 @@
// Includes
// -----------------------------------------------------------------------------
-#include "animationresource.h"
+#include "sword25/gfx/animationresource.h"
-#include "kernel/kernel.h"
-#include "kernel/string.h"
-#include "package/packagemanager.h"
-#include "util/tinyxml/tinyxml.h"
-#include "bitmapresource.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/string.h"
+#include "sword25/package/packagemanager.h"
+#include <tinyxml.h>
+#include "sword25/gfx/bitmapresource.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/gfx/animationresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationresource.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animationresource.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,21 +17,21 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_ANIMATIONRESOURCE_H
-#define BS_ANIMATIONRESOURCE_H
+#ifndef SWORD25_ANIMATIONRESOURCE_H
+#define SWORD25_ANIMATIONRESOURCE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/resource.h"
-#include "animationdescription.h"
-#include "animation.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/gfx/animationdescription.h"
+#include "sword25/gfx/animation.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"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -23,14 +23,14 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/kernel.h"
-#include "kernel/resource.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
-#include "animationresource.h"
-#include "animationtemplate.h"
-#include "animationtemplateregistry.h"
+#include "sword25/gfx/animationresource.h"
+#include "sword25/gfx/animationtemplate.h"
+#include "sword25/gfx/animationtemplateregistry.h"
// -----------------------------------------------------------------------------
// Konstruktion / Destruktion
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,20 +17,20 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_ANIMATION_TEMPLATE_H
-#define BS_ANIMATION_TEMPLATE_H
+#ifndef SWORD25_ANIMATION_TEMPLATE_H
+#define SWORD25_ANIMATION_TEMPLATE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "animationdescription.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/gfx/animationdescription.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"
// -----------------------------------------------------------------------------
// Forward declarations
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -27,10 +27,10 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
-#include "animationtemplateregistry.h"
-#include "animationtemplate.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/gfx/animationtemplateregistry.h"
+#include "sword25/gfx/animationtemplate.h"
// -----------------------------------------------------------------------------
// Implementation
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,20 +17,20 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_ANIMATIONTEMPLATEREGISTRY_H
-#define BS_ANIMATIONTEMPLATEREGISTRY_H
+#ifndef SWORD25_ANIMATIONTEMPLATEREGISTRY_H
+#define SWORD25_ANIMATIONTEMPLATEREGISTRY_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/gfx/bitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmap.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/bitmap.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,9 +21,9 @@
// Includes
// -----------------------------------------------------------------------------
-#include "bitmap.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
// -----------------------------------------------------------------------------
// Logging
Modified: scummvm/trunk/engines/sword25/gfx/bitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmap.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/bitmap.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_BITMAP_H
-#define BS_BITMAP_H
+#ifndef SWORD25_BITMAP_H
+#define SWORD25_BITMAP_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobject.h"
// -----------------------------------------------------------------------------
// Klassendeklaration
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -19,11 +19,11 @@
#include <memory>
-#include "bitmapresource.h"
-#include "kernel/kernel.h"
-#include "graphicengine.h"
-#include "image/imageloader.h"
-#include "package/packagemanager.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/image/imageloader.h"
+#include "sword25/package/packagemanager.h"
#define BS_LOG_PREFIX "BITMAP"
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,13 +17,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_BITMAP_RESOURCE_H
-#define BS_BITMAP_RESOURCE_H
+#ifndef SWORD25_BITMAP_RESOURCE_H
+#define SWORD25_BITMAP_RESOURCE_H
// Includes
-#include "kernel/common.h"
-#include "kernel/resource.h"
-#include "image/image.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/image/image.h"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,10 +21,10 @@
// Includes
// -----------------------------------------------------------------------------
-#include "dynamicbitmap.h"
-#include "bitmapresource.h"
-#include "package/packagemanager.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/gfx/dynamicbitmap.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/kernel/inputpersistenceblock.h"
#include <vector>
Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,21 +17,21 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_DYNAMIC_BITMAP_H
-#define BS_DYNAMIC_BITMAP_H
+#ifndef SWORD25_DYNAMIC_BITMAP_H
+#define SWORD25_DYNAMIC_BITMAP_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <memory>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "kernel/common.h"
-#include "bitmap.h"
-#include "opengl/glimage.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/gfx/opengl/glimage.h"
// -----------------------------------------------------------------------------
// Klassendeklaration
Modified: scummvm/trunk/engines/sword25/gfx/fontresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -25,12 +25,12 @@
#include <memory>
-#include "kernel/kernel.h"
-#include "kernel/string.h"
-#include "package/packagemanager.h"
-#include "util/tinyxml/tinyxml.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/string.h"
+#include "sword25/package/packagemanager.h"
+#include <tinyxml.h>
-#include "fontresource.h"
+#include "sword25/gfx/fontresource.h"
// -----------------------------------------------------------------------------
// Konstanten
Modified: scummvm/trunk/engines/sword25/gfx/fontresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,16 +17,16 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_FONTRESOURCE_H
-#define BS_FONTRESOURCE_H
+#ifndef SWORD25_FONTRESOURCE_H
+#define SWORD25_FONTRESOURCE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/resource.h"
-#include "math/rect.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/math/rect.h"
// -----------------------------------------------------------------------------
// Forward declarations
Modified: scummvm/trunk/engines/sword25/gfx/framecounter.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/framecounter.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/framecounter.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,8 +17,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "framecounter.h"
-#include "kernel/timer.h"
+#include "sword25/gfx/framecounter.h"
+#include "sword25/kernel/timer.h"
BS_Framecounter::BS_Framecounter(int UpdateFrequency) :
m_FPS(0),
Modified: scummvm/trunk/engines/sword25/gfx/framecounter.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/framecounter.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/framecounter.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,12 +17,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef _BS_FRAMECOUNTER_H
-#define _BS_FRAMECOUNTER_H
+#ifndef SWORD25_FRAMECOUNTER_H
+#define SWORD25_FRAMECOUNTER_H
// Includes
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
/**
@brief Eine einfache Klasse die einen Framecounter implementiert.
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -19,19 +19,19 @@
#define BS_LOG_PREFIX "GRAPHICENGINE"
-#include "image/image.h"
-#include "screenshot.h"
-#include "kernel/memlog_off.h"
+#include "sword25/image/image.h"
+#include "sword25/gfx/screenshot.h"
+#include "sword25/kernel/memlog_off.h"
#include <memory>
#include <vector>
-#include "kernel/memlog_on.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
+#include "sword25/kernel/memlog_on.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
extern "C"
{
-#include <lua.h>
-#include <lauxlib.h>
+#include "sword25/util/lua/lua.h"
+#include "sword25/util/lua/lauxlib.h"
}
using namespace std;
@@ -45,7 +45,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "graphicengine.h"
+#include "sword25/gfx/graphicengine.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -26,21 +26,21 @@
Autor: Malte Thiesen
*/
-#ifndef _BS_GRAPHICENGINE_H
-#define _BS_GRAPHICENGINE_H
+#ifndef SWORD25_GRAPHICENGINE_H
+#define SWORD25_GRAPHICENGINE_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 "kernel/bs_stdint.h"
-#include "kernel/resservice.h"
-#include "kernel/persistable.h"
-#include "math/rect.h"
-#include "framecounter.h"
-#include "renderobjectptr.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/kernel/resservice.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/framecounter.h"
+#include "sword25/gfx/renderobjectptr.h"
class BS_Kernel;
class BS_Image;
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -24,22 +24,22 @@
#include <algorithm>
#include <string>
-#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 "math/vertex.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 "sword25/math/vertex.h"
-#include "graphicengine.h"
-#include "renderobject.h"
-#include "bitmap.h"
-#include "animation.h"
-#include "panel.h"
-#include "text.h"
-#include "animationtemplate.h"
-#include "animationtemplateregistry.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/renderobject.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/gfx/animation.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/gfx/text.h"
+#include "sword25/gfx/animationtemplate.h"
+#include "sword25/gfx/animationtemplateregistry.h"
#define BS_LOG_PREFIX "GRAPHICENGINE"
Modified: scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -26,8 +26,8 @@
#include <algorithm>
using namespace std;
-#include "b25sloader.h"
-#include "pngloader.h"
+#include "sword25/gfx/image/b25sloader.h"
+#include "sword25/gfx/image/pngloader.h"
#define BS_LOG_PREFIX "B25SLOADER"
Modified: scummvm/trunk/engines/sword25/gfx/image/b25sloader.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/b25sloader.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/b25sloader.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_B25SLOADER_H
-#define BS_B25SLOADER_H
+#ifndef SWORD25_B25SLOADER_H
+#define SWORD25_B25SLOADER_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "imageloader.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/imageloader.h"
// -----------------------------------------------------------------------------
// Klassendeklaration
@@ -36,9 +36,9 @@
public:
static BS_ImageLoader * CreateInstance()
{
- #include "kernel/memlog_off.h"
+ #include "sword25/kernel/memlog_off.h"
return static_cast<BS_ImageLoader *>(new BS_B25SLoader());
- #include "kernel/memlog_on.h"
+ #include "sword25/kernel/memlog_on.h"
}
protected:
Modified: scummvm/trunk/engines/sword25/gfx/image/image.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/image.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/image.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -24,16 +24,16 @@
Autor: Malte Thiesen
*/
-#ifndef BS_IMAGE_H
-#define BS_IMAGE_H
+#ifndef SWORD25_IMAGE_H
+#define SWORD25_IMAGE_H
// Includes
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
-#include "kernel/memlog_on.h"
-#include "kernel/common.h"
-#include "math/rect.h"
-#include "gfx/graphicengine.h"
+#include "sword25/kernel/memlog_on.h"
+#include "sword25/kernel/common.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/graphicengine.h"
class BS_Image
{
Modified: scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,8 +17,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "imageloader.h"
-#include "imageloader_ids.h"
+#include "sword25/gfx/image/imageloader.h"
+#include "sword25/gfx/image/imageloader_ids.h"
#define BS_LOG_PREFIX "IMAGELOADER"
Modified: scummvm/trunk/engines/sword25/gfx/image/imageloader.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/imageloader.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/imageloader.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -24,18 +24,18 @@
Autor: Malte Thiesen
*/
-#ifndef BS_IMAGELOADER_H
-#define BS_IMAGELOADER_H
+#ifndef SWORD25_IMAGELOADER_H
+#define SWORD25_IMAGELOADER_H
// Includes
-#include "kernel/bs_stdint.h"
-#include "kernel/common.h"
-#include "../graphicengine.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/graphicengine.h"
// Die folgenden Header vertragen sich nicht mit der Memoryleak-Detection, daher wird sie kurzzeitig deaktiviert
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <list>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
/**
@brief \xDCber die statischen Methoden dieser Klasse werden alle unterst\xFCtzten Bildformate geladen.
Modified: scummvm/trunk/engines/sword25/gfx/image/imageloader_ids.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/imageloader_ids.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/imageloader_ids.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -26,11 +26,11 @@
Autor: Malte Thiesen
*/
-#include "imageloader.h"
+#include "sword25/gfx/image/imageloader.h"
// Die Headerdateien der ImageLoader m\xFCssen hier eingebunden werden
-#include "pngloader.h"
-#include "b25sloader.h"
+#include "sword25/gfx/image/pngloader.h"
+#include "sword25/gfx/image/b25sloader.h"
// Die Tabelle enth\xE4lt Pointer auf statische Member-Funktionen innerhalb der Klassen, die eine Instanz der Klasse
// erzeugen
Modified: scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,9 +21,9 @@
// Includes
// -----------------------------------------------------------------------------
-#include "image.h"
-#include "pngloader.h"
-#include "util/libpng/png.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/gfx/image/pngloader.h"
+#include <png.h>
#define BS_LOG_PREFIX "PNGLOADER"
Modified: scummvm/trunk/engines/sword25/gfx/image/pngloader.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/pngloader.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/pngloader.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -25,12 +25,12 @@
Autor: Malte Thiesen
*/
-#ifndef BS_PNGLOADER2_H
-#define BS_PNGLOADER2_H
+#ifndef SWORD25_PNGLOADER2_H
+#define SWORD25_PNGLOADER2_H
// Includes
-#include "kernel/common.h"
-#include "imageloader.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/imageloader.h"
// Klassendefinition
class BS_PNGLoader : public BS_ImageLoader
@@ -38,9 +38,9 @@
public:
static BS_ImageLoader* CreateInstance()
{
- #include "kernel/memlog_off.h"
+ #include "sword25/kernel/memlog_off.h"
return (BS_ImageLoader*) new BS_PNGLoader();
- #include "kernel/memlog_on.h"
+ #include "sword25/kernel/memlog_on.h"
}
// Alle virtuellen Methoden von BS_ImageLoader sind hier als static-Methode implementiert, damit sie von BS_B25SLoader aufgerufen werden k\xF6nnen.
Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,8 +21,8 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/bs_stdint.h"
-#include "vectorimage.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/gfx/image/vectorimage.h"
#include <vector>
#include <stdexcept>
Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimage.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimage.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimage.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,16 +17,16 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_VECTORIMAGE_H
-#define BS_VECTORIMAGE_H
+#ifndef SWORD25_VECTORIMAGE_H
+#define SWORD25_VECTORIMAGE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "gfx/image/image.h"
-#include "math/rect.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/math/rect.h"
#include <vector>
#include "agg_path_storage.h"
Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,8 +21,8 @@
// Includes
// -----------------------------------------------------------------------------
-#include "vectorimagerenderer.h"
-#include "vectorimage.h"
+#include "sword25/gfx/image/vectorimagerenderer.h"
+#include "sword25/gfx/image/vectorimage.h"
#include "agg_conv_curve.h"
#include "agg_path_storage.h"
#include "agg_conv_stroke.h"
Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,14 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_VECTORIMAGERENDERER_H
-#define BS_VECTORIMAGERENDERER_H
+#ifndef SWORD25_VECTORIMAGERENDERER_H
+#define SWORD25_VECTORIMAGERENDERER_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
#include <vector>
#include "agg_rendering_buffer.h"
Modified: scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,11 +21,11 @@
// INCLUDES
// -----------------------------------------------------------------------------
-#include "util/glsprites/glsprites.h"
-#include "package/packagemanager.h"
-#include "gfx/image/imageloader.h"
-#include "openglgfx.h"
-#include "glimage.h"
+#include "sword25/util/glsprites/glsprites.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/gfx/image/imageloader.h"
+#include "sword25/gfx/opengl/openglgfx.h"
+#include "sword25/gfx/opengl/glimage.h"
#define BS_LOG_PREFIX "GLIMAGE"
Modified: scummvm/trunk/engines/sword25/gfx/opengl/glimage.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/glimage.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/opengl/glimage.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,16 +17,16 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_GL_IMAGE_H
-#define BS_GL_IMAGE_H
+#ifndef SWORD25_GL_IMAGE_H
+#define SWORD25_GL_IMAGE_H
// -----------------------------------------------------------------------------
// INCLUDES
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "gfx/image/image.h"
-#include "gfx/graphicengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/gfx/graphicengine.h"
#include <vector>
Modified: scummvm/trunk/engines/sword25/gfx/opengl/glvectorimageblit.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/glvectorimageblit.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/opengl/glvectorimageblit.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,9 +21,9 @@
// Includes
// -----------------------------------------------------------------------------
-#include "gfx/image/vectorimage.h"
-#include "gfx/image/vectorimagerenderer.h"
-#include "util/glsprites/glsprites.h"
+#include "sword25/gfx/image/vectorimage.h"
+#include "sword25/gfx/image/vectorimagerenderer.h"
+#include "sword25/util/glsprites/glsprites.h"
#include <vector>
using namespace std;
Modified: scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -25,20 +25,20 @@
#include <windows.h>
#include <GL/GL.h>
-#include "util/glsprites/glsprites.h"
-#include "../bitmapresource.h"
-#include "../animationresource.h"
-#include "../fontresource.h"
-#include "../panel.h"
-#include "../renderobjectmanager.h"
-#include "../image/vectorimage.h"
-#include "package/packagemanager.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
+#include "sword25/util/glsprites/glsprites.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/gfx/animationresource.h"
+#include "sword25/gfx/fontresource.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/gfx/renderobjectmanager.h"
+#include "sword25/gfx/image/vectorimage.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
-#include "openglgfx.h"
-#include "glimage.h"
-#include "swimage.h"
+#include "sword25/gfx/opengl/openglgfx.h"
+#include "sword25/gfx/opengl/glimage.h"
+#include "sword25/gfx/opengl/swimage.h"
#include <algorithm>
Modified: scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,22 +17,22 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_OPENGLGFX_H
-#define BS_OPENGLGFX_H
+#ifndef SWORD25_OPENGLGFX_H
+#define SWORD25_OPENGLGFX_H
// -----------------------------------------------------------------------------
// 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 "kernel/common.h"
-#include "../graphicengine.h"
-#include "../renderobjectptr.h"
-#include "util/glsprites/glsprites.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/renderobjectptr.h"
+#include "sword25/util/glsprites/glsprites.h"
// -----------------------------------------------------------------------------
// FORWARD DECLARATIONS
Modified: scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,10 +21,10 @@
// INCLUDES
// -----------------------------------------------------------------------------
-#include "package/packagemanager.h"
-#include "gfx/image/imageloader.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/gfx/image/imageloader.h"
-#include "swimage.h"
+#include "sword25/gfx/opengl/swimage.h"
#define BS_LOG_PREFIX "SWIMAGE"
Modified: scummvm/trunk/engines/sword25/gfx/opengl/swimage.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/swimage.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/opengl/swimage.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,16 +17,16 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_SWIMAGE_H
-#define BS_SWIMAGE_H
+#ifndef SWORD25_SWIMAGE_H
+#define SWORD25_SWIMAGE_H
// -----------------------------------------------------------------------------
// INCLUDES
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "gfx/image/image.h"
-#include "gfx/graphicengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/gfx/graphicengine.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/gfx/panel.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/panel.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/panel.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,12 +21,12 @@
// Includes
// -----------------------------------------------------------------------------
-#include "panel.h"
+#include "sword25/gfx/panel.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "graphicengine.h"
-#include "image/image.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/image/image.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/gfx/panel.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/panel.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/panel.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_PANEL_H
-#define BS_PANEL_H
+#ifndef SWORD25_PANEL_H
+#define SWORD25_PANEL_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobject.h"
// -----------------------------------------------------------------------------
// Class Definition
Modified: scummvm/trunk/engines/sword25/gfx/renderobject.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobject.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/renderobject.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,24 +17,24 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "renderobject.h"
+#include "sword25/gfx/renderobject.h"
#include <algorithm>
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
-#include "renderobjectregistry.h"
-#include "renderobjectmanager.h"
-#include "graphicengine.h"
+#include "sword25/gfx/renderobjectregistry.h"
+#include "sword25/gfx/renderobjectmanager.h"
+#include "sword25/gfx/graphicengine.h"
-#include "bitmap.h"
-#include "staticbitmap.h"
-#include "dynamicbitmap.h"
-#include "animation.h"
-#include "panel.h"
-#include "text.h"
-#include "animationtemplate.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/gfx/staticbitmap.h"
+#include "sword25/gfx/dynamicbitmap.h"
+#include "sword25/gfx/animation.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/gfx/text.h"
+#include "sword25/gfx/animationtemplate.h"
#define BS_LOG_PREFIX "RENDEROBJECT"
Modified: scummvm/trunk/engines/sword25/gfx/renderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobject.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/renderobject.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -27,18 +27,18 @@
Autor: Malte Thiesen
*/
-#ifndef _BS_RENDEROBJECT_H
-#define _BS_RENDEROBJECT_H
+#ifndef SWORD25_RENDEROBJECT_H
+#define SWORD25_RENDEROBJECT_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 "kernel/persistable.h"
-#include "math/rect.h"
-#include "renderobjectptr.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/renderobjectptr.h"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,17 +21,17 @@
// Includes
// -----------------------------------------------------------------------------
-#include "renderobjectmanager.h"
+#include "sword25/gfx/renderobjectmanager.h"
-#include "kernel/kernel.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "gfx/graphicengine.h"
-#include "gfx/animationtemplateregistry.h"
-#include "math/rect.h"
-#include "renderobject.h"
-#include "timedrenderobject.h"
-#include "rootrenderobject.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/animationtemplateregistry.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/renderobject.h"
+#include "sword25/gfx/timedrenderobject.h"
+#include "sword25/gfx/rootrenderobject.h"
#define BS_LOG_PREFIX "RENDEROBJECTMANAGER"
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -27,17 +27,17 @@
Autor: Malte Thiesen
*/
-#ifndef _BS_RENDEROBJECTMANAGER_H
-#define _BS_RENDEROBJECTMANAGER_H
+#ifndef SWORD25_RENDEROBJECTMANAGER_H
+#define SWORD25_RENDEROBJECTMANAGER_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 "renderobjectptr.h"
-#include "kernel/persistable.h"
+#include "sword25/kernel/common.h"
+#include "sword25/renderobjectptr.h"
+#include "sword25/kernel/persistable.h"
// Klassendefinition
class BS_Kernel;
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectptr.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectptr.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectptr.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_RENDER_OBJECT_PTR_H
-#define BS_RENDER_OBJECT_PTR_H
+#ifndef SWORD25_RENDER_OBJECT_PTR_H
+#define SWORD25_RENDER_OBJECT_PTR_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "renderobjectregistry.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobjectregistry.h"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -27,7 +27,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "renderobjectregistry.h"
+#include "sword25/gfx/renderobjectregistry.h"
// -----------------------------------------------------------------------------
// Implementation
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,19 +17,19 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_RENDEROBJECTREGISTRY_H
-#define BS_RENDEROBJECTREGISTRY_H
+#ifndef SWORD25_RENDEROBJECTREGISTRY_H
+#define SWORD25_RENDEROBJECTREGISTRY_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/objectregistry.h"
+#include "sword25/kernel/common.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/gfx/rootrenderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/rootrenderobject.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/rootrenderobject.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,12 +17,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_ROOTRENDEROBJECT_H
-#define BS_ROOTRENDEROBJECT_H
+#ifndef SWORD25_ROOTRENDEROBJECT_H
+#define SWORD25_ROOTRENDEROBJECT_H
// Includes
-#include "kernel/common.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobject.h"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/gfx/screenshot.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/screenshot.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/screenshot.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -23,8 +23,8 @@
// Includes
// -----------------------------------------------------------------------------
-#include "screenshot.h"
-#include "util/libpng/png.h"
+#include "sword25/gfx/screenshot.h"
+#include <png.h>
using namespace std;
Modified: scummvm/trunk/engines/sword25/gfx/screenshot.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/screenshot.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/screenshot.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_SCREENSHOT_H
-#define BS_SCREENSHOT_H
+#ifndef SWORD25_SCREENSHOT_H
+#define SWORD25_SCREENSHOT_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/memlog_off.h"
#include <string>
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
// -----------------------------------------------------------------------------
// Class declaration
Modified: scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,11 +21,11 @@
// Includes
// -----------------------------------------------------------------------------
-#include "staticbitmap.h"
-#include "bitmapresource.h"
-#include "package/packagemanager.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/gfx/staticbitmap.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
// -----------------------------------------------------------------------------
// Logging
Modified: scummvm/trunk/engines/sword25/gfx/staticbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/staticbitmap.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/staticbitmap.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_STATIC_BITMAP_H
-#define BS_STATIC_BITMAP_H
+#ifndef SWORD25_STATIC_BITMAP_H
+#define SWORD25_STATIC_BITMAP_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "bitmap.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/bitmap.h"
// -----------------------------------------------------------------------------
// Klassendeklaration
Modified: scummvm/trunk/engines/sword25/gfx/text.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/text.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -27,13 +27,13 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/kernel.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
-#include "fontresource.h"
-#include "bitmapresource.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/gfx/fontresource.h"
+#include "sword25/gfx/bitmapresource.h"
-#include "text.h"
+#include "sword25/gfx/text.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/gfx/text.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/text.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,20 +17,20 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_TEXT_H
-#define BS_TEXT_H
+#ifndef SWORD25_TEXT_H
+#define SWORD25_TEXT_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "math/rect.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/renderobject.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"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,9 +17,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "timedrenderobject.h"
+#include "sword25/gfx/timedrenderobject.h"
-#include "renderobjectmanager.h"
+#include "sword25/gfx/renderobjectmanager.h"
// -----------------------------------------------------------------------------
// Konstruktion / Destruktion
Modified: scummvm/trunk/engines/sword25/gfx/timedrenderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/timedrenderobject.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/gfx/timedrenderobject.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -25,8 +25,8 @@
// Engine Includes
// -----------------------------------------------------------------------------
-#include "../kernel/common.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobject.h"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/kernel/bs_stdint.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/bs_stdint.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/bs_stdint.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -1,5 +1,5 @@
-#ifndef BS_STDINT_H
-#define BS_STDINT_H
+#ifndef SWORD25_STDINT_H
+#define SWORD25_STDINT_H
#ifdef _MSC_VER
typedef unsigned __int8 uint8_t;
Modified: scummvm/trunk/engines/sword25/kernel/callbackregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/callbackregistry.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/callbackregistry.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -39,7 +39,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "callbackregistry.h"
+#include "sword25/kernel/callbackregistry.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/kernel/callbackregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/callbackregistry.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/callbackregistry.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_CALLBACK_REGISTRY_H
-#define BS_CALLBACK_REGISTRY_H
+#ifndef SWORD25_CALLBACK_REGISTRY_H
+#define SWORD25_CALLBACK_REGISTRY_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <map>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
// -----------------------------------------------------------------------------
// Klassendeklaration
Modified: scummvm/trunk/engines/sword25/kernel/common.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/common.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/common.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -27,8 +27,8 @@
Autor: Malte Thiesen
*/
-#ifndef BS_COMMON_H
-#define BS_COMMON_H
+#ifndef SWORD25_COMMON_H
+#define SWORD25_COMMON_H
// Globale Konstanten
#if _DEBUG && !DEBUG
Modified: scummvm/trunk/engines/sword25/kernel/filesystemutil_win32.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/filesystemutil_win32.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/filesystemutil_win32.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,7 +21,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "filesystemutil.h"
+#include "sword25/kernel/filesystemutil.h"
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <ShlObj.h>
Modified: scummvm/trunk/engines/sword25/kernel/hashmap.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/hashmap.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/hashmap.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,11 +17,11 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_HASHMAP_H
-#define BS_HASHMAP_H
+#ifndef SWORD25_HASHMAP_H
+#define SWORD25_HASHMAP_H
// stdext::hash_map wird erst seit VC7 unters\xFCtzt, bei \xE4lteren Microsoft-Compilern wird auf std::map zur\xFCckgegriffen
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#if _MSC_VER >= 1300
#include <hash_map>
#define BS_Hashmap stdext::hash_map
@@ -29,6 +29,6 @@
#include <map>
#define BS_Hashmap std::map
#endif
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
#endif
Modified: scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -23,7 +23,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "inputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
using namespace std;
Modified: scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_INPUTPERSISTENCEBLOCK_H
-#define BS_INPUTPERSISTENCEBLOCK_H
+#ifndef SWORD25_INPUTPERSISTENCEBLOCK_H
+#define SWORD25_INPUTPERSISTENCEBLOCK_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/persistenceblock.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistenceblock.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/kernel/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/kernel.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -26,17 +26,17 @@
#include <math.h>
#include <algorithm>
-#include "kernel.h"
-#include "timer.h"
-#include "service_ids.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/timer.h"
+#include "sword25/kernel/service_ids.h"
-#include "gfx/graphicengine.h"
-#include "sfx/soundengine.h"
-#include "input/inputengine.h"
-#include "package/packagemanager.h"
-#include "script/script.h"
-#include "fmv/movieplayer.h"
-#include "persistenceservice.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/sfx/soundengine.h"
+#include "sword25/input/inputengine.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/script/script.h"
+#include "sword25/fmv/movieplayer.h"
+#include "sword25/kernel/persistenceservice.h"
#define BS_LOG_PREFIX "KERNEL"
Modified: scummvm/trunk/engines/sword25/kernel/kernel_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel_script.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/kernel_script.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,16 +21,16 @@
// Includes
// -----------------------------------------------------------------------------
-#include "common.h"
-#include "kernel.h"
-#include "filesystemutil.h"
-#include "window.h"
-#include "resmanager.h"
-#include "persistenceservice.h"
-#include "wincodegenerator.h"
-#include "debug/debugtools.h"
-#include "script/script.h"
-#include "script/luabindhelper.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/filesystemutil.h"
+#include "sword25/kernel/window.h"
+#include "sword25/kernel/resmanager.h"
+#include "sword25/kernel/persistenceservice.h"
+#include "sword25/kernel/wincodegenerator.h"
+#include "sword25/debug/debugtools.h"
+#include "sword25/script/script.h"
+#include "sword25/script/luabindhelper.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/kernel/log.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/log.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/log.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,9 +21,9 @@
#include <stdarg.h>
#include <string>
-#include "filesystemutil.h"
-#include "log.h"
-#include "debug/debugtools.h"
+#include "sword25/kernel/filesystemutil.h"
+#include "sword25/kernel/log.h"
+#include "sword25/debug/debugtools.h"
// Konstanten
static const char* BF_LOG_FILENAME = "log.txt";
Modified: scummvm/trunk/engines/sword25/kernel/log.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/log.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/log.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_LOG_H
-#define BS_LOG_H
+#ifndef SWORD25_LOG_H
+#define SWORD25_LOG_H
// Includes
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <stdio.h>
#include <vector>
#include <string>
#include <algorithm>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "common.h"
+#include "sword25/kernel/common.h"
// Logging soll nur stattfinden wenn es aktiviert ist
#ifdef BS_ACTIVATE_LOGGING
Modified: scummvm/trunk/engines/sword25/kernel/md5.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/md5.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/md5.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -41,7 +41,7 @@
// L. Peter Deutsch
// ghost at aladdin.com
-#include "md5.h"
+#include "sword25/kernel/md5.h"
#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
#ifdef ARCH_IS_BIG_ENDIAN
Modified: scummvm/trunk/engines/sword25/kernel/md5.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/md5.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/md5.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_MD5_H
-#define BS_MD5_H
+#ifndef SWORD25_MD5_H
+#define SWORD25_MD5_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
// -----------------------------------------------------------------------------
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/kernel/memleaks.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/memleaks.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/memleaks.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -28,9 +28,9 @@
// #pragma warning (disable : 4074)
// #pragma init_seg(compiler)
-#include "filesystemutil.h"
+#include "sword25/kernel/filesystemutil.h"
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
#include <algorithm>
#include <string>
Modified: scummvm/trunk/engines/sword25/kernel/memleaks.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/memleaks.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/memleaks.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,8 +17,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BF_MEMLEAKS_H
-#define BF_MEMLEAKS_H
+#ifndef SWORD25_MEMLEAKS_H
+#define SWORD25_MEMLEAKS_H
#ifdef BS_MEMLOG
@@ -26,7 +26,7 @@
#pragma warning(disable : 4291)
#endif
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <malloc.h>
Modified: scummvm/trunk/engines/sword25/kernel/objectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/objectregistry.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/objectregistry.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_OBJECTREGISTRY_H
-#define BS_OBJECTREGISTRY_H
+#ifndef SWORD25_OBJECTREGISTRY_H
+#define SWORD25_OBJECTREGISTRY_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/hashmap.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/hashmap.h"
// -----------------------------------------------------------------------------
// Klassendeklaration
Modified: scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -23,7 +23,7 @@
// Includes
// -----------------------------------------------------------------------------
-#include "outputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
// -----------------------------------------------------------------------------
// Constants
Modified: scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_OUTPUTPERSISTENCEBLOCK_H
-#define BS_OUTPUTPERSISTENCEBLOCK_H
+#ifndef SWORD25_OUTPUTPERSISTENCEBLOCK_H
+#define SWORD25_OUTPUTPERSISTENCEBLOCK_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/persistenceblock.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistenceblock.h"
+#include "sword25/kernel/memlog_off.h"
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/kernel/persistable.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/persistable.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/persistable.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,8 +17,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_PERSISTABLE_H
-#define BS_PERSISTABLE_H
+#ifndef SWORD25_PERSISTABLE_H
+#define SWORD25_PERSISTABLE_H
class BS_OutputPersistenceBlock;
class BS_InputPersistenceBlock;
Modified: scummvm/trunk/engines/sword25/kernel/persistenceblock.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/persistenceblock.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/persistenceblock.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,14 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_PERSISTENCEBLOCK_H
-#define BS_PERSISTENCEBLOCK_H
+#ifndef SWORD25_PERSISTENCEBLOCK_H
+#define SWORD25_PERSISTENCEBLOCK_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/kernel/persistenceservice.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/persistenceservice.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/persistenceservice.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,25 +21,25 @@
// Includes
// -----------------------------------------------------------------------------
-#include "kernel.h"
-#include "persistenceservice.h"
-#include "inputpersistenceblock.h"
-#include "outputpersistenceblock.h"
-#include "filesystemutil.h"
-#include "gfx/graphicengine.h"
-#include "sfx/soundengine.h"
-#include "input/inputengine.h"
-#include "math/regionregistry.h"
-#include "script/script.h"
-#include "debug/debugtools.h"
-#include "util/zlib/zlib.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/persistenceservice.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/filesystemutil.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/sfx/soundengine.h"
+#include "sword25/input/inputengine.h"
+#include "sword25/math/regionregistry.h"
+#include "sword25/script/script.h"
+#include "sword25/debug/debugtools.h"
+#include "sword25/util/zlib/zlib.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <sstream>
#include <fstream>
#include <algorithm>
#include <locale>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
using namespace std;
Modified: scummvm/trunk/engines/sword25/kernel/persistenceservice.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/persistenceservice.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/persistenceservice.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,18 +17,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_PERSISTENCESERVICE_H
-#define BS_PERSISTENCESERVICE_H
+#ifndef SWORD25_PERSISTENCESERVICE_H
+#define SWORD25_PERSISTENCESERVICE_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
-#include "kernel/common.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/memlog_off.h"
#include <string>
#include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
// -----------------------------------------------------------------------------
// Class declaration
Modified: scummvm/trunk/engines/sword25/kernel/resmanager.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/resmanager.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/resmanager.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,12 +17,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "resmanager.h"
+#include "sword25/kernel/resmanager.h"
-#include "resource.h"
-#include "resservice.h"
-#include "string.h"
-#include "../package/packagemanager.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/kernel/resservice.h"
+#include "sword25/kernel/string.h"
+#include "sword25/package/packagemanager.h"
#define BS_LOG_PREFIX "RESOURCEMANAGER"
Modified: scummvm/trunk/engines/sword25/kernel/resource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/resource.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/resource.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,10 +17,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "resource.h"
-#include "string.h"
-#include "kernel.h"
-#include "package/packagemanager.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/kernel/string.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/package/packagemanager.h"
#define BS_LOG_PREFIX "RESOURCE"
Modified: scummvm/trunk/engines/sword25/kernel/resource.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/resource.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/resource.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,14 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_RESOURCE_H
-#define BS_RESOURCE_H
+#ifndef SWORD25_RESOURCE_H
+#define SWORD25_RESOURCE_H
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <list>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "common.h"
+#include "sword25/kernel/common.h"
class BS_Kernel;
class BS_ResourceManager;
Modified: scummvm/trunk/engines/sword25/kernel/resservice.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/resservice.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/resservice.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,14 +17,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_RESOURCESERVICE_H
-#define BS_RESOURCESERVICE_H
+#ifndef SWORD25_RESOURCESERVICE_H
+#define SWORD25_RESOURCESERVICE_H
// Includes
-#include "common.h"
-#include "service.h"
-#include "kernel.h"
-#include "resmanager.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/service.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/resmanager.h"
class BS_Resource;
Modified: scummvm/trunk/engines/sword25/kernel/service_ids.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/service_ids.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/service_ids.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -27,7 +27,7 @@
Autor: Malte Thiesen
*/
-#include "common.h"
+#include "sword25/kernel/common.h"
BS_Service * BS_OpenGLGfx_CreateObject(BS_Kernel* pKernel);
BS_Service * BS_PhysfsPackageManager_CreateObject(BS_Kernel* pKernel);
Modified: scummvm/trunk/engines/sword25/kernel/string.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/string.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/string.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,12 +17,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_STRING
-#define BS_STRING
+#ifndef SWORD25_STRING
+#define SWORD25_STRING
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#include <string>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
namespace BS_String
{
Modified: scummvm/trunk/engines/sword25/kernel/timer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/timer.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/timer.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -20,7 +20,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#include "timer.h"
+#include "sword25/kernel/timer.h"
#define BS_LOG_PREFIX "BS_TIMER"
Modified: scummvm/trunk/engines/sword25/kernel/timer.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/timer.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/timer.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -25,12 +25,12 @@
Autor: Malte Thiesen
*/
-#ifndef BS_TIMER_H
-#define BS_TIMER_H
+#ifndef SWORD25_TIMER_H
+#define SWORD25_TIMER_H
// Includes
-#include "common.h"
-#include "bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
/**
@brief Eine Klasse zum Auslesen des Systemtimers.
Modified: scummvm/trunk/engines/sword25/kernel/win32window.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/win32window.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/win32window.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,11 +17,11 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "win32window.h"
+#include "sword25/kernel/win32window.h"
#include "../../projects/resource.h"
-#include "kernel/kernel.h"
-#include "input/inputengine.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/input/inputengine.h"
bool BS_Win32Window::_ClassRegistered = false;
Modified: scummvm/trunk/engines/sword25/kernel/win32window.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/win32window.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/win32window.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -26,17 +26,17 @@
Autor: Malte Thiesen
*/
-#ifndef _BS_WIN32WINDOW_H
-#define _BS_WIN32WINDOW_H
+#ifndef SWORD25_WIN32WINDOW_H
+#define SWORD25_WIN32WINDOW_H
// Includes
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
-#include "common.h"
-#include "window.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/window.h"
// Klassendefinition
class BS_Win32Window : public BS_Window
Modified: scummvm/trunk/engines/sword25/kernel/wincodegenerator.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/wincodegenerator.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/wincodegenerator.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -21,8 +21,8 @@
// Includes
// -----------------------------------------------------------------------------
-#include "md5.h"
-#include "wincodegenerator.h"
+#include "sword25/kernel/md5.h"
+#include "sword25/kernel/wincodegenerator.h"
using namespace std;
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/kernel/wincodegenerator.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/wincodegenerator.h 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/wincodegenerator.h 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,15 +17,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#ifndef BS_WIN_CODE_GENERATOR_H
-#define BS_WIN_CODE_GENERATOR_H
+#ifndef SWORD25_WIN_CODE_GENERATOR_H
+#define SWORD25_WIN_CODE_GENERATOR_H
// -----------------------------------------------------------------------------
// Includes
// -----------------------------------------------------------------------------
#include <string>
-#include "common.h"
+#include "sword25/kernel/common.h"
// -----------------------------------------------------------------------------
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/kernel/wincodegenerator_win32.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/wincodegenerator_win32.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/wincodegenerator_win32.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -28,8 +28,8 @@
#include <vector>
using namespace std;
-#include "md5.h"
-#include "wincodegenerator.h"
+#include "sword25/kernel/md5.h"
+#include "sword25/kernel/wincodegenerator.h"
// -----------------------------------------------------------------------------
// Hilfsfunktionen
Modified: scummvm/trunk/engines/sword25/kernel/window.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/window.cpp 2010-10-12 21:49:51 UTC (rev 53180)
+++ scummvm/trunk/engines/sword25/kernel/window.cpp 2010-10-12 21:52:41 UTC (rev 53181)
@@ -17,10 +17,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// -----------------------------------------------------------------------------
-#include "window.h"
+#include "sword25/kernel/window.h"
// Alle Implementationen von BS_Window m\xFCssen hier eingetragen werden
-#include "win32window.h"
+#include "sword25/kernel/win32window.h"
// Erstellt ein Fenster des GUI des aktuellen Betriebssystems
BS_Window* BS_Window::CreateBSWindow(int X, int Y, int Width, int Height, bool Visible)
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