diff options
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/script_info.cpp | 8 | ||||
-rw-r--r-- | src/script/script_info.hpp | 12 | ||||
-rw-r--r-- | src/script/script_instance.cpp | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/script/script_info.cpp b/src/script/script_info.cpp index afa90f40e..779236ebc 100644 --- a/src/script/script_info.cpp +++ b/src/script/script_info.cpp @@ -17,14 +17,6 @@ #include "script_info.hpp" #include "script_scanner.hpp" -/** Number of operations to get the author and similar information. */ -static const int MAX_GET_OPS = 1000; -/** Number of operations to create an instance of a script. */ -static const int MAX_CREATEINSTANCE_OPS = 100000; -/** Maximum number of operations allowed for getting a particular setting. */ -static const int MAX_GET_SETTING_OPS = 100000; - - ScriptInfo::~ScriptInfo() { /* Free all allocated strings */ diff --git a/src/script/script_info.hpp b/src/script/script_info.hpp index b686d53f4..4e59c7d72 100644 --- a/src/script/script_info.hpp +++ b/src/script/script_info.hpp @@ -17,6 +17,18 @@ #include "script_config.hpp" +/** The maximum number of operations for saving or loading the data of a script. */ +static const int MAX_SL_OPS = 100000; +/** The maximum number of operations for initial start of a script. */ +static const int MAX_CONSTRUCTOR_OPS = 100000; +/** Number of operations to create an instance of a script. */ +static const int MAX_CREATEINSTANCE_OPS = 100000; +/** Number of operations to get the author and similar information. */ +static const int MAX_GET_OPS = 1000; +/** Maximum number of operations allowed for getting a particular setting. */ +static const int MAX_GET_SETTING_OPS = 100000; + +/** All static information from an Script like name, version, etc. */ class ScriptInfo : public SimpleCountedObject { public: ScriptInfo() : diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp index fa69932ce..beebe2fd7 100644 --- a/src/script/script_instance.cpp +++ b/src/script/script_instance.cpp @@ -18,6 +18,7 @@ #include "script_fatalerror.hpp" #include "script_storage.hpp" +#include "script_info.hpp" #include "script_instance.hpp" #include "api/script_controller.hpp" @@ -29,11 +30,6 @@ #include "../company_func.h" #include "../fileio_func.h" -/** The maximum number of operations for saving or loading the data of a script. */ -static const int MAX_SL_OPS = 100000; -/** The maximum number of operations for initial start of a script. */ -static const int MAX_CONSTRUCTOR_OPS = 100000; - ScriptStorage::~ScriptStorage() { /* Free our pointers */ |