Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Windows build fixes.

Browse Source 
Remove unused function.

This was SVN commit r7557.
This commit is contained in:
Ykkrosh 2010-05-20 20:05:38 +00:00
parent 80229cdea7
commit cf85004f61
4 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/renderer/PatchRData.cpp
View File

@ -31,7 +31,6 @@
#include "ps/Game.h" #include "ps/Game.h"
#include "ps/World.h" #include "ps/World.h"
#include "maths/MathUtil.h" #include "maths/MathUtil.h"
#include "simulation/LOSManager.h"
#include "graphics/Patch.h" #include "graphics/Patch.h"
#include "graphics/Terrain.h" #include "graphics/Terrain.h"
#include "simulation2/Simulation2.h" #include "simulation2/Simulation2.h"
@ -435,7 +434,8 @@ void CPatchRData::Update()
ssize_t vsize=PATCH_SIZE+1; ssize_t vsize=PATCH_SIZE+1;
SColor4ub baseColour = terrain->GetBaseColour(); 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(); CLOSManager* losMgr = g_Game->GetWorld()->GetLOSManager();
@ -470,6 +470,7 @@ void CPatchRData::Update()
} }
} }
else else
*/
{ {
for (ssize_t j = 0; j < vsize; ++j) for (ssize_t j = 0; j < vsize; ++j)
{ {

5
source/renderer/TerrainRenderer.cpp
View File

@ -36,7 +36,6 @@
#include "ps/Pyrogenesis.h" // MICROLOG #include "ps/Pyrogenesis.h" // MICROLOG
#include "ps/World.h" #include "ps/World.h"
#include "simulation/LOSManager.h"
#include "simulation2/Simulation2.h" #include "simulation2/Simulation2.h"
#include "renderer/PatchRData.h" #include "renderer/PatchRData.h"
@ -444,7 +443,7 @@ void TerrainRenderer::RenderWater()
CTerrain* terrain = g_Game->GetWorld()->GetTerrain(); CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
int mapSize = terrain->GetVerticesPerSide(); int mapSize = terrain->GetVerticesPerSide();
CLOSManager* losMgr = g_Game->GetWorld()->GetLOSManager(); // CLOSManager* losMgr = g_Game->GetWorld()->GetLOSManager();
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
@ -603,6 +602,7 @@ void TerrainRenderer::RenderWater()
-100.0f, WaterMgr->m_WaterMaxAlpha); -100.0f, WaterMgr->m_WaterMaxAlpha);
float losMod = 1.0f; float losMod = 1.0f;
/*
if (false) // XXX: need to implement this for new sim system if (false) // XXX: need to implement this for new sim system
{ {
for(size_t k=0; k<4; k++) for(size_t k=0; k<4; k++)
@ -620,6 +620,7 @@ void TerrainRenderer::RenderWater()
} }
} }
} }
*/
if(fancy) if(fancy)
{ {

5
source/simulation2/Simulation2.cpp
View File

@ -36,6 +36,11 @@
#include <iomanip> #include <iomanip>
#if MSC_VERSION
#include <process.h>
#define getpid _getpid // use the non-deprecated function name
#endif
class CSimulation2Impl class CSimulation2Impl
{ {
public: public:

20
source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
View File

@ -328,26 +328,6 @@ static CVector3D GetUnitPos(const Position& pos, bool floating)
return vec; 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) MESSAGEHANDLER(ObjectPreview)
{ {
// If the selection has changed... // If the selection has changed...