celisej567/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/celisej567/source-sdk-2013.git synced 2026-09-23 20:09:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged dev changes 9/7/2019

Browse Source 
- Experimental RPC stuff for the future
- Fixed players running over allies with vehicles (kind of)
- Modified redirect filter infrastructure to support when there's no target filter (meaning it will just make sure the entity exists)
- Fixed SDK_EyeRefract
- Fixed env_beam SetStart/EndEntity
- New "OnStateChange" output on NPCs
- scripted_face removed (use generic facing VCDs instead)
- Fixed RPC
- Miscellaneous code cleanup
This commit is contained in:
Blixibon
2019-09-07 21:05:59 +00:00
parent 3d464bc051
commit 031e383fb5
16 changed files with 132 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
sp/src/game/shared/mapbase/mapbase_rpc.cpp
View File

@@ -1,7 +1,6 @@
//========= Copyright Valve Corporation, All rights reserved. ============//
//
// Purpose: Carries the Mapbase CAutoGameSystem that loads manifest among other things.
// Also includes code that does not fit anywhere else.
// Purpose: Mapbase's RPC implementation.
//
// $NoKeywords: $
//=============================================================================//
@@ -12,6 +11,7 @@
#ifdef STEAM_RPC
#include "clientsteamcontext.h"
#include "steam/steamclientpublic.h"
#endif
#ifdef DISCORD_RPC
@@ -19,6 +19,8 @@
#include <time.h>
#endif
#include "c_playerresource.h"
#endif
// memdbgon must be the last include file in a .cpp file!!!
@@ -231,6 +233,24 @@ END_DATADESC()
static ConVar cl_discord_appid("cl_discord_appid", "582595088719413250", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT);
static int64_t startTimestamp = time(0);
//
int MapbaseRPC_GetPlayerCount()
{
int iNumPlayers = 0;
if (g_PR)
{
for (; iNumPlayers <= gpGlobals->maxClients; iNumPlayers++)
{
if (!g_PR->IsConnected( iNumPlayers ))
break;
}
}
return iNumPlayers;
}
//-----------------------------------------------------------------------------
// Discord RPC handlers
//-----------------------------------------------------------------------------
@@ -328,11 +348,6 @@ void MapbaseRPC_Update( int iRPCMask, int iType, const char *pMapName )
#ifdef STEAM_RPC
void MapbaseRPC_UpdateSteam( int iType, const char *pMapName )
{
if (!steamapicontext->SteamFriends())
{
DevMsg("No Friends! :(\n");
}
const char *pszStatus = NULL;
if (g_Metadata[RPC_STEAM] != NULL)
@@ -376,11 +391,33 @@ void MapbaseRPC_UpdateSteam( int iType, const char *pMapName )
}
}
DevMsg("Updating Steam\n");
DevMsg( "Updating Steam\n" );
if (pszStatus)
{
steamapicontext->SteamFriends()->SetRichPresence( "gamestatus", pszStatus );
steamapicontext->SteamFriends()->SetRichPresence( "steam_display", "#SteamRPC_Status" );
if (gpGlobals->maxClients > 1)
{
// Players in server
const CSteamID *serverID = serverengine->GetGameServerSteamID();
if (serverID)
{
char szGroupID[32];
Q_snprintf(szGroupID, sizeof(szGroupID), "%i", serverID->GetAccountID());
char szGroupSize[8];
Q_snprintf(szGroupSize, sizeof(szGroupSize), "%i", MapbaseRPC_GetPlayerCount());
steamapicontext->SteamFriends()->SetRichPresence( "steam_player_group", szGroupID );
steamapicontext->SteamFriends()->SetRichPresence( "steam_player_group_size", szGroupSize );
}
else
{
DevWarning("Steam RPC cannot update player count (no server ID)\n");
}
}
}
}
#endif
@@ -401,23 +438,29 @@ void MapbaseRPC_UpdateSteam( int iType, const char *pMapName )
void MapbaseRPC_GetDiscordParameters( DiscordRichPresence &discordPresence, int iType, const char *pMapName )
{
static char details[128];
static char state[128];
details[0] = '\0';
state[0] = '\0';
if (g_Metadata[RPC_DISCORD] != NULL)
{
C_MapbaseMetadata *pMetadata = static_cast<C_MapbaseMetadata*>(g_Metadata[RPC_DISCORD].Get());
if (pMetadata->m_iszRPCState[0] != NULL)
discordPresence.state = pMetadata->m_iszRPCState;
Q_strncpy( state, pMetadata->m_iszRPCState, sizeof(state) );
else
discordPresence.state = g_iszGameName;
Q_strncpy( state, g_iszGameName, sizeof(state) );
if (pMetadata->m_iszRPCDetails[0] != NULL)
discordPresence.details = pMetadata->m_iszRPCDetails;
Q_strncpy( details, pMetadata->m_iszRPCDetails, sizeof(details) );
else
{
if (engine->IsLevelMainMenuBackground())
discordPresence.details = VarArgs("Main Menu (%s)", pMapName ? pMapName : "N/A");
Q_snprintf( details, sizeof(details), "Main Menu (%s)", pMapName ? pMapName : "N/A" );
else
discordPresence.details = VarArgs("Map: %s", pMapName ? pMapName : "N/A");
Q_snprintf( details, sizeof(details), "%s", pMapName ? pMapName : "N/A" );
}
}
else
@@ -427,8 +470,8 @@ void MapbaseRPC_GetDiscordParameters( DiscordRichPresence &discordPresence, int
case RPCSTATE_INIT:
case RPCSTATE_LEVEL_SHUTDOWN:
{
discordPresence.state = g_iszGameName;
discordPresence.details = "Main Menu";
Q_strncpy( state, g_iszGameName, sizeof(state) );
Q_strncpy( details, "Main Menu", sizeof(details) );
} break;
case RPCSTATE_LEVEL_INIT:
default:
@@ -436,18 +479,26 @@ void MapbaseRPC_GetDiscordParameters( DiscordRichPresence &discordPresence, int
// Say we're in the main menu if it's a background map
if (engine->IsLevelMainMenuBackground())
{
discordPresence.state = g_iszGameName;
discordPresence.details = VarArgs("Main Menu (%s)", pMapName ? pMapName : "N/A");
Q_snprintf( details, sizeof(details), "Main Menu (%s)", pMapName ? pMapName : "N/A" );
}
else
{
discordPresence.state = g_iszGameName;
discordPresence.details = VarArgs("Map: %s", pMapName ? pMapName : "N/A");
Q_snprintf( details, sizeof(details), "%s", pMapName ? pMapName : "N/A" );
}
} break;
}
}
if (gpGlobals->maxClients > 1)
{
Q_snprintf( details, sizeof(details), "%s (%i/%i)", details, MapbaseRPC_GetPlayerCount(), gpGlobals->maxClients );
}
if (state[0] != '\0')
discordPresence.state = state;
if (details[0] != '\0')
discordPresence.details = details;
// Generic Mapbase logo. Specific to the Mapbase Discord application.
discordPresence.smallImageKey = "mb_logo_general";
discordPresence.smallImageText = "Mapbase";