SWORD25: Compilation fixes

Majority of files now compile under Windoze.

svn-id: r53182

10 files changed, 16 insertions, 15 deletions

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