dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unbroke more; plus some minor changes.

Browse source 
This was SVN commit r2398.
This commit is contained in:
Ykkrosh 2005-06-17 01:28:35 +00:00
parent a3b599fb1e
commit 471fd5d6f3
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/lib/ogl.cpp
View file

@ -239,6 +239,8 @@ static void importExtensionFunctions()
//----------------------------------------------------------------------------
#ifndef oglCheck
// don't include this function if it has been defined (in ogl.h) as a no-op
void oglCheck()
{
GLenum err = glGetError();
@ -261,6 +263,7 @@ void oglCheck()
debug_break();
}
}
#endif
//----------------------------------------------------------------------------

2
source/ps/Errors.cpp
View file

@ -190,7 +190,7 @@ PSRETURN PSERROR_System_VmodeFailed::getCode() const { return 0x08000003; }
PSRETURN PSERROR_Xeromyces_XMLOpenFailed::getCode() const { return 0x09000001; }
PSRETURN PSERROR_Xeromyces_XMLParseError::getCode() const { return 0x09000002; }
const char* PSERROR::what() const
const char* PSERROR::what() const throw ()
{
return GetErrorString(getCode());
}

4
source/simulation/EntityStateProcessing.cpp
View file

@ -451,7 +451,7 @@ bool CEntity::processContactActionNoPathing( CEntityOrder* current, size_t times
// should happen. So...
m_fsm_anipos = (size_t)( action->m_Speed * ( 1.0f - 2 * m_fsm_animation->m_ActionPos ) );
// But...
if( m_fsm_anipos < 0 )
if( m_fsm_anipos < 0 ) // (FIXME: m_fsm_anipos is unsigned, so this will never be true...)
{
// We ought to have started it in the past. Oh well.
// Here's what we'll do: play it now, and advance it to
@ -471,7 +471,7 @@ bool CEntity::processContactActionNoPathing( CEntityOrder* current, size_t times
// Load time needs to be animation->m_ActionPos2 ms after the start of the animation.
m_fsm_anipos2 = m_fsm_anipos + (size_t)( action->m_Speed * m_fsm_animation->m_ActionPos2 * 2 );
if( m_fsm_anipos2 < 0 )
if( m_fsm_anipos2 < 0 ) // (FIXME: m_fsm_anipos2 is unsigned, so this will never be true...)
{
// Load now.
m_actor->ShowAmmunition();