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:
@@ -1148,13 +1148,13 @@ void PhysSolidOverride( solid_t &solid, string_t overrideScript )
|
||||
|
||||
// suck out the comma delimited tokens and turn them into quoted key/values
|
||||
char szToken[256];
|
||||
const char *pStr = nexttoken(szToken, STRING(overrideScript), ',');
|
||||
const char *pStr = nexttoken(szToken, STRING(overrideScript), ',', sizeof(szToken));
|
||||
while ( szToken[0] != 0 )
|
||||
{
|
||||
Q_strncat( pTmpString, "\"", sizeof(pTmpString), COPY_ALL_CHARACTERS );
|
||||
Q_strncat( pTmpString, szToken, sizeof(pTmpString), COPY_ALL_CHARACTERS );
|
||||
Q_strncat( pTmpString, "\" ", sizeof(pTmpString), COPY_ALL_CHARACTERS );
|
||||
pStr = nexttoken(szToken, pStr, ',');
|
||||
pStr = nexttoken(szToken, pStr, ',', sizeof(szToken));
|
||||
}
|
||||
// terminate the script
|
||||
Q_strncat( pTmpString, "}", sizeof(pTmpString), COPY_ALL_CHARACTERS );
|
||||
|
||||
Reference in New Issue
Block a user