Skip to content

VScript serialisation rewrite #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 1, 2025
Merged

VScript serialisation rewrite #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
843d748
Use CUtlConstString instead of CUtlString
samisalreadytaken Dec 5, 2022
b2699f6
Bump vscript saverestore version
samisalreadytaken Dec 7, 2022
5efb650
Rewrite vscript squirrel saverestore
samisalreadytaken Dec 5, 2022
af6c22e
Use `Assert` instead of `assert`
samisalreadytaken Dec 12, 2022
7525068
Prevent nesting in serialisation of Precache functions
samisalreadytaken Dec 12, 2022
af7c936
Fix vscript squirrel threads
samisalreadytaken Jan 9, 2024
8c0b3f2
Merge remote-tracking branch 'mapbase/master' into vscript-saverestore
samisalreadytaken Jan 16, 2024
77f6459
Fix string allocation in SquirrelVM::ReadObject
samisalreadytaken Jun 29, 2024
26346ba
Don't save/restore squirrel class attributes
samisalreadytaken Jun 29, 2024
3aad0f5
Cleanup SquirrelVM saverestore
samisalreadytaken Jun 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions sp/src/game/server/vscript_server.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@ function ImpulseScale( flTargetMass, flDesiredSpeed )
}
__Documentation.RegisterHelp( "ImpulseScale", "float ImpulseScale(float, float)", "Returns an impulse scale required to push an object." );

local PrecacheModel = PrecacheModel
local PrecacheModel = DoPrecacheModel
function PrecacheModel( a, b = true )
{
return PrecacheModel( a, b )
}

local PrecacheOther = PrecacheOther
local PrecacheOther = DoPrecacheOther
function PrecacheOther( a, b = "" )
{
PrecacheOther( a, b )
return PrecacheOther( a, b )
}

function __ReplaceClosures( script, scope )
Expand All @@ -106,10 +106,9 @@ function __ReplaceClosures( script, scope )
}
}

local __OutputsPattern = regexp("^On.*Output$");

function ConnectOutputs( table )
{
local __OutputsPattern = regexp("^On.*Output$");
local nCharsToStrip = 6;
foreach( key, val in table )
{
Expand Down
4 changes: 2 additions & 2 deletions sp/src/game/shared/mapbase/vscript_funcs_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,10 +1049,10 @@ void RegisterSharedScriptFunctions()
//
// Precaching
//
ScriptRegisterFunctionNamed( g_pScriptVM, ScriptPrecacheModel, "PrecacheModel", "Precaches a model for later usage." );
ScriptRegisterFunctionNamed( g_pScriptVM, ScriptPrecacheModel, "DoPrecacheModel", SCRIPT_ALIAS( "PrecacheModel", "Precaches a model for later usage." ) );
ScriptRegisterFunction( g_pScriptVM, PrecacheMaterial, "Precaches a material for later usage." );
ScriptRegisterFunction( g_pScriptVM, PrecacheParticleSystem, "Precaches a particle system for later usage." );
ScriptRegisterFunctionNamed( g_pScriptVM, ScriptPrecacheOther, "PrecacheOther", "Precaches an entity class for later usage." );
ScriptRegisterFunctionNamed( g_pScriptVM, ScriptPrecacheOther, "DoPrecacheOther", SCRIPT_ALIAS( "PrecacheOther", "Precaches an entity class for later usage." ) );

//
// NPCs
Expand Down
2 changes: 1 addition & 1 deletion sp/src/game/shared/vscript_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ void RunAutorunScripts()

//-----------------------------------------------------------------------------

static short VSCRIPT_SERVER_SAVE_RESTORE_VERSION = 2;
static short VSCRIPT_SERVER_SAVE_RESTORE_VERSION = 3;

//-----------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions sp/src/public/vscript/ivscript.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ struct ScriptClassDesc_t
IScriptInstanceHelper * pHelper; // optional helper

#ifdef MAPBASE_VSCRIPT
public:
static CUtlVector<ScriptClassDesc_t*>& AllClassesDesc()
{
static CUtlVector<ScriptClassDesc_t*> classes;
Expand Down
Loading
Loading