1 files changed, 43 insertions, 2 deletions

diff --git a/core/script_language.cpp b/core/script_language.cpp
index 1503418269..fa1d01d3eb 100644
--- a/core/script_language.cpp
+++ b/core/script_language.cpp
@@ -32,7 +32,8 @@ ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES];
 int ScriptServer::_language_count=0;
 
 bool ScriptServer::scripting_enabled=true;
-
+bool ScriptServer::reload_scripts_on_save=false;
+ScriptEditRequestFunction ScriptServer::edit_request_func=NULL;
 
 void Script::_notification( int p_what) {
 
@@ -51,7 +52,7 @@ void Script::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("has_source_code"),&Script::has_source_code);
 	ObjectTypeDB::bind_method(_MD("get_source_code"),&Script::get_source_code);
 	ObjectTypeDB::bind_method(_MD("set_source_code","source"),&Script::set_source_code);
-	ObjectTypeDB::bind_method(_MD("reload"),&Script::reload);
+	ObjectTypeDB::bind_method(_MD("reload","keep_state"),&Script::reload,DEFVAL(false));
 
 }
 
@@ -85,6 +86,20 @@ void ScriptServer::register_language(ScriptLanguage *p_language) {
 	_languages[_language_count++]=p_language;
 }
 
+void ScriptServer::unregister_language(ScriptLanguage *p_language) {
+
+
+	for(int i=0;i<_language_count;i++) {
+		if (_languages[i]==p_language) {
+			_language_count--;
+			if (i<_language_count) {
+				SWAP(_languages[i],_languages[_language_count]);
+			}
+			return;
+		}
+	}
+}
+
 void ScriptServer::init_languages() {
 
 	for(int i=0;i<_language_count;i++) {
@@ -92,6 +107,32 @@ void ScriptServer::init_languages() {
 	}
 }
 
+void ScriptServer::set_reload_scripts_on_save(bool p_enable) {
+
+	reload_scripts_on_save=p_enable;
+}
+
+bool ScriptServer::is_reload_scripts_on_save_enabled() {
+
+	return reload_scripts_on_save;
+}
+
+void ScriptServer::thread_enter() {
+
+	for(int i=0;i<_language_count;i++) {
+		_languages[i]->thread_enter();
+	}
+}
+
+void ScriptServer::thread_exit() {
+
+	for(int i=0;i<_language_count;i++) {
+		_languages[i]->thread_exit();
+	}
+
+}
+
+
 void ScriptInstance::get_property_state(List<Pair<StringName, Variant> > &state) {
 
 	List<PropertyInfo> pinfo;