Modified SDK for GCC 4.2

This commit is contained in:
Scott Ehlert committed 2008-09-15 02:50:57 -05:00
1 parent 86f3bc8a60
commit 7ff7f366d5
696 files changed
+23423 -22634

No files matched your search

+6 -6
View File
@@ -278,14 +278,14 @@ int CPropData::ParsePropFromKV( CBaseEntity *pProp, KeyValues *pSection, KeyValu
}
// Allow overriding of Block LOS
int iBlockLOS = pSection->GetFloat( "blockLOS", -1 );
int iBlockLOS = pSection->GetInt( "blockLOS", -1 );
if ( iBlockLOS != -1 )
{
pBreakableInterface->SetPropDataBlocksLOS( iBlockLOS != 0 );
}
// Set whether AI can walk on this prop
int iIsWalkable = pSection->GetFloat( "AIWalkable", -1 );
int iIsWalkable = pSection->GetInt( "AIWalkable", -1 );
if ( iIsWalkable != -1 )
{
pBreakableInterface->SetPropDataIsAIWalkable( iIsWalkable != 0 );
@@ -382,7 +382,7 @@ int CPropData::ParsePropFromKV( CBaseEntity *pProp, KeyValues *pSection, KeyValu
int iSmallest = SmallestAxis(vecSize);
vecSize[iSmallest] = 1;
float flVolume = vecSize.x * vecSize.y * vecSize.z;
int iMaxSize = floor( flVolume / (32.0*32.0) );
int iMaxSize = (int)floor( flVolume / (32.0*32.0) );
pBreakableInterface->SetMaxBreakableSize( iMaxSize );
// Now parse our interactions
@@ -521,7 +521,7 @@ class CBreakParser : public IVPhysicsKeyHandler
{
public:
CBreakParser( float defaultBurstScale, int defaultCollisionGroup )
: m_defaultBurstScale(defaultBurstScale), m_defaultCollisionGroup(defaultCollisionGroup) {}
: m_defaultCollisionGroup(defaultCollisionGroup), m_defaultBurstScale(defaultBurstScale) {}
void ParseModelName( breakmodel_t *pModel, const char *pValue )
{
@@ -681,7 +681,7 @@ const char *GetMassEquivalent(float flMass)
static struct
{
float flMass;
char *sz;
const char *sz;
} masstext[] =
{
{ 5e-6, "snowflake" },
@@ -709,7 +709,7 @@ const char *GetMassEquivalent(float flMass)
{ 7e24, "really freaking heavy" },
};
for (int i = 0; i < sizeof(masstext) / sizeof(masstext[0]) - 1; i++)
for (size_t i = 0; i < sizeof(masstext) / sizeof(masstext[0]) - 1; i++)
{
if (flMass < masstext[i].flMass)
{