From e5376fb129db2149eebe413dbf9bb69baf4834f2 Mon Sep 17 00:00:00 2001
From: Eric M <itsjusteza@gmail.com>
Date: Fri, 2 Oct 2020 17:04:09 +1000
Subject: [PATCH] load_from_globals() -> load_from_project_settings()

---
 core/input/input_map.cpp | 4 ++--
 core/input/input_map.h   | 2 +-
 main/main.cpp            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp
index ba1de3c58d6..5a559f13e3d 100644
--- a/core/input/input_map.cpp
+++ b/core/input/input_map.cpp
@@ -50,7 +50,7 @@ void InputMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("action_erase_events", "action"), &InputMap::action_erase_events);
 	ClassDB::bind_method(D_METHOD("action_get_events", "action"), &InputMap::_action_get_events);
 	ClassDB::bind_method(D_METHOD("event_is_action", "event", "action"), &InputMap::event_is_action);
-	ClassDB::bind_method(D_METHOD("load_from_globals"), &InputMap::load_from_globals);
+	ClassDB::bind_method(D_METHOD("load_from_project_settings"), &InputMap::load_from_project_settings);
 }
 
 void InputMap::add_action(const StringName &p_action, float p_deadzone) {
@@ -214,7 +214,7 @@ const Map<StringName, InputMap::Action> &InputMap::get_action_map() const {
 	return input_map;
 }
 
-void InputMap::load_from_globals() {
+void InputMap::load_from_project_settings() {
 	input_map.clear();
 
 	List<PropertyInfo> pinfo;
diff --git a/core/input/input_map.h b/core/input/input_map.h
index 35c65d08813..206afacb716 100644
--- a/core/input/input_map.h
+++ b/core/input/input_map.h
@@ -81,7 +81,7 @@ public:
 	bool event_get_action_status(const Ref<InputEvent> &p_event, const StringName &p_action, bool *p_pressed = nullptr, float *p_strength = nullptr) const;
 
 	const Map<StringName, Action> &get_action_map() const;
-	void load_from_globals();
+	void load_from_project_settings();
 	void load_default();
 
 	InputMap();
diff --git a/main/main.cpp b/main/main.cpp
index 0667180c28e..4456c746c89 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1143,7 +1143,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		use_custom_res = false;
 		input_map->load_default(); //keys for editor
 	} else {
-		input_map->load_from_globals(); //keys for game
+		input_map->load_from_project_settings(); //keys for game
 	}
 
 	if (bool(ProjectSettings::get_singleton()->get("application/run/disable_stdout"))) {