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

Warning fixes

Browse Source 
This was SVN commit r7821.
This commit is contained in:
Ykkrosh 2010-07-29 21:04:07 +00:00
parent f625285386
commit 3124b55cc0
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/graphics/TerrainProperties.cpp
View File

@ -90,7 +90,7 @@ CTerrainPropertiesPtr CTerrainProperties::FromXML(const CTerrainPropertiesPtr& p
return CTerrainPropertiesPtr();
}
void CTerrainProperties::LoadXml(XMBElement node, CXeromyces *pFile, const VfsPath& pathname)
void CTerrainProperties::LoadXml(XMBElement node, CXeromyces *pFile, const VfsPath& UNUSED(pathname))
{
#define ELMT(x) int elmt_##x = pFile->GetElementID(#x)
#define ATTR(x) int attr_##x = pFile->GetAttributeID(#x)

2
source/graphics/UnitManager.cpp
View File

@ -89,7 +89,7 @@ void CUnitManager::DeleteAll()
///////////////////////////////////////////////////////////////////////////////
// PickUnit: iterate through units testing given ray against bounds of each
// unit; return the closest unit, or null if everything missed
CUnit* CUnitManager::PickUnit(const CVector3D& origin, const CVector3D& dir, bool entitiesOnly) const
CUnit* CUnitManager::PickUnit(const CVector3D& origin, const CVector3D& dir) const
{
// closest object found so far
CUnit* hit = 0;

2
source/graphics/UnitManager.h
View File

@ -57,7 +57,7 @@ public:
// iterate through units testing given ray against bounds of each unit;
// return the closest unit, or null if everything missed
CUnit* PickUnit(const CVector3D& origin, const CVector3D& dir, bool entitiesOnly) const;
CUnit* PickUnit(const CVector3D& origin, const CVector3D& dir) const;
void SetObjectManager(CObjectManager& objectManager) { m_ObjectManager = &objectManager; }

2
source/lib/ogl.cpp
View File

@ -243,7 +243,7 @@ const char* ogl_HaveExtensions(int dummy, ...)
// to help when running with no hardware acceleration and only OpenGL 1.1
// (e.g. testing the game in virtual machines), we define dummy versions of
// some extension functions which our graphics code assume exist.
// some extension functions which our graphics code assumes exist.
// it will render incorrectly but at least it shouldn't crash.
static void GL_CALL_CONV dummy_glDrawRangeElementsEXT(GLenum mode, GLuint, GLuint, GLsizei count, GLenum type, GLvoid* indices)

5
source/simulation2/components/CCmpRangeManager.cpp
View File

@ -93,6 +93,9 @@ struct EntityDistanceOrdering
const CSimContext& context;
CFixedVector2D source;
private:
EntityDistanceOrdering& operator=(const EntityDistanceOrdering&);
};
/**
@ -476,7 +479,7 @@ private:
CColor enabledRingColour(0, 1, 0, 1);
CColor disabledRingColour(1, 0, 0, 1);
CColor rayColour(1, 1, 0, 0.2);
CColor rayColour(1, 1, 0, 0.2f);
if (m_DebugOverlayDirty)
{

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

@ -403,7 +403,7 @@ QUERYHANDLER(PickObject)
CVector3D rayorigin, raydir;
g_Game->GetView()->GetCamera()->BuildCameraRay((int)x, (int)y, rayorigin, raydir);
CUnit* target = GetUnitManager().PickUnit(rayorigin, raydir, false);
CUnit* target = GetUnitManager().PickUnit(rayorigin, raydir);
if (target)
msg->id = target->GetID();