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

part1a: misc fixes

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

This was SVN commit r5516.
This commit is contained in:
janwas 2007-12-20 19:57:41 +00:00
parent 541de496e3
commit 03543147b7
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/renderer/TerrainOverlay.cpp
View File

@ -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);

2
source/renderer/TerrainOverlay.h
View File

@ -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();

8
source/simulation/PathfindEngine.cpp
View File

@ -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);

2
source/simulation/PathfindEngine.h
View File

@ -29,7 +29,7 @@ enum EPathType
};
class CPathfindEngine : public Singleton<CPathfindEngine>
class CPathfindEngine : public Singleton<CPathfindEngine>, boost::noncopyable
{
public:

4
source/simulation/TriggerManager.cpp
View File

@ -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();