Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 12:36:05 +08:00
Code Activity

Modified SDK for GCC 4.2

Browse Source
This commit is contained in:
Scott Ehlert
2008-09-15 02:50:57 -05:00
parent 86f3bc8a60
commit 7ff7f366d5
696 changed files with 23423 additions and 22634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
game/server/particle_system.cpp
View File

@ -102,6 +102,7 @@ BEGIN_DATADESC( CParticleSystem )
DEFINE_KEYFIELD( m_iszControlPointNames[61], FIELD_STRING, "cpoint62" ),
DEFINE_KEYFIELD( m_iszControlPointNames[62], FIELD_STRING, "cpoint63" ),
/* This causes a cannot apply <20>offsetof<6F> when <20>operator[]<5D> is overloaded error in GCC 4.2
DEFINE_KEYFIELD( m_iControlPointParents[0], FIELD_CHARACTER, "cpoint1_parent" ),
DEFINE_KEYFIELD( m_iControlPointParents[1], FIELD_CHARACTER, "cpoint2_parent" ),
DEFINE_KEYFIELD( m_iControlPointParents[2], FIELD_CHARACTER, "cpoint3_parent" ),
@ -109,6 +110,15 @@ BEGIN_DATADESC( CParticleSystem )
DEFINE_KEYFIELD( m_iControlPointParents[4], FIELD_CHARACTER, "cpoint5_parent" ),
DEFINE_KEYFIELD( m_iControlPointParents[5], FIELD_CHARACTER, "cpoint6_parent" ),
DEFINE_KEYFIELD( m_iControlPointParents[6], FIELD_CHARACTER, "cpoint7_parent" ),
*/
DEFINE_KEYFIELD_NETARRAY( m_iControlPointParents, 0, FIELD_CHARACTER, "cpoint1_parent" ),
DEFINE_KEYFIELD_NETARRAY( m_iControlPointParents, 1, FIELD_CHARACTER, "cpoint2_parent" ),
DEFINE_KEYFIELD_NETARRAY( m_iControlPointParents, 2, FIELD_CHARACTER, "cpoint3_parent" ),
DEFINE_KEYFIELD_NETARRAY( m_iControlPointParents, 3, FIELD_CHARACTER, "cpoint4_parent" ),
DEFINE_KEYFIELD_NETARRAY( m_iControlPointParents, 4, FIELD_CHARACTER, "cpoint5_parent" ),
DEFINE_KEYFIELD_NETARRAY( m_iControlPointParents, 5, FIELD_CHARACTER, "cpoint6_parent" ),
DEFINE_KEYFIELD_NETARRAY( m_iControlPointParents, 6, FIELD_CHARACTER, "cpoint7_parent" ),
DEFINE_AUTO_ARRAY( m_hControlPointEnts, FIELD_EHANDLE ),
@ -128,7 +138,7 @@ LINK_ENTITY_TO_CLASS( info_particle_system, CParticleSystem );
void CParticleSystem::Precache( void )
{
const char *pParticleSystemName = STRING( m_iszEffectName );
if ( pParticleSystemName == NULL || pParticleSystemName[0] == NULL )
if ( pParticleSystemName == NULL || pParticleSystemName[0] == 0 )
{
Warning( "info_particle_system (%s) has no particle system name specified!\n", GetEntityName().ToCStr() );
}