marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the C4ScriptHost a ComponentHost again

liquid_container
Günther Brammer 2016-02-03 04:11:36 +01:00
parent fb76308812
commit 55572720bc
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/C4ScriptHost.cpp
View File

@ -48,7 +48,7 @@ C4ScriptHost::~C4ScriptHost()
void C4ScriptHost::Clear()
{
ComponentHost.Clear();
C4ComponentHost::Clear();
Script.Clear();
LocalNamed.Reset();
LocalValues.Clear();
@ -97,7 +97,7 @@ bool C4ScriptHost::Load(C4Group &hGroup, const char *szFilename,
const char *szLanguage, class C4LangStringTable *pLocalTable)
{
// Base load
bool fSuccess = ComponentHost.Load(hGroup,szFilename,szLanguage);
bool fSuccess = C4ComponentHost::Load(hGroup,szFilename,szLanguage);
// String Table
if (stringTable != pLocalTable)
{
@ -106,7 +106,7 @@ bool C4ScriptHost::Load(C4Group &hGroup, const char *szFilename,
if (stringTable) stringTable->AddRef();
}
// set name
ScriptName.Ref(ComponentHost.GetFilePath());
ScriptName.Ref(GetFilePath());
// preparse script
MakeScript();
// Success
@ -145,11 +145,11 @@ void C4ScriptHost::MakeScript()
// create script
if (stringTable)
{
stringTable->ReplaceStrings(ComponentHost.GetDataBuf(), Script);
stringTable->ReplaceStrings(GetDataBuf(), Script);
}
else
{
Script.Ref(ComponentHost.GetDataBuf());
Script.Ref(GetDataBuf());
}
// preparse script
@ -159,7 +159,7 @@ void C4ScriptHost::MakeScript()
bool C4ScriptHost::ReloadScript(const char *szPath, const char *szLanguage)
{
// this?
if (SEqualNoCase(szPath, ComponentHost.GetFilePath()) || (stringTable && SEqualNoCase(szPath, stringTable->GetFilePath())))
if (SEqualNoCase(szPath, GetFilePath()) || (stringTable && SEqualNoCase(szPath, stringTable->GetFilePath())))
{
// try reload
char szParentPath[_MAX_PATH + 1]; C4Group ParentGrp;

3
src/script/C4ScriptHost.h
View File

@ -33,7 +33,7 @@ enum C4AulScriptState
};
// generic script host for objects
class C4ScriptHost
class C4ScriptHost: public C4ComponentHost
{
public:
virtual ~C4ScriptHost();
@ -56,7 +56,6 @@ protected:
void Unreg(); // remove from list
void MakeScript();
virtual bool ReloadScript(const char *szPath, const char *szLanguage);
C4ComponentHost ComponentHost;
bool Preparse(); // preparse script; return if successfull
virtual bool Parse(); // parse preparsed script; return if successfull