From 03543147b7914beacec198b8cd20177673676712 Mon Sep 17 00:00:00 2001
From: janwas <jan@wildfiregames.com>
Date: Thu, 20 Dec 2007 19:57:41 +0000
Subject: [PATCH] part1a: misc fixes

TerrainOverlay: fix warnings
PathfindEngine.cpp: correct float type, mark as noncopyable
TriggerManager: explicitly construct as CStrW

This was SVN commit r5516.
---
 source/renderer/TerrainOverlay.cpp   | 2 +-
 source/renderer/TerrainOverlay.h     | 2 +-
 source/simulation/PathfindEngine.cpp | 8 ++++----
 source/simulation/PathfindEngine.h   | 2 +-
 source/simulation/TriggerManager.cpp | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/renderer/TerrainOverlay.cpp b/source/renderer/TerrainOverlay.cpp
index 5dd7a11002..6bb987c7c3 100644
--- a/source/renderer/TerrainOverlay.cpp
+++ b/source/renderer/TerrainOverlay.cpp
@@ -95,7 +95,7 @@ void TerrainOverlay::RenderEntityEdges()
 
 	
 	
-	for(int i =0 ; i < results.size(); i++)
+	for(size_t i =0 ; i < results.size(); i++)
 	{
 		glBegin(GL_LINE_LOOP);
 
diff --git a/source/renderer/TerrainOverlay.h b/source/renderer/TerrainOverlay.h
index 8af15db695..272aee9b56 100644
--- a/source/renderer/TerrainOverlay.h
+++ b/source/renderer/TerrainOverlay.h
@@ -287,7 +287,7 @@ public:
 		max_j_inclusive = 2;
 	}
 
-	virtual void ProcessTile(int i, int j)
+	virtual void ProcessTile(int UNUSED(i), int UNUSED(j))
 	{
 		
 		RenderConstrainedEdges();
diff --git a/source/simulation/PathfindEngine.cpp b/source/simulation/PathfindEngine.cpp
index 6ebd5fb4d9..229b64e04e 100644
--- a/source/simulation/PathfindEngine.cpp
+++ b/source/simulation/PathfindEngine.cpp
@@ -20,9 +20,9 @@
 
 
 CPathfindEngine::CPathfindEngine() : triangulationOverlay(0),
-									OABBBOUNDREDUCTION(0.8),
-									CIRCLEBOUNDREDUCTION(0.5),
-									RADIUSINCREMENT(2.0)
+									OABBBOUNDREDUCTION(0.8f),
+									CIRCLEBOUNDREDUCTION(0.5f),
+									RADIUSINCREMENT(2.0f)
 {
 	dcdtInitialized = false;
 	
@@ -68,7 +68,7 @@ void  CPathfindEngine::insertObstacles()
 	SrPolygon poly;
 	
 	
-	for(int i =0 ; i < results.size(); i++)
+	for(size_t i =0 ; i < results.size(); i++)
 	{
 		poly.size(0);
 
diff --git a/source/simulation/PathfindEngine.h b/source/simulation/PathfindEngine.h
index 5b3a72e092..3dfd21688c 100644
--- a/source/simulation/PathfindEngine.h
+++ b/source/simulation/PathfindEngine.h
@@ -29,7 +29,7 @@ enum EPathType
 };
 
 
-class CPathfindEngine : public Singleton<CPathfindEngine>
+class CPathfindEngine : public Singleton<CPathfindEngine>, boost::noncopyable
 {
 public:
 
diff --git a/source/simulation/TriggerManager.cpp b/source/simulation/TriggerManager.cpp
index acd96678a8..3ded635ea5 100644
--- a/source/simulation/TriggerManager.cpp
+++ b/source/simulation/TriggerManager.cpp
@@ -115,8 +115,8 @@ void CTrigger::Deactivate(JSContext* UNUSED(cx), uint UNUSED(argc), jsval* UNUSE
 
 void TriggerParameter::SetWindowData(const CStrW& _windowType, CStrW& windowPosition, CStrW& windowSize)
 {
-	windowPosition.Remove( CStr(L" ") );
-	windowSize.Remove( CStr(L" ") );
+	windowPosition.Remove( CStrW(L" ") );
+	windowSize.Remove( CStrW(L" ") );
 
 	xPos = windowPosition.BeforeFirst( CStrW(L",") ).ToInt();
 	yPos = windowPosition.AfterFirst( CStrW(L",") ).ToInt();