OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- avoid using plain char pointers to store script data for FraggleScript.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 12:12:22 +02:00
commit 3db56651f4
11 changed files with 37 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/playsim/fragglescript/t_script.cpp
View file

@ -127,7 +127,6 @@ DFsScript::DFsScript()
for(i=0; i<VARIABLESLOTS; i++) variables[i] = nullptr;
for(i=0; i<MAXSCRIPTS; i++) children[i] = nullptr;
data = nullptr;
scriptnum = -1;
len = 0;
parent = nullptr;
@ -135,19 +134,6 @@ DFsScript::DFsScript()
lastiftrue = false;
}
//==========================================================================
//
// This is here to delete the locally allocated buffer in case this
// gets forcibly destroyed
//
//==========================================================================
DFsScript::~DFsScript()
{
if (data != nullptr) delete[] data;
data = nullptr;
}
//==========================================================================
//
//
@ -160,8 +146,7 @@ void DFsScript::OnDestroy()
ClearSections();
ClearChildren();
parent = nullptr;
if (data != nullptr) delete [] data;
data = nullptr;
Data.Reset(); // lose the buffer now and don't wait until getting collected.
parent = nullptr;
trigger = nullptr;
Super::OnDestroy();
@ -177,7 +162,7 @@ void DFsScript::Serialize(FSerializer &arc)
{
Super::Serialize(arc);
arc("data", data)
arc("data", Data)
("scriptnum", scriptnum)
("len", len)
("parent", parent)
@ -201,11 +186,11 @@ void DFsScript::ParseScript(char *position, DFraggleThinker *th)
if (position == nullptr)
{
lastiftrue = false;
position = data;
position = Data.Data();
}
// check for valid position
if(position < data || position > data+len)
if(position < Data.Data() || position > Data.Data() +len)
{
Printf("script %d: trying to continue from point outside script!\n", scriptnum);
return;
@ -216,7 +201,7 @@ void DFsScript::ParseScript(char *position, DFraggleThinker *th)
try
{
FParser parse(th->Level, this);
parse.Run(position, data, data + len);
parse.Run(position, Data.Data(), Data.Data() + len);
}
catch (CFraggleScriptError &err)
{
@ -528,7 +513,7 @@ void DFraggleThinker::Tick()
next = current->next; // save before freeing
// continue the script
current->script->ParseScript (current->script->data + current->save_point, this);
current->script->ParseScript (current->script->Data.Data() + current->save_point, this);
// free
current->Destroy();