SWORD25: Fix compilation and several warnings

svn-id: r53215

4 files changed, 25 insertions, 25 deletions

diff --git a/engines/sword25/gfx/renderobjectregistry.h b/engines/sword25/gfx/renderobjectregistry.h
index 48a230df7e..bf377e5b30 100644
--- a/engines/sword25/gfx/renderobjectregistry.h
+++ b/engines/sword25/gfx/renderobjectregistry.h
@@ -54,8 +54,6 @@ namespace Sword25 {
 
 class BS_RenderObject;
 
-namespace Sword25 {
-
 // -----------------------------------------------------------------------------
 // Klassendeklaration
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/kernel/objectregistry.h b/engines/sword25/kernel/objectregistry.h
index 5f708ece21..52ff1d556c 100644
--- a/engines/sword25/kernel/objectregistry.h
+++ b/engines/sword25/kernel/objectregistry.h
@@ -169,7 +169,7 @@ protected:
 
 	T *FindPtrByHandle(unsigned int Handle) {
 		// Zum Handle gehörigen Pointer finden.
-		HANDLE2PTR_MAP::const_iterator it = m_Handle2PtrMap.find(Handle);
+		typename HANDLE2PTR_MAP::const_iterator it = m_Handle2PtrMap.find(Handle);
 
 		// Pointer zurückgeben, oder, falls keiner gefunden wurde, 0 zurückgeben.
 		return (it != m_Handle2PtrMap.end()) ? it->_value : 0;
@@ -179,7 +179,7 @@ protected:
 
 	unsigned int FindHandleByPtr(T *ObjectPtr) {
 		// Zum Pointer gehöriges Handle finden.
-		PTR2HANDLE_MAP::const_iterator it = m_Ptr2HandleMap.find(ObjectPtr);
+		typename PTR2HANDLE_MAP::const_iterator it = m_Ptr2HandleMap.find(ObjectPtr);
 
 		// Handle zurückgeben, oder, falls keines gefunden wurde, 0 zurückgeben.
 		return (it != m_Ptr2HandleMap.end()) ? it->_value : 0;
diff --git a/engines/sword25/math/geometry_script.cpp b/engines/sword25/math/geometry_script.cpp
index f01f977f4a..aaf4c4d604 100644
--- a/engines/sword25/math/geometry_script.cpp
+++ b/engines/sword25/math/geometry_script.cpp
@@ -301,9 +301,9 @@ static int NewWalkRegion(lua_State *L) {
 static const char *GEO_LIBRARY_NAME = "Geo";
 
 static const luaL_reg GEO_FUNCTIONS[] = {
-	"NewRegion", NewRegion,
-	"NewWalkRegion", NewWalkRegion,
-	0, 0,
+	{"NewRegion", NewRegion},
+	{"NewWalkRegion", NewWalkRegion},
+	{0, 0}
 };
 
 // -----------------------------------------------------------------------------
@@ -477,17 +477,17 @@ static int R_Delete(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static const luaL_reg REGION_METHODS[] = {
-	"SetPos", R_SetPos,
-	"SetX", R_SetX,
-	"SetY", R_SetY,
-	"GetPos", R_GetPos,
-	"IsPointInRegion", R_IsPointInRegion,
-	"GetX", R_GetX,
-	"GetY", R_GetY,
-	"IsValid", R_IsValid,
-	"Draw", R_Draw,
-	"GetCentroid", R_GetCentroid,
-	0, 0,
+	{"SetPos", R_SetPos},
+	{"SetX", R_SetX},
+	{"SetY", R_SetY},
+	{"GetPos", R_GetPos},
+	{"IsPointInRegion", R_IsPointInRegion},
+	{"GetX", R_GetX},
+	{"GetY", R_GetY},
+	{"IsValid", R_IsValid},
+	{"Draw", R_Draw},
+	{"GetCentroid", R_GetCentroid},
+	{0, 0}
 };
 
 // -----------------------------------------------------------------------------
@@ -533,8 +533,8 @@ static int WR_GetPath(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static const luaL_reg WALKREGION_METHODS[] = {
-	"GetPath", WR_GetPath,
-	0, 0,
+	{"GetPath", WR_GetPath},
+	{0, 0}
 };
 
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/math/rect.h b/engines/sword25/math/rect.h
index 849839aeec..c2a42e85c4 100644
--- a/engines/sword25/math/rect.h
+++ b/engines/sword25/math/rect.h
@@ -56,15 +56,17 @@ public:
 
 	void Move(int DeltaX, int DeltaY) { translate(DeltaX, DeltaY); }
 
-	bool DoesIntersect(const BS_Rect &Rect) const { return intersects(Rect); }
+	bool DoesIntersect(const BS_Rect &Rect_) const { return intersects(Rect_); }
 
-	bool Intersect(const BS_Rect &Rect, BS_Rect &Result) const {
-		Result = Rect;
+	bool Intersect(const BS_Rect &Rect_, BS_Rect &Result) const {
+		Result = Rect_;
 		Result.clip(*this);
+
+		return Result.isEmpty();
 	}
 
-	void Join(const BS_Rect &Rect, BS_Rect &Result) const {
-		Result = Rect;
+	void Join(const BS_Rect &Rect_, BS_Rect &Result) const {
+		Result = Rect_;
 		Result.extend(*this);
 	}