4 files changed, 23 insertions, 22 deletions
diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp
index 3c0e56f5a8..0ba69a8d47 100644
--- a/core/os/main_loop.cpp
+++ b/core/os/main_loop.cpp
@@ -33,11 +33,6 @@
 #include "core/object/script_language.h"
 
 void MainLoop::_bind_methods() {
-	BIND_VMETHOD(MethodInfo("_initialize"));
-	BIND_VMETHOD(MethodInfo(Variant::BOOL, "_physics_process", PropertyInfo(Variant::FLOAT, "delta")));
-	BIND_VMETHOD(MethodInfo(Variant::BOOL, "_process", PropertyInfo(Variant::FLOAT, "delta")));
-	BIND_VMETHOD(MethodInfo("_finalize"));
-
 	BIND_CONSTANT(NOTIFICATION_OS_MEMORY_WARNING);
 	BIND_CONSTANT(NOTIFICATION_TRANSLATION_CHANGED);
 	BIND_CONSTANT(NOTIFICATION_WM_ABOUT);
@@ -50,7 +45,12 @@ void MainLoop::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_TEXT_SERVER_CHANGED);
 
 	ADD_SIGNAL(MethodInfo("on_request_permissions_result", PropertyInfo(Variant::STRING, "permission"), PropertyInfo(Variant::BOOL, "granted")));
-};
+
+	GDVIRTUAL_BIND(_initialize);
+	GDVIRTUAL_BIND(_physics_process, "delta");
+	GDVIRTUAL_BIND(_process, "delta");
+	GDVIRTUAL_BIND(_finalize);
+}
 
 void MainLoop::set_initialize_script(const Ref<Script> &p_initialize_script) {
 	initialize_script = p_initialize_script;
@@ -61,30 +61,31 @@ void MainLoop::initialize() {
 		set_script(initialize_script);
 	}
 
-	if (get_script_instance()) {
-		get_script_instance()->call("_initialize");
-	}
+	GDVIRTUAL_CALL(_initialize);
 }
 
 bool MainLoop::physics_process(double p_time) {
-	if (get_script_instance()) {
-		return get_script_instance()->call("_physics_process", p_time);
+	bool quit;
+	if (GDVIRTUAL_CALL(_physics_process, p_time, quit)) {
+		return quit;
 	}
 
 	return false;
 }
 
 bool MainLoop::process(double p_time) {
-	if (get_script_instance()) {
-		return get_script_instance()->call("_process", p_time);
+	bool quit;
+	if (GDVIRTUAL_CALL(_process, p_time, quit)) {
+		return quit;
 	}
 
 	return false;
 }
 
 void MainLoop::finalize() {
+	GDVIRTUAL_CALL(_finalize);
+
 	if (get_script_instance()) {
-		get_script_instance()->call("_finalize");
 		set_script(Variant()); //clear script
 	}
 }
diff --git a/core/os/main_loop.h b/core/os/main_loop.h
index b42e9b18ff..4da01d767e 100644
--- a/core/os/main_loop.h
+++ b/core/os/main_loop.h
@@ -32,6 +32,7 @@
 #define MAIN_LOOP_H
 
 #include "core/input/input_event.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 #include "core/object/script_language.h"
 
@@ -44,6 +45,11 @@ class MainLoop : public Object {
 protected:
 	static void _bind_methods();
 
+	GDVIRTUAL0(_initialize)
+	GDVIRTUAL1R(bool, _physics_process, double)
+	GDVIRTUAL1R(bool, _process, double)
+	GDVIRTUAL0(_finalize)
+
 public:
 	enum {
 		//make sure these are replicated in Node
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 76a6da51e1..63390919f4 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -277,18 +277,13 @@ String OS::get_user_data_dir() const {
 	return ".";
 }
 
-// Android OS path to app's external data storage
-String OS::get_external_data_dir() const {
-	return get_user_data_dir();
-};
-
 // Absolute path to res://
 String OS::get_resource_dir() const {
 	return ProjectSettings::get_singleton()->get_resource_path();
 }
 
 // Access system-specific dirs like Documents, Downloads, etc.
-String OS::get_system_dir(SystemDir p_dir) const {
+String OS::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
 	return ".";
 }
 
diff --git a/core/os/os.h b/core/os/os.h
index 0466d94acd..55b21266fc 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -250,7 +250,6 @@ public:
 	virtual String get_bundle_resource_dir() const;
 
 	virtual String get_user_data_dir() const;
-	virtual String get_external_data_dir() const;
 	virtual String get_resource_dir() const;
 
 	enum SystemDir {
@@ -264,7 +263,7 @@ public:
 		SYSTEM_DIR_RINGTONES,
 	};
 
-	virtual String get_system_dir(SystemDir p_dir) const;
+	virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const;
 
 	virtual Error move_to_trash(const String &p_path) { return FAILED; }