SWORD25: Compilation fixes

Majority of files now compile under Windoze.

svn-id: r53182

40 files changed, 68 insertions, 67 deletions

diff --git a/engines/sword25/fmv/oggtheora/oggtheora.cpp b/engines/sword25/fmv/oggtheora/oggtheora.cpp
index dcff5e025b..9ad2712128 100755
--- a/engines/sword25/fmv/oggtheora/oggtheora.cpp
+++ b/engines/sword25/fmv/oggtheora/oggtheora.cpp
@@ -92,7 +92,7 @@ namespace
 	{
 		return ((x > high) ? high : (( x < low) ? low : x));
 	}
-};
+}
 
 // -----------------------------------------------------------------------------
 // Konstruktion / Destruktion
@@ -313,7 +313,7 @@ bool BS_OggTheora::LoadMovie(const std::string & Filename, unsigned int Z)
 		float ScreenToVideoWidth = (float) pGfx->GetDisplayWidth() / (float) m_OutputBitmap->GetWidth();
 		float ScreenToVideoHeight = (float) pGfx->GetDisplayHeight() / (float) m_OutputBitmap->GetHeight();
 		float ScaleFactor = std::min(ScreenToVideoWidth, ScreenToVideoHeight);
-		if (abs(ScaleFactor - 1.0f) < FLT_EPSILON) ScaleFactor = 1.0f;
+		if (ABS(ScaleFactor - 1.0f) < FLT_EPSILON) ScaleFactor = 1.0f;
 		m_OutputBitmap->SetScaleFactor(ScaleFactor);
 
 		// Z-Wert setzen
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
+};
diff --git a/engines/sword25/input/inputengine.h b/engines/sword25/input/inputengine.h
index fb045d40d2..c5a27fcdf9 100755
--- a/engines/sword25/input/inputengine.h
+++ b/engines/sword25/input/inputengine.h
@@ -133,7 +133,7 @@ public:
 		KEY_LSHIFT      = 0xA0,
 		KEY_RSHIFT      = 0xA1,
 		KEY_LCONTROL    = 0xA2,
-		KEY_RCONTROL    = 0xA3,
+		KEY_RCONTROL    = 0xA3
 	};
 
 	// ACHTUNG: Diese Codes werden in inputengine_script.cpp beim Skript-Service registriert. Bei Änderungen an diesem Enum muss auch diese
@@ -148,7 +148,7 @@ public:
 		KEY_COMMAND_BACKSPACE = 6,
 		KEY_COMMAND_TAB = 7,
 		KEY_COMMAND_INSERT = 8,
-		KEY_COMMAND_DELETE = 9,
+		KEY_COMMAND_DELETE = 9
 	};
 
 	/// --------------------------------------------------------------
diff --git a/engines/sword25/kernel/inputpersistenceblock.h b/engines/sword25/kernel/inputpersistenceblock.h
index ad2eb0cdc4..b21b0b4b50 100755
--- a/engines/sword25/kernel/inputpersistenceblock.h
+++ b/engines/sword25/kernel/inputpersistenceblock.h
@@ -42,7 +42,7 @@ public:
 	{
 		NONE,
 		END_OF_DATA,
-		OUT_OF_SYNC,
+		OUT_OF_SYNC
 	};
 
 	BS_InputPersistenceBlock(const void * Data, unsigned int DataLength);
diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h
index 6fb77133f6..0e488eb38b 100755
--- a/engines/sword25/kernel/kernel.h
+++ b/engines/sword25/kernel/kernel.h
@@ -328,11 +328,11 @@ private:
 class BS_ServiceInfo
 {
 public:
-	BS_ServiceInfo(const std::string& SuperclassIdentifier, const std::string& ServiceIdentifier, BS_Service* (*CreateMethod)(BS_Kernel*))
+	BS_ServiceInfo(const std::string& SuperclassIdentifier_, const std::string& ServiceIdentifier_, BS_Service* (*CreateMethod_)(BS_Kernel*))
 	{
-		this->SuperclassIdentifier = SuperclassIdentifier;
-		this->ServiceIdentifier = ServiceIdentifier;
-		this->CreateMethod = CreateMethod;
+		this->SuperclassIdentifier = SuperclassIdentifier_;
+		this->ServiceIdentifier = ServiceIdentifier_;
+		this->CreateMethod = CreateMethod_;
 	};
 	
 	std::string	SuperclassIdentifier;
diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp
index 151cb2786f..c7cfa68a3e 100755
--- a/engines/sword25/kernel/kernel_script.cpp
+++ b/engines/sword25/kernel/kernel_script.cpp
@@ -28,7 +28,7 @@
 #include "sword25/kernel/resmanager.h"
 #include "sword25/kernel/persistenceservice.h"
 #include "sword25/kernel/wincodegenerator.h"
-#include "sword25/debug/debugtools.h"
+#include "sword25/kernel/debug/debugtools.h"
 #include "sword25/script/script.h"
 #include "sword25/script/luabindhelper.h"
 
diff --git a/engines/sword25/kernel/log.cpp b/engines/sword25/kernel/log.cpp
index 02bc7a8475..f5b9ba7e7c 100755
--- a/engines/sword25/kernel/log.cpp
+++ b/engines/sword25/kernel/log.cpp
@@ -23,7 +23,7 @@
 
 #include "sword25/kernel/filesystemutil.h"
 #include "sword25/kernel/log.h"
-#include "sword25/debug/debugtools.h"
+#include "sword25/kernel/debug/debugtools.h"
 
 // Konstanten
 static const char*	BF_LOG_FILENAME = "log.txt";
diff --git a/engines/sword25/kernel/objectregistry.h b/engines/sword25/kernel/objectregistry.h
index 5e5bd6e305..f884b0679b 100755
--- a/engines/sword25/kernel/objectregistry.h
+++ b/engines/sword25/kernel/objectregistry.h
@@ -35,7 +35,8 @@ template<typename T>
 class BS_ObjectRegistry
 {
 public:
-	BS_ObjectRegistry() : m_NextHandle(1) {};
+	BS_ObjectRegistry() : m_NextHandle(1) {}
+	virtual ~BS_ObjectRegistry() {}
 
 	// -------------------------------------------------------------------------
 
diff --git a/engines/sword25/kernel/persistenceblock.h b/engines/sword25/kernel/persistenceblock.h
index 1a8547f49c..8a86e577c0 100755
--- a/engines/sword25/kernel/persistenceblock.h
+++ b/engines/sword25/kernel/persistenceblock.h
@@ -48,7 +48,7 @@ protected:
 		FLOAT_MARKER,
 		STRING_MARKER,
 		BOOL_MARKER,
-		BLOCK_MARKER,
+		BLOCK_MARKER
 	};
 
 	// -----------------------------------------------------------------------------
@@ -102,7 +102,7 @@ private:
 // Compile time asserts
 // -----------------------------------------------------------------------------
 
-#define CTASSERT(ex) typedef char ctassert_type[(ex) ? 1 : -1];
+#define CTASSERT(ex) typedef char ctassert_type[(ex) ? 1 : -1]
 CTASSERT(sizeof(unsigned char) == 1);
 CTASSERT(sizeof(signed int) == 4);
 CTASSERT(sizeof(unsigned int) == 4);
diff --git a/engines/sword25/kernel/persistenceservice.cpp b/engines/sword25/kernel/persistenceservice.cpp
index e241e7f28c..9773121740 100755
--- a/engines/sword25/kernel/persistenceservice.cpp
+++ b/engines/sword25/kernel/persistenceservice.cpp
@@ -31,8 +31,8 @@
 #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 "sword25/kernel/debug/debugtools.h"
+#include <zlib.h>
 
 #include "sword25/kernel/memlog_off.h"
 #include <sstream>
diff --git a/engines/sword25/kernel/resmanager.cpp b/engines/sword25/kernel/resmanager.cpp
index 99b28e19e5..f29f5268a7 100755
--- a/engines/sword25/kernel/resmanager.cpp
+++ b/engines/sword25/kernel/resmanager.cpp
@@ -290,4 +290,4 @@ void BS_ResourceManager::SetMaxMemoryUsage(unsigned int MaxMemoryUsage)
 {
 	m_MaxMemoryUsage = MaxMemoryUsage;
 	DeleteResourcesIfNecessary();
-}
\ No newline at end of file
+}
diff --git a/engines/sword25/kernel/resource.cpp b/engines/sword25/kernel/resource.cpp
index 83f2c94a26..9c7a7ec75f 100755
--- a/engines/sword25/kernel/resource.cpp
+++ b/engines/sword25/kernel/resource.cpp
@@ -32,7 +32,7 @@ BS_Resource::BS_Resource(const std::string& FileName, RESOURCE_TYPES Type) :
 
 	_FileName = static_cast<BS_PackageManager *>(BS_Kernel::GetInstance()->GetService("package"))->GetAbsolutePath(FileName);
 	_FileNameHash = BS_String::GetHash(FileName);
-};
+}
 
 void BS_Resource::Release()
 {
diff --git a/engines/sword25/kernel/resource.h b/engines/sword25/kernel/resource.h
index f4d85c733d..94088068e7 100755
--- a/engines/sword25/kernel/resource.h
+++ b/engines/sword25/kernel/resource.h
@@ -31,7 +31,7 @@ class BS_ResourceManager;
 
 class BS_Resource
 {
-friend BS_ResourceManager;
+friend class BS_ResourceManager;
 
 public:
 	enum RESOURCE_TYPES
diff --git a/engines/sword25/math/line.h b/engines/sword25/math/line.h
index 7307efd380..7da4a94db7 100755
--- a/engines/sword25/math/line.h
+++ b/engines/sword25/math/line.h
@@ -97,7 +97,7 @@ public:
 	{
 		LEFT,
 		RIGHT,
-		ON,
+		ON
 	};
 
 	/**
diff --git a/engines/sword25/math/polygon.h b/engines/sword25/math/polygon.h
index 2e294a328e..e1c9bf8cb5 100755
--- a/engines/sword25/math/polygon.h
+++ b/engines/sword25/math/polygon.h
@@ -249,4 +249,4 @@ private:
 	bool IsLineInCone(int StartVertexIndex, const BS_Vertex & EndVertex, bool IncludeEdges) const;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/sword25/math/rect.h b/engines/sword25/math/rect.h
index 0d9ebf7c3c..9c42676d06 100755
--- a/engines/sword25/math/rect.h
+++ b/engines/sword25/math/rect.h
@@ -57,12 +57,12 @@ public:
 		@param right das rechte Extrem des Rechteckes + 1
 		@param bottom des untere Extrem des Rechteckes + 1
 	*/
-	BS_Rect(int left, int top, int right, int bottom)
+	BS_Rect(int left_, int top_, int right_, int bottom_)
 	{
-		this->left = left;
-		this->top = top;
-		this->right = right;
-		this->bottom = bottom;
+		this->left = left_;
+		this->top = top_;
+		this->right = right_;
+		this->bottom = bottom_;
 	}
 	/**
 		@brief Verschiebt das Rechteck.
@@ -295,4 +295,4 @@ public:
 	}
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/sword25/math/region.h b/engines/sword25/math/region.h
index 4ce71a8561..701ac0d032 100755
--- a/engines/sword25/math/region.h
+++ b/engines/sword25/math/region.h
@@ -55,7 +55,7 @@ public:
 	enum REGION_TYPE
 	{
 		RT_REGION,
-		RT_WALKREGION,
+		RT_WALKREGION
 	};
 
 	static unsigned int Create(REGION_TYPE Type);
diff --git a/engines/sword25/math/vertex.h b/engines/sword25/math/vertex.h
index 71253add89..8bb88fe816 100755
--- a/engines/sword25/math/vertex.h
+++ b/engines/sword25/math/vertex.h
@@ -41,7 +41,7 @@ class BS_Vertex
 {
 public:
 	BS_Vertex() : X(0), Y(0) {};
-	BS_Vertex(int X, int Y) { this->X = X; this->Y = Y; }
+	BS_Vertex(int X_, int Y_) { this->X = X_; this->Y = Y_; }
 
 	int X;
 	int Y;
diff --git a/engines/sword25/math/walkregion.cpp b/engines/sword25/math/walkregion.cpp
index ebf4a3e541..e75383191a 100755
--- a/engines/sword25/math/walkregion.cpp
+++ b/engines/sword25/math/walkregion.cpp
@@ -30,7 +30,7 @@
 // Konstanten
 // -----------------------------------------------------------------------------
 
-static const int INFINITY = INT_MAX;
+static const int infinity = INT_MAX;
 
 // -----------------------------------------------------------------------------
 // Konstruktion / Destruktion
@@ -103,7 +103,7 @@ struct DijkstraNode
 	typedef Container::iterator Iter;
 	typedef Container::const_iterator ConstIter;
 
-	DijkstraNode() : Cost(INFINITY), Chosen(false) {};
+	DijkstraNode() : Cost(infinity), Chosen(false) {};
 	ConstIter	ParentIter;
 	int			Cost;
 	bool		Chosen;
@@ -127,7 +127,7 @@ static void InitDijkstraNodes(DijkstraNode::Container & DijkstraNodes, const BS_
 static DijkstraNode::Iter ChooseClosestNode(DijkstraNode::Container & Nodes)
 {
 	DijkstraNode::Iter ClosestNodeInter = Nodes.end();
-	int MinCost = INFINITY;
+	int MinCost = infinity;
 
 	for (DijkstraNode::Iter iter = Nodes.begin(); iter != Nodes.end(); iter++)
 	{
@@ -152,7 +152,7 @@ static void RelaxNodes(DijkstraNode::Container & Nodes,
 	for (unsigned int i = 0; i < Nodes.size(); i++)
 	{
 		int Cost = VisibilityMatrix[CurNodeIndex][i];
-		if (!Nodes[i].Chosen && Cost != INFINITY)
+		if (!Nodes[i].Chosen && Cost != infinity)
 		{
 			int TotalCost = (*CurNodeIter).Cost + Cost;
 			if (TotalCost < Nodes[i].Cost)
@@ -268,7 +268,7 @@ void BS_WalkRegion::InitNodeVector()
 void BS_WalkRegion::ComputeVisibilityMatrix()
 {
 	// Sichtbarkeitsmatrix initialisieren
-	m_VisibilityMatrix = std::vector< std::vector <int> >(m_Nodes.size(), std::vector<int>(m_Nodes.size(), INFINITY));
+	m_VisibilityMatrix = std::vector< std::vector <int> >(m_Nodes.size(), std::vector<int>(m_Nodes.size(), infinity));
 
 	// Sichtbarkeiten zwischen Vertecies berechnen und in die Sichbarkeitsmatrix eintragen.
 	for (unsigned int j = 0; j < m_Nodes.size(); ++j)
@@ -285,8 +285,8 @@ void BS_WalkRegion::ComputeVisibilityMatrix()
 			else
 			{
 				// Wenn keine Sichtlinie besteht wird die Entfernung "unendlich" eingetragen
-				m_VisibilityMatrix[i][j] = INFINITY;
-				m_VisibilityMatrix[j][i] = INFINITY;
+				m_VisibilityMatrix[i][j] = infinity;
+				m_VisibilityMatrix[j][i] = infinity;
 			}
 		}
 	}
diff --git a/engines/sword25/math/walkregion.h b/engines/sword25/math/walkregion.h
index b07f2dbae8..25ded2ff4b 100755
--- a/engines/sword25/math/walkregion.h
+++ b/engines/sword25/math/walkregion.h
@@ -42,7 +42,7 @@ typedef std::vector<BS_Vertex> BS_Path;
 */
 class BS_WalkRegion : public BS_Region
 {
-	friend BS_Region;
+	friend class BS_Region;
 
 protected:
 	BS_WalkRegion();
diff --git a/engines/sword25/module.mk b/engines/sword25/module.mk
index 44686a824b..30c5966803 100644
--- a/engines/sword25/module.mk
+++ b/engines/sword25/module.mk
@@ -122,9 +122,7 @@ MODULE_OBJS := \
 	util/lua/src/print.o \
 	util/pluto/pdep.o \
 	util/pluto/pluto.o \
-	util/pluto/plzio.o \
-	util/pluto/pptest.o \
-	util/pluto/puptest.o
+	util/pluto/plzio.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_SWORD25), DYNAMIC_PLUGIN)
diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp
index a58265f7bd..3b2da7259b 100755
--- a/engines/sword25/script/luascript.cpp
+++ b/engines/sword25/script/luascript.cpp
@@ -328,7 +328,7 @@ namespace
 	enum PERMANENT_TABLE_TYPE
 	{
 		PTT_PERSIST,
-		PTT_UNPERSIST,
+		PTT_UNPERSIST
 	};
 
 	// -------------------------------------------------------------------------
diff --git a/engines/sword25/util/glsprites/glsprites.h b/engines/sword25/util/glsprites/glsprites.h
index 28b00a7fe6..bd678b7d76 100755
--- a/engines/sword25/util/glsprites/glsprites.h
+++ b/engines/sword25/util/glsprites/glsprites.h
@@ -50,7 +50,7 @@ typedef enum
 	GLS_OPENGL_ERROR,
 	GLS_INVALID_DATA_DIMENSIONS,
 	GLS_INVALID_DATA_POINTER,
-	GLS_INVALID_SUB_IMAGE,
+	GLS_INVALID_SUB_IMAGE
 } GLS_Result;
 
 /* GLS_Rect */
diff --git a/engines/sword25/util/pluto/pdep/lua.h b/engines/sword25/util/pluto/pdep/lua.h
index 5bc97b746f..0f3f28fce5 100755
--- a/engines/sword25/util/pluto/pdep/lua.h
+++ b/engines/sword25/util/pluto/pdep/lua.h
@@ -13,7 +13,7 @@
 #include <stddef.h>
 
 
-#include "luaconf.h"
+#include "sword25/util/lua/luaconf.h"
 
 
 #define LUA_VERSION	"Lua 5.1"
diff --git a/engines/sword25/util/pluto/pluto.c b/engines/sword25/util/pluto/pluto.c
index 8abf3293b2..61eb40e984 100755
--- a/engines/sword25/util/pluto/pluto.c
+++ b/engines/sword25/util/pluto/pluto.c
@@ -16,7 +16,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "lua.h"
+#include "sword25/util/lua/lua.h"
 #include "pluto.h"
 
 #define USE_PDEP