mirror of
https://github.com/celisej567/source-sdk-2013.git
synced 2026-09-23 20:09:45 +03:00
Merged dev changes 10/24/2019
- Applied the nexttoken security fix (suggested by ficool2, important for MP port, no #ifdef MAPBASE because of volume of changes and irrelevance to readers) - Fixed a crash with the follower wait point start/stop using handlers - Fixed game_ui activator crash - Changed vphysics triggers to accept more entities - Fixed player squadmates not obeying hint node facing (e.g. wait points) - Fixed npc_snipers - prop_vehicle_jeep_old no longer changes classname - Restored and added the other CTakeDamageInfo fields for point_damageinfo - Fixed game_metadata not saving correctly - Fixed logic_measure_movement not functioning while possessing spawnflags - Added scripts/mapbase_rpc.txt script with choosable app ID and game image - Fixed some casing that broke Linux support - Added proper WorldVertexTransition blending to translucency and selfillum (translucency may need the translucent texture to be $basetexture, not $basetexture2) - Added modified parallax corrected cubemaps to shader code (although currently unusable) - Fixed Variant_ParseInput - Added/restored custom scanner speed (experimental, needs more work) - Several miscellaneous code changes/fixes and comment adjustments
This commit is contained in:
@@ -751,14 +751,14 @@ void CRagdollProp::InitRagdoll( const Vector &forceVector, int forceBone, const
|
||||
if ( m_anglesOverrideString != NULL_STRING && Q_strlen(m_anglesOverrideString.ToCStr()) > 0 )
|
||||
{
|
||||
char szToken[2048];
|
||||
const char *pStr = nexttoken(szToken, STRING(m_anglesOverrideString), ',');
|
||||
const char *pStr = nexttoken(szToken, STRING(m_anglesOverrideString), ',', sizeof(szToken));
|
||||
// anglesOverride is index,angles,index,angles (e.g. "1, 22.5 123.0 0.0, 2, 0 0 0, 3, 0 0 180.0")
|
||||
while ( szToken[0] != 0 )
|
||||
{
|
||||
int objectIndex = atoi(szToken);
|
||||
// sanity check to make sure this token is an integer
|
||||
Assert( atof(szToken) == ((float)objectIndex) );
|
||||
pStr = nexttoken(szToken, pStr, ',');
|
||||
pStr = nexttoken(szToken, pStr, ',', sizeof(szToken));
|
||||
Assert( szToken[0] );
|
||||
if ( objectIndex >= m_ragdoll.listCount )
|
||||
{
|
||||
@@ -785,7 +785,7 @@ void CRagdollProp::InitRagdoll( const Vector &forceVector, int forceBone, const
|
||||
MatrixSetColumn( out, 3, pBoneToWorld[boneIndex] );
|
||||
element.pObject->SetPositionMatrix( pBoneToWorld[boneIndex], true );
|
||||
}
|
||||
pStr = nexttoken(szToken, pStr, ',');
|
||||
pStr = nexttoken(szToken, pStr, ',', sizeof(szToken));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user