MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-04-15 22:12:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes to save/restore vscript

Browse Source
This commit is contained in:
James Mitchell 2020-05-20 21:41:04 +10:00
parent dc8ee0a7dd
commit f3dbcaf480
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sp/src/vscript/vscript_squirrel.cpp
View File

@ -1,6 +1,7 @@
#include "vscript/ivscript.h" #include "vscript/ivscript.h"
#include "tier1/utlbuffer.h" #include "tier1/utlbuffer.h"
#include "tier1/utlmap.h" #include "tier1/utlmap.h"
#include "tier1/utlstring.h"
#include "squirrel.h" #include "squirrel.h"
#include "sqstdaux.h" #include "sqstdaux.h"
@ -598,10 +599,7 @@ struct ClassInstanceData
void* instance; void* instance;
ScriptClassDesc_t* desc; ScriptClassDesc_t* desc;
CUtlString instanceId;
// TODO: Should we be using UtlString here? It appears this is a pool allocation
// which should live for the life of the game, if not the life the object atleast
const char* instanceId;
}; };
bool CreateParamCheck(const ScriptFunctionBinding_t& func, char* output) bool CreateParamCheck(const ScriptFunctionBinding_t& func, char* output)
@ -1873,6 +1871,9 @@ void SquirrelVM::WriteObject(CUtlBuffer* pBuffer, WriteStateMap& writeState, SQI
{ {
break; break;
} }
sq_getdelegate(vm_, idx);
WriteObject(pBuffer, writeState, -1);
sq_poptop(vm_);
int count = sq_getsize(vm_, idx); int count = sq_getsize(vm_, idx);
sq_push(vm_, idx); sq_push(vm_, idx);
sq_pushnull(vm_); sq_pushnull(vm_);
@ -2237,10 +2238,17 @@ void SquirrelVM::ReadObject(CUtlBuffer* pBuffer, ReadStateMap& readState)
break; break;
} }
ReadObject(pBuffer, readState);
int count = pBuffer->GetInt(); int count = pBuffer->GetInt();
sq_newtableex(vm_, count); sq_newtableex(vm_, count);
sq_getstackobj(vm_, -1, obj); sq_getstackobj(vm_, -1, obj);
sq_push(vm_, -2);
sq_setdelegate(vm_, -2);
sq_remove(vm_, -2);
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
{ {
ReadObject(pBuffer, readState); ReadObject(pBuffer, readState);
@ -2459,7 +2467,7 @@ void SquirrelVM::ReadObject(CUtlBuffer* pBuffer, ReadStateMap& readState)
break; break;
} }
auto classInstanceData = new ClassInstanceData(instance, pClassDesc); auto classInstanceData = new ClassInstanceData(instance, pClassDesc, instanceName);
sq_setinstanceup(vm_, -1, classInstanceData); sq_setinstanceup(vm_, -1, classInstanceData);
sq_setreleasehook(vm_, -1, &destructor_stub); sq_setreleasehook(vm_, -1, &destructor_stub);
} }