16 files changed, 25 insertions, 23 deletions

diff --git a/engines/sword25/gfx/animation.cpp b/engines/sword25/gfx/animation.cpp
index 8335fc49d7..65556aa560 100755
--- a/engines/sword25/gfx/animation.cpp
+++ b/engines/sword25/gfx/animation.cpp
@@ -28,7 +28,7 @@
 #include "sword25/kernel/callbackregistry.h"
 #include "sword25/package/packagemanager.h"
 #include <tinyxml.h>
-#include "sword25/image/image.h"
+#include "sword25/gfx/image/image.h"
 #include "sword25/gfx/animationtemplate.h"
 #include "sword25/gfx/animationtemplateregistry.h"
 #include "sword25/gfx/animationresource.h"
diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h
index 8be252e0a0..40ec2597f6 100755
--- a/engines/sword25/gfx/animation.h
+++ b/engines/sword25/gfx/animation.h
@@ -38,7 +38,7 @@ class BS_InputPersistenceBlock;
 
 class BS_Animation : public BS_TimedRenderObject
 {
-friend BS_RenderObject;
+friend class BS_RenderObject;
 
 private:
 	BS_Animation(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, const std::string & FileName);
@@ -50,7 +50,7 @@ public:
 	{
 		AT_ONESHOT,
 		AT_LOOP,
-		AT_JOJO,
+		AT_JOJO
 	};
 	
 	virtual ~BS_Animation();
diff --git a/engines/sword25/gfx/bitmapresource.cpp b/engines/sword25/gfx/bitmapresource.cpp
index d2f61b3080..c99c84bb9c 100755
--- a/engines/sword25/gfx/bitmapresource.cpp
+++ b/engines/sword25/gfx/bitmapresource.cpp
@@ -22,7 +22,7 @@
 #include "sword25/gfx/bitmapresource.h"
 #include "sword25/kernel/kernel.h"
 #include "sword25/gfx/graphicengine.h"
-#include "sword25/image/imageloader.h"
+#include "sword25/gfx/image/imageloader.h"
 #include "sword25/package/packagemanager.h"
 
 #define BS_LOG_PREFIX "BITMAP"
diff --git a/engines/sword25/gfx/bitmapresource.h b/engines/sword25/gfx/bitmapresource.h
index bdcc0f2f66..c53561f7e2 100755
--- a/engines/sword25/gfx/bitmapresource.h
+++ b/engines/sword25/gfx/bitmapresource.h
@@ -23,7 +23,7 @@
 // Includes
 #include "sword25/kernel/common.h"
 #include "sword25/kernel/resource.h"
-#include "sword25/image/image.h"
+#include "sword25/gfx/image/image.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/gfx/dynamicbitmap.h b/engines/sword25/gfx/dynamicbitmap.h
index 3cf6db0585..524e9c8792 100755
--- a/engines/sword25/gfx/dynamicbitmap.h
+++ b/engines/sword25/gfx/dynamicbitmap.h
@@ -39,7 +39,7 @@
 
 class BS_DynamicBitmap : public BS_Bitmap
 {
-friend BS_RenderObject;
+friend class BS_RenderObject;
 
 public:
 	virtual ~BS_DynamicBitmap();
diff --git a/engines/sword25/gfx/graphicengine.cpp b/engines/sword25/gfx/graphicengine.cpp
index ea03e7f652..25e07d190d 100755
--- a/engines/sword25/gfx/graphicengine.cpp
+++ b/engines/sword25/gfx/graphicengine.cpp
@@ -19,7 +19,7 @@
 
 #define BS_LOG_PREFIX "GRAPHICENGINE"
 
-#include "sword25/image/image.h"
+#include "sword25/gfx/image/image.h"
 #include "sword25/gfx/screenshot.h"
 #include "sword25/kernel/memlog_off.h"
 #include <memory>
diff --git a/engines/sword25/gfx/graphicengine.h b/engines/sword25/gfx/graphicengine.h
index 6272df4d14..b6cd758a9e 100755
--- a/engines/sword25/gfx/graphicengine.h
+++ b/engines/sword25/gfx/graphicengine.h
@@ -111,7 +111,7 @@ public:
 		/**
 			32 Bit Farbformat (8 Bit Alpha, 8 Bit Blau, 8 Bit Grün, 8 Bit Rot) (little endian)
 		*/
-		CF_ABGR32,
+		CF_ABGR32
 	};
 	
 	// Interface
diff --git a/engines/sword25/gfx/image/imageloader.h b/engines/sword25/gfx/image/imageloader.h
index a8a4fd899f..1b30339fa1 100755
--- a/engines/sword25/gfx/image/imageloader.h
+++ b/engines/sword25/gfx/image/imageloader.h
@@ -349,7 +349,7 @@ private:
 		@brief Sucht zu Bilddaten ein BS_ImageLoader Objekt, dass die Bilddaten dekodieren kann.
 		@return Gibt einen Pointer auf ein passendes BS_ImageLoader Objekt zurück, oder NULL, wenn kein passendes Objekt gefunden wurde.
 	*/
-	static BS_ImageLoader* BS_ImageLoader::_FindSuitableImageLoader(const char* pFileData, unsigned int FileSize);
+	static BS_ImageLoader* _FindSuitableImageLoader(const char* pFileData, unsigned int FileSize);
 
 	static std::list<BS_ImageLoader*>	_ImageLoaderList;				// Die Liste aller BS_ImageLoader-Objekte
 	static bool							_ImageLoaderListInitialized;	// Gibt an, ob die Liste schon intialisiert wurde
diff --git a/engines/sword25/gfx/panel.cpp b/engines/sword25/gfx/panel.cpp
index a9deea76ea..5467ec48df 100755
--- a/engines/sword25/gfx/panel.cpp
+++ b/engines/sword25/gfx/panel.cpp
@@ -26,7 +26,7 @@
 #include "sword25/kernel/inputpersistenceblock.h"
 #include "sword25/kernel/outputpersistenceblock.h"
 #include "sword25/gfx/graphicengine.h"
-#include "sword25/image/image.h"
+#include "sword25/gfx/image/image.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/gfx/renderobject.h b/engines/sword25/gfx/renderobject.h
index 8de9a88a05..52baec0f52 100755
--- a/engines/sword25/gfx/renderobject.h
+++ b/engines/sword25/gfx/renderobject.h
@@ -79,7 +79,7 @@ public:
 		/// Ein Text. Siehe BS_Text.
 		TYPE_TEXT,
 		/// Ein unbekannter Objekttyp. Diesen Typ sollte kein Renderobjekt annehmen.
-		TYPE_UNKNOWN,
+		TYPE_UNKNOWN
 	};
 
 	// Add-Methoden
@@ -373,13 +373,13 @@ protected:
 	// Das primäre Sortierkriterium ist hierbei der Z-Wert und das sekundäre der Y-Wert (von oben nach unten).
 	// Beispiel:
 	//                  Screen
-	//                 /  |   \
-	//               /    |     \
-	//             /      |       \
-	//           /        |         \
+	//                 /  |   \.
+	//               /    |     \.
+	//             /      |       \.
+	//           /        |         \.
 	//     Background Interface   Maus
-	//		/	\	   /  |   \
-	//    /      \    /   |    \
+	//		/	\	   /  |   \.
+	//    /      \    /   |    \.
 	// George   Tür Icn1 Icn2 Icn3
 	// 
 	// Wenn jetzt das Interface mit SetVisible() ausgeblendet würde, verschwinden auch die Icons, die sich im Interface
diff --git a/engines/sword25/gfx/renderobjectmanager.h b/engines/sword25/gfx/renderobjectmanager.h
index b7b15adf20..0ada73f2ad 100755
--- a/engines/sword25/gfx/renderobjectmanager.h
+++ b/engines/sword25/gfx/renderobjectmanager.h
@@ -36,7 +36,7 @@
 #include "sword25/kernel/memlog_on.h"
 
 #include "sword25/kernel/common.h"
-#include "sword25/renderobjectptr.h"
+#include "sword25/gfx/renderobjectptr.h"
 #include "sword25/kernel/persistable.h"
 
 // Klassendefinition
diff --git a/engines/sword25/gfx/renderobjectregistry.h b/engines/sword25/gfx/renderobjectregistry.h
index ead50dc665..0d30912b0b 100755
--- a/engines/sword25/gfx/renderobjectregistry.h
+++ b/engines/sword25/gfx/renderobjectregistry.h
@@ -50,6 +50,8 @@ public:
 		return *m_InstancePtr.get();
 	}
 
+	virtual ~BS_RenderObjectRegistry() {}
+
 private:
 	virtual void LogErrorLn(const char * Message) const;
 	virtual void LogWarningLn(const char * Message) const;
diff --git a/engines/sword25/gfx/staticbitmap.h b/engines/sword25/gfx/staticbitmap.h
index 728100ce30..3367cfffc9 100755
--- a/engines/sword25/gfx/staticbitmap.h
+++ b/engines/sword25/gfx/staticbitmap.h
@@ -33,7 +33,7 @@
 
 class BS_StaticBitmap : public BS_Bitmap
 {
-friend BS_RenderObject;
+friend class BS_RenderObject;
 
 private:
 	/**
diff --git a/engines/sword25/gfx/text.h b/engines/sword25/gfx/text.h
index 238b15fdd7..9056cb73ea 100755
--- a/engines/sword25/gfx/text.h
+++ b/engines/sword25/gfx/text.h
@@ -46,7 +46,7 @@ class BS_ResourceManager;
 
 class BS_Text : public BS_RenderObject
 {
-friend BS_RenderObject;
+friend class BS_RenderObject;
 
 public:
 	/**
diff --git a/engines/sword25/gfx/timedrenderobject.cpp b/engines/sword25/gfx/timedrenderobject.cpp
index 53ddb45c4c..0ff7e90d09 100755
--- a/engines/sword25/gfx/timedrenderobject.cpp
+++ b/engines/sword25/gfx/timedrenderobject.cpp
@@ -36,4 +36,4 @@ BS_TimedRenderObject::~BS_TimedRenderObject()
 {
 	BS_ASSERT(GetManager());
 	GetManager()->DetatchTimedRenderObject(this);
-}
\ No newline at end of file
+}
diff --git a/engines/sword25/gfx/timedrenderobject.h b/engines/sword25/gfx/timedrenderobject.h
index a14a704867..428104195c 100755
--- a/engines/sword25/gfx/timedrenderobject.h
+++ b/engines/sword25/gfx/timedrenderobject.h
@@ -44,7 +44,7 @@ class BS_TimedRenderObject : public BS_RenderObject
 {
 public:
 	BS_TimedRenderObject(BS_RenderObjectPtr<BS_RenderObject> pParent, TYPES Type, unsigned int Handle = 0);
-	BS_TimedRenderObject::~BS_TimedRenderObject();
+	~BS_TimedRenderObject();
 
 	/**
 		@brief Teilt dem Objekt mit, dass ein neuer Frame begonnen wird.
@@ -54,4 +54,4 @@ public:
 		@param int TimeElapsed gibt an wie viel Zeit (in Microsekunden) seit dem letzten Frame vergangen ist.
 	*/
 	virtual void FrameNotification(int TimeElapsed) = 0;
-};
\ No newline at end of file
+};