mirror of
https://github.com/celisej567/source-sdk-2013.git
synced 2026-09-17 20:10:21 +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:
@@ -3542,7 +3542,7 @@ bool C_BaseAnimating::DispatchMuzzleEffect( const char *options, bool isFirstPer
|
||||
int weaponType = 0;
|
||||
|
||||
// Get the first parameter
|
||||
p = nexttoken( token, p, ' ' );
|
||||
p = nexttoken( token, p, ' ' , sizeof(token) );
|
||||
|
||||
// Find the weapon type
|
||||
if ( token )
|
||||
@@ -3586,7 +3586,7 @@ bool C_BaseAnimating::DispatchMuzzleEffect( const char *options, bool isFirstPer
|
||||
}
|
||||
|
||||
// Get the second parameter
|
||||
p = nexttoken( token, p, ' ' );
|
||||
p = nexttoken( token, p, ' ' , sizeof(token) );
|
||||
|
||||
int attachmentIndex = -1;
|
||||
|
||||
@@ -3697,7 +3697,7 @@ void C_BaseAnimating::FireEvent( const Vector& origin, const QAngle& angles, int
|
||||
|
||||
// Get the particle effect name
|
||||
const char *p = options;
|
||||
p = nexttoken(token, p, ' ');
|
||||
p = nexttoken(token, p, ' ', sizeof(token));
|
||||
if ( token )
|
||||
{
|
||||
const char* mtoken = ModifyEventParticles( token );
|
||||
@@ -3707,7 +3707,7 @@ void C_BaseAnimating::FireEvent( const Vector& origin, const QAngle& angles, int
|
||||
}
|
||||
|
||||
// Get the attachment type
|
||||
p = nexttoken(token, p, ' ');
|
||||
p = nexttoken(token, p, ' ', sizeof(token));
|
||||
if ( token )
|
||||
{
|
||||
iAttachType = GetAttachTypeFromString( token );
|
||||
@@ -3719,7 +3719,7 @@ void C_BaseAnimating::FireEvent( const Vector& origin, const QAngle& angles, int
|
||||
}
|
||||
|
||||
// Get the attachment point index
|
||||
p = nexttoken(token, p, ' ');
|
||||
p = nexttoken(token, p, ' ', sizeof(token));
|
||||
if ( token )
|
||||
{
|
||||
iAttachment = atoi(token);
|
||||
@@ -3924,14 +3924,14 @@ void C_BaseAnimating::FireEvent( const Vector& origin, const QAngle& angles, int
|
||||
const char *p = options;
|
||||
|
||||
// Bodygroup Name
|
||||
p = nexttoken(token, p, ' ');
|
||||
p = nexttoken(token, p, ' ', sizeof(token));
|
||||
if ( token )
|
||||
{
|
||||
Q_strncpy( szBodygroupName, token, sizeof(szBodygroupName) );
|
||||
}
|
||||
|
||||
// Get the desired value
|
||||
p = nexttoken(token, p, ' ');
|
||||
p = nexttoken(token, p, ' ', sizeof(token));
|
||||
if ( token )
|
||||
{
|
||||
value = atoi( token );
|
||||
@@ -3971,21 +3971,21 @@ void C_BaseAnimating::FireObsoleteEvent( const Vector& origin, const QAngle& ang
|
||||
|
||||
const char *p = options;
|
||||
|
||||
p = nexttoken(token, p, ' ');
|
||||
p = nexttoken(token, p, ' ', sizeof(token));
|
||||
|
||||
if( token )
|
||||
{
|
||||
Q_strncpy( effectFunc, token, sizeof(effectFunc) );
|
||||
}
|
||||
|
||||
p = nexttoken(token, p, ' ');
|
||||
p = nexttoken(token, p, ' ', sizeof(token));
|
||||
|
||||
if( token )
|
||||
{
|
||||
iAttachment = atoi(token);
|
||||
}
|
||||
|
||||
p = nexttoken(token, p, ' ');
|
||||
p = nexttoken(token, p, ' ', sizeof(token));
|
||||
|
||||
if( token )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user