From 6eebaeaac8dfd142e9caceb69f99537313e2d5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Fri, 4 Mar 2011 15:20:21 +0100 Subject: [PATCH] Fold C4AulScript::Default() into C4AulScript::C4AulScript() --- src/script/C4Aul.cpp | 7 ------- src/script/C4Aul.h | 1 - src/script/C4ScriptHost.cpp | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/script/C4Aul.cpp b/src/script/C4Aul.cpp index d139570b0..d343cd5e9 100644 --- a/src/script/C4Aul.cpp +++ b/src/script/C4Aul.cpp @@ -164,12 +164,6 @@ StdStrBuf C4AulScriptFunc::GetFullName() C4AulScript::C4AulScript() { // init defaults - Default(); -} - - -void C4AulScript::Default() -{ // not compiled State = ASS_NONE; Script = NULL; @@ -194,7 +188,6 @@ void C4AulScript::Default() stringTable = 0; } - C4AulScript::~C4AulScript() { // clear diff --git a/src/script/C4Aul.h b/src/script/C4Aul.h index 1c218c3e9..f278c1b3a 100644 --- a/src/script/C4Aul.h +++ b/src/script/C4Aul.h @@ -425,7 +425,6 @@ class C4AulScript public: C4AulScript(); // constructor virtual ~C4AulScript(); // destructor - void Default(); // init void Clear(); // remove script, byte code and children void Reg2List(C4AulScriptEngine *pEngine, C4AulScript *pOwner); // reg to linked list void Unreg(); // remove from list diff --git a/src/script/C4ScriptHost.cpp b/src/script/C4ScriptHost.cpp index 79edad01e..7ba2e12bc 100644 --- a/src/script/C4ScriptHost.cpp +++ b/src/script/C4ScriptHost.cpp @@ -39,7 +39,7 @@ C4ScriptHost::~C4ScriptHost() { Clear(); } void C4ScriptHost::Default() { - C4AulScript::Default(); + C4AulScript::Clear(); ComponentHost.Default(); }