diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-19 07:40:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 07:40:21 +0100 |
| commit | 2ca1c17a5cfd681a4fdb72c3c9fccb77792ae0b0 (patch) | |
| tree | e16081f2ae8c8f8dd9aae9d8dfe9e306a030141b | |
| parent | eebd3e8aa12fa53b473f389493323869a8fba9c0 (diff) | |
| parent | e5376fb129db2149eebe413dbf9bb69baf4834f2 (diff) | |
Merge pull request #43661 from EricEzaM/PR/INP2-rename_load_from_globals
load_from_globals() -> load_from_project_settings()
| -rw-r--r-- | core/input/input_map.cpp | 4 | ||||
| -rw-r--r-- | core/input/input_map.h | 2 | ||||
| -rw-r--r-- | 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 9fd5476f51..979809c7af 100644 --- a/core/input/input_map.cpp +++ b/core/input/input_map.cpp @@ -51,7 +51,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) { @@ -228,7 +228,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 019a1056fb..948d78ebdd 100644 --- a/core/input/input_map.h +++ b/core/input/input_map.h @@ -82,7 +82,7 @@ public: bool event_get_action_status(const Ref<InputEvent> &p_event, const StringName &p_action, bool *p_pressed = nullptr, float *p_strength = nullptr, float *p_raw_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 09f16e9d75..82be327cbb 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"))) { |