MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-02-10 22:08:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added basic think hook to logic_script_client

Browse Source
This commit is contained in:
Blixibon 2020-12-27 15:54:56 -06:00
parent a3decd7bbe
commit 8af9c0dc61
1 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sp/src/game/shared/mapbase/logic_script_client.cpp
View File

@ -9,6 +9,10 @@
#include "vscript_shared.h" #include "vscript_shared.h"
#include "tier1/fmtstr.h" #include "tier1/fmtstr.h"
#ifdef CLIENT_DLL
ConVar cl_script_think_interval( "cl_script_think_interval", "0.1" );
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: An entity that acts as a container for client-side game scripts. // Purpose: An entity that acts as a container for client-side game scripts.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -116,6 +120,11 @@ public:
} }
} }
} }
if (m_bClientThink)
{
SetNextClientThink( CLIENT_THINK_ALWAYS );
}
#else #else
// Avoids issues from having m_iszVScripts set without actually having a script scope // Avoids issues from having m_iszVScripts set without actually having a script scope
ValidateScriptScope(); ValidateScriptScope();
@ -127,7 +136,32 @@ public:
#endif #endif
} }
#ifndef CLIENT_DLL #ifdef CLIENT_DLL
void ClientThink()
{
ScriptVariant_t varThinkRetVal;
if (CallScriptFunction("ClientThink", &varThinkRetVal))
{
float flThinkFrequency = 0.0f;
if (!varThinkRetVal.AssignTo(&flThinkFrequency))
{
// use default think interval if script think function doesn't provide one
flThinkFrequency = cl_script_think_interval.GetFloat();
}
if (flThinkFrequency == CLIENT_THINK_ALWAYS)
SetNextClientThink( CLIENT_THINK_ALWAYS );
else
SetNextClientThink( gpGlobals->curtime + flThinkFrequency );
}
else
{
DevWarning("%s FAILED to call client script think function!\n", GetDebugName());
}
BaseClass::ClientThink();
}
#else
void InputCallScriptFunctionClient( inputdata_t &inputdata ) void InputCallScriptFunctionClient( inputdata_t &inputdata )
{ {
// TODO: Support for specific players? // TODO: Support for specific players?
@ -150,14 +184,20 @@ public:
//CNetworkArray( string_t, m_iszGroupMembers, MAX_SCRIPT_GROUP_CLIENT ); //CNetworkArray( string_t, m_iszGroupMembers, MAX_SCRIPT_GROUP_CLIENT );
CNetworkString( m_iszClientScripts, 128 ); CNetworkString( m_iszClientScripts, 128 );
CNetworkVar( bool, m_bClientThink );
#ifndef CLIENT_DLL
bool m_bRunOnServer; bool m_bRunOnServer;
#endif
}; };
LINK_ENTITY_TO_CLASS( logic_script_client, CLogicScriptClient ); LINK_ENTITY_TO_CLASS( logic_script_client, CLogicScriptClient );
BEGIN_DATADESC( CLogicScriptClient ) BEGIN_DATADESC( CLogicScriptClient )
// TODO: Does this need to be saved?
//DEFINE_AUTO_ARRAY( m_iszClientScripts, FIELD_CHARACTER ),
//DEFINE_KEYFIELD( m_iszGroupMembers[0], FIELD_STRING, "Group00"), //DEFINE_KEYFIELD( m_iszGroupMembers[0], FIELD_STRING, "Group00"),
//DEFINE_KEYFIELD( m_iszGroupMembers[1], FIELD_STRING, "Group01"), //DEFINE_KEYFIELD( m_iszGroupMembers[1], FIELD_STRING, "Group01"),
//DEFINE_KEYFIELD( m_iszGroupMembers[2], FIELD_STRING, "Group02"), //DEFINE_KEYFIELD( m_iszGroupMembers[2], FIELD_STRING, "Group02"),
@ -167,9 +207,11 @@ BEGIN_DATADESC( CLogicScriptClient )
//DEFINE_KEYFIELD( m_iszGroupMembers[6], FIELD_STRING, "Group06"), //DEFINE_KEYFIELD( m_iszGroupMembers[6], FIELD_STRING, "Group06"),
//DEFINE_KEYFIELD( m_iszGroupMembers[7], FIELD_STRING, "Group07"), //DEFINE_KEYFIELD( m_iszGroupMembers[7], FIELD_STRING, "Group07"),
DEFINE_KEYFIELD( m_bRunOnServer, FIELD_BOOLEAN, "RunOnServer" ), DEFINE_KEYFIELD( m_bClientThink, FIELD_BOOLEAN, "ClientThink" ),
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
DEFINE_KEYFIELD( m_bRunOnServer, FIELD_BOOLEAN, "RunOnServer" ),
DEFINE_INPUTFUNC( FIELD_STRING, "CallScriptFunctionClient", InputCallScriptFunctionClient ), DEFINE_INPUTFUNC( FIELD_STRING, "CallScriptFunctionClient", InputCallScriptFunctionClient ),
#endif #endif
@ -180,9 +222,11 @@ IMPLEMENT_NETWORKCLASS_DT( CLogicScriptClient, DT_LogicScriptClient )
#ifdef CLIENT_DLL #ifdef CLIENT_DLL
//RecvPropArray( RecvPropString( RECVINFO( m_iszGroupMembers[0] ) ), m_iszGroupMembers ), //RecvPropArray( RecvPropString( RECVINFO( m_iszGroupMembers[0] ) ), m_iszGroupMembers ),
RecvPropString( RECVINFO( m_iszClientScripts ) ), RecvPropString( RECVINFO( m_iszClientScripts ) ),
RecvPropBool( RECVINFO( m_bClientThink ) ),
#else #else
//SendPropArray( SendPropStringT( SENDINFO_ARRAY( m_iszGroupMembers ) ), m_iszGroupMembers ), //SendPropArray( SendPropStringT( SENDINFO_ARRAY( m_iszGroupMembers ) ), m_iszGroupMembers ),
SendPropString( SENDINFO( m_iszClientScripts ) ), SendPropString( SENDINFO( m_iszClientScripts ) ),
SendPropBool( SENDINFO( m_bClientThink ) ),
#endif #endif
END_NETWORK_TABLE() END_NETWORK_TABLE()