mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-27 14:33:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fix w4 warnings

Browse Source 
- add convenience macros for config_db(CFG_GET_SYS_VAL)
- VFSUtil::EnumDirEnts now uses flags instead of bool recursive
- UNUSED() for params, UNUSED2 (<- need better name) for variables
- config.h defines must be tested with #if (always defined) -> allows
detecting misspellings thanks to compiler warnings
- replace debug_assert(0) with debug_warn (its sole purpose)
- replace ScriptingHost::ValueToInt et al with ToPrimitive
- use nommgr.h to disable both mmgr and VC debug heap

This was SVN commit r2585.
This commit is contained in:
janwas
2005-08-09 15:55:44 +00:00
parent 630b375f4d
commit a69ac0dee9
115 changed files with 654 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/EntityStateProcessing.cpp
+8 -5
View File
@@ -271,7 +271,7 @@ bool CEntity::processGotoNoPathing( CEntityOrder* current, size_t timestep_milli
}
// Handles processing common to (at the moment) gather and melee attack actions
bool CEntity::processContactAction( CEntityOrder* current, size_t timestep_millis, int transition, SEntityAction* action )
bool CEntity::processContactAction( CEntityOrder* current, size_t UNUSED(timestep_millis), int transition, SEntityAction* action )
{
m_orderQueue.pop_front();
@@ -505,9 +505,11 @@ bool CEntity::processGatherNoPathing( CEntityOrder* current, size_t timestep_mil
return( processContactActionNoPathing( current, timestep_millis, "gather", &evt, &m_gather ) );
}
bool CEntity::processGoto( CEntityOrder* current, size_t timestep_millis )
bool CEntity::processGoto( CEntityOrder* current, size_t UNUSED(timestep_millis) )
{
float timestep=timestep_millis/1000.0f;
// float timestep=timestep_millis/1000.0f;
// janwas: currently unused
CVector2D pos( m_position.X, m_position.Z );
CVector2D path_to = current->m_data[0].location;
@@ -533,9 +535,10 @@ bool CEntity::processGoto( CEntityOrder* current, size_t timestep_millis )
return( true );
}
bool CEntity::processPatrol( CEntityOrder* current, size_t timestep_millis )
bool CEntity::processPatrol( CEntityOrder* current, size_t UNUSED(timestep_millis) )
{
float timestep=timestep_millis/1000.0f;
// float timestep=timestep_millis/1000.0f;
// janwas: currently unused
CEntityOrder this_segment;
CEntityOrder repeat_patrol;