1
0
forked from 0ad/0ad

fix some minor warnings

This was SVN commit r834.
This commit is contained in:
janwas 2004-07-28 15:07:54 +00:00
parent 2dce89b1f9
commit 00420a8815
4 changed files with 10 additions and 10 deletions

View File

@ -401,7 +401,7 @@ void CSelectedEntities::contextOrder( bool pushQueue )
// the number of units in the group.
float radius = 2.0f * sqrt( (float)m_selected.size() ); // A decent enough approximation
float _t, _x, _y;
float _x, _y;
for( it = m_selected.begin(); it < m_selected.end(); it++ )
if( (*it)->acceptsOrder( m_contextOrder, g_Mouseover.m_target ) )

View File

@ -44,9 +44,9 @@ void CSimulation::Interpolate(double frameTime, double offset)
{
const std::vector<CUnit*>& units=m_pWorld->GetUnitManager()->GetUnits();
for (uint i=0;i<units.size();++i)
units[i]->GetModel()->Update(frameTime);
units[i]->GetModel()->Update((float)frameTime);
g_EntityManager.interpolateAll(offset);
g_EntityManager.interpolateAll((float)offset);
}
void CSimulation::Simulate()

View File

@ -65,7 +65,7 @@ int VorbisSeek(void *datasource, ogg_int64_t offset, int fromWhere)
actualOffset = (offset);
else
actualOffset = spaceToEOF;
vorbisData->dataRead += actualOffset;
vorbisData->dataRead += (size_t)actualOffset;
break;
case SEEK_END:
vorbisData->dataRead = vorbisData->dataSize+1;
@ -88,7 +88,7 @@ long VorbisTell(void *datasource)
SOggFile* vorbisData;
vorbisData = (SOggFile*)datasource;
return vorbisData->dataRead;
return (long)vorbisData->dataRead;
}
@ -290,13 +290,13 @@ bool CMusicPlayer::update()
void CMusicPlayer::check()
{
int error = alGetError();
/*
if(error != AL_NO_ERROR)
{
std::cout << "OpenAL error " << error << std::endl;
std::cout << "OpenAL error " << error << errorString(error) << std::endl;
exit(1);
}
*/
}
void CMusicPlayer::empty()

View File

@ -16,8 +16,8 @@
struct SOggFile
{
char *dataPtr;
int dataSize;
int dataRead;
size_t dataSize;
size_t dataRead;
};
class CMusicPlayer