From cf85004f614f660556aad2b62c816c6334dce974 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Thu, 20 May 2010 20:05:38 +0000
Subject: [PATCH] Windows build fixes.

Remove unused function.

This was SVN commit r7557.
---
 source/renderer/PatchRData.cpp                |  5 +++--
 source/renderer/TerrainRenderer.cpp           |  5 +++--
 source/simulation2/Simulation2.cpp            |  5 +++++
 .../GameInterface/Handlers/ObjectHandlers.cpp | 20 -------------------
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/source/renderer/PatchRData.cpp b/source/renderer/PatchRData.cpp
index f5948f82a3..0246362b63 100644
--- a/source/renderer/PatchRData.cpp
+++ b/source/renderer/PatchRData.cpp
@@ -31,7 +31,6 @@
 #include "ps/Game.h"
 #include "ps/World.h"
 #include "maths/MathUtil.h"
-#include "simulation/LOSManager.h"
 #include "graphics/Patch.h"
 #include "graphics/Terrain.h"
 #include "simulation2/Simulation2.h"
@@ -435,7 +434,8 @@ void CPatchRData::Update()
 	ssize_t vsize=PATCH_SIZE+1;
 	SColor4ub baseColour = terrain->GetBaseColour();
 
-	if (g_Game && false) // XXX: need to implement this for new sim system
+	/*
+	if (g_Game) // XXX: need to implement this for new sim system
 	{
 		CLOSManager* losMgr = g_Game->GetWorld()->GetLOSManager();
 
@@ -470,6 +470,7 @@ void CPatchRData::Update()
 		}
 	}
 	else
+	*/
 	{
 		for (ssize_t j = 0; j < vsize; ++j)
 		{
diff --git a/source/renderer/TerrainRenderer.cpp b/source/renderer/TerrainRenderer.cpp
index c998127580..55903cad51 100644
--- a/source/renderer/TerrainRenderer.cpp
+++ b/source/renderer/TerrainRenderer.cpp
@@ -36,7 +36,6 @@
 #include "ps/Pyrogenesis.h"	// MICROLOG
 #include "ps/World.h"
 
-#include "simulation/LOSManager.h"
 #include "simulation2/Simulation2.h"
 
 #include "renderer/PatchRData.h"
@@ -444,7 +443,7 @@ void TerrainRenderer::RenderWater()
 
 	CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
 	int mapSize = terrain->GetVerticesPerSide();
-	CLOSManager* losMgr = g_Game->GetWorld()->GetLOSManager();
+//	CLOSManager* losMgr = g_Game->GetWorld()->GetLOSManager();
 	
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
@@ -603,6 +602,7 @@ void TerrainRenderer::RenderWater()
 						-100.0f, WaterMgr->m_WaterMaxAlpha);
 
 					float losMod = 1.0f;
+					/*
 					if (false) // XXX: need to implement this for new sim system
 					{
 						for(size_t k=0; k<4; k++)
@@ -620,6 +620,7 @@ void TerrainRenderer::RenderWater()
 							}
 						}
 					}
+					*/
 
 					if(fancy)
 					{
diff --git a/source/simulation2/Simulation2.cpp b/source/simulation2/Simulation2.cpp
index 87f558fc37..01f21df21e 100644
--- a/source/simulation2/Simulation2.cpp
+++ b/source/simulation2/Simulation2.cpp
@@ -36,6 +36,11 @@
 
 #include <iomanip>
 
+#if MSC_VERSION
+#include <process.h>
+#define getpid _getpid // use the non-deprecated function name
+#endif
+
 class CSimulation2Impl
 {
 public:
diff --git a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
index 3b41074491..685e866936 100644
--- a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
@@ -328,26 +328,6 @@ static CVector3D GetUnitPos(const Position& pos, bool floating)
 	return vec;
 }
 
-static bool ParseObjectName(const CStrW& obj, bool& isEntity, CStrW& name)
-{
-	if (obj.substr(0, 4) == L"(e) ")
-	{
-		isEntity = true;
-		name = obj.substr(4);
-		return true;
-	}
-	else if (obj.substr(0, 4) == L"(n) ")
-	{
-		isEntity = false;
-		name = obj.substr(4);
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
 MESSAGEHANDLER(ObjectPreview)
 {
 	// If the selection has changed...