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

sp/src/game/shared/mapbase/mapbase_rpc.cpp

@@ -19,6 +19,7 @@
 #include <time.h>
 #endif
 
+#include "filesystem.h"
 #include "c_playerresource.h"
 
 #endif
@@ -91,7 +92,9 @@ static EHANDLE g_Metadata[NUM_RPCS];
 class CMapbaseMetadata : public CBaseEntity
 {
 public:
+#ifndef CLIENT_DLL
 	DECLARE_DATADESC();
+#endif
 	DECLARE_NETWORKCLASS();
 	DECLARE_CLASS( CMapbaseMetadata, CBaseEntity );
 
@@ -204,6 +207,7 @@ BEGIN_NETWORK_TABLE_NOBASE(CMapbaseMetadata, DT_MapbaseMetadata)
 
 END_NETWORK_TABLE()
 
+#ifndef CLIENT_DLL
 BEGIN_DATADESC( CMapbaseMetadata )
 
 	// Inputs
@@ -211,26 +215,31 @@ BEGIN_DATADESC( CMapbaseMetadata )
 	DEFINE_INPUT( m_iszRPCDetails, FIELD_STRING, "SetRPCDetails" ),
 
 END_DATADESC()
+#endif
 
 #ifdef MAPBASE_RPC
 //-----------------------------------------------------------------------------
 // Purpose: Mapbase's special integration with rich presence clients, most notably Discord.
 // 
-// This only has Discord as of writing, but similar/derived implementaton could expand to
-// other clients in the future, maybe even Steam.
+// This only has Discord and crude groundwork for Steam as of writing,
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------
 // !!! FOR MODS !!!
 // 
 // Create your own Discord "application" if you want to change what info/images show up, etc.
-// You can find the convar that controls this in cdll_client_int.cpp.
+// You can change the app ID in "scripts/mapbase_rpc.txt". It's located in the shared content VPK and the mod templates.
+// You could override that file in your mod to change it to your own app ID.
 // 
-// This code automatically shows the mod's title in the details, but it's easy to change if you want things to be chapter-specific, etc.
+// This code automatically shows the mod's title in the details, but it's easy to change this code if you want things to be chapter-specific, etc.
 // 
 //-----------------------------------------
 
-static ConVar cl_discord_appid("cl_discord_appid", "582595088719413250", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT);
+// Changing the default value of the convars below will not work.
+// Use "scripts/mapbase_rpc.txt" instead.
+static ConVar cl_discord_appid("cl_discord_appid", "582595088719413250", FCVAR_NONE);
+static ConVar cl_discord_largeimage("cl_discord_largeimage", "mb_logo_episodic", FCVAR_NONE);
+static ConVar cl_discord_largeimage_text("cl_discord_largeimage_text", "Half-Life 2", FCVAR_NONE);
 static int64_t startTimestamp = time(0);
 
 //
@@ -289,6 +298,22 @@ static void HandleDiscordJoinRequest(const DiscordUser* request)
 
 void MapbaseRPC_Init()
 {
+	// First, load the config
+	// (we need its values immediately)
+	KeyValues *pKV = new KeyValues( "MapbaseRPC" );
+	if (pKV->LoadFromFile( filesystem, "scripts/mapbase_rpc.txt" ))
+	{
+		const char *szAppID = pKV->GetString("discord_appid", cl_discord_appid.GetString());
+		cl_discord_appid.SetValue(szAppID);
+
+		const char *szLargeImage = pKV->GetString("discord_largeimage", cl_discord_largeimage.GetString());
+		cl_discord_largeimage.SetValue(szLargeImage);
+
+		const char *szLargeImageText = pKV->GetString("discord_largeimage_text", cl_discord_largeimage_text.GetString());
+		cl_discord_largeimage_text.SetValue( szLargeImageText );
+	}
+	pKV->deleteThis();
+
 	// Steam RPC
 	if (steamapicontext->SteamFriends())
 		steamapicontext->SteamFriends()->ClearRichPresence();
@@ -423,19 +448,6 @@ void MapbaseRPC_UpdateSteam( int iType, const char *pMapName )
 #endif
 
 #ifdef DISCORD_RPC
-// Game-Specfic Image
-// These are specific to the Mapbase Discord application, so you'll want to modify this for your own mod.
-#if HL2_EPISODIC
-#define DISCORD_GAME_IMAGE "mb_logo_episodic"
-#define DISCORD_GAME_IMAGE_TEXT "Half-Life 2 Episodic"
-#elif HL2_CLIENT_DLL
-#define DISCORD_GAME_IMAGE "mb_logo_hl2"
-#define DISCORD_GAME_IMAGE_TEXT "Half-Life 2"
-#else
-#define DISCORD_GAME_IMAGE "mb_logo_general"
-#define DISCORD_GAME_IMAGE_TEXT "Mapbase"
-#endif
-
 void MapbaseRPC_GetDiscordParameters( DiscordRichPresence &discordPresence, int iType, const char *pMapName )
 {
 	static char details[128];
@@ -504,10 +516,8 @@ void MapbaseRPC_GetDiscordParameters( DiscordRichPresence &discordPresence, int
 	discordPresence.smallImageKey = "mb_logo_general";
 	discordPresence.smallImageText = "Mapbase";
 
-#ifdef DISCORD_GAME_IMAGE
-	discordPresence.largeImageKey = DISCORD_GAME_IMAGE;
-	discordPresence.largeImageText = DISCORD_GAME_IMAGE_TEXT;
-#endif
+	discordPresence.largeImageKey = cl_discord_largeimage.GetString();
+	discordPresence.largeImageText = cl_discord_largeimage_text.GetString();
 }
 
 void MapbaseRPC_UpdateDiscord( int iType, const char *pMapName )

sp/src/game/shared/ragdoll_shared.cpp

@@ -90,9 +90,9 @@ public:
 			if ( m_bSelfCollisions )
 			{
 				char szToken[256];
-				const char *pStr = nexttoken(szToken, pValue, ',');
+				const char *pStr = nexttoken(szToken, pValue, ',', sizeof(szToken));
 				int index0 = atoi(szToken);
-				nexttoken( szToken, pStr, ',' );
+				nexttoken( szToken, pStr, ',' , sizeof(szToken) );
 				int index1 = atoi(szToken);
 
 				m_pSet->EnableCollisions( index0, index1 );

sp/src/game/shared/teamplay_round_timer.cpp

@@ -1290,14 +1290,14 @@ void CTeamRoundTimer::InputAddTeamTime( inputdata_t &input )
 	int			nSeconds = 0;
 
 	// get the team
-	p = nexttoken( token, p, ' ' );
+	p = nexttoken( token, p, ' ', sizeof(token) );
 	if ( token )
 	{
 		nTeam = Q_atoi( token );
 	}
 
 	// get the time
-	p = nexttoken( token, p, ' ' );
+	p = nexttoken( token, p, ' ', sizeof(token) );
 	if ( token )
 	{
 		nSeconds = Q_atoi( token );