godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

load_from_globals() -> load_from_project_settings()

Browse Source
This commit is contained in:
Eric M
2020-10-02 17:04:09 +10:00
parent 593e35346a
commit e5376fb129
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/input/input_map.cpp
View File

@@ -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_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("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("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) { 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; return input_map;
} }
void InputMap::load_from_globals() { void InputMap::load_from_project_settings() {
input_map.clear(); input_map.clear();
List<PropertyInfo> pinfo; List<PropertyInfo> pinfo;

2
core/input/input_map.h
View File

@@ -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; 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; const Map<StringName, Action> &get_action_map() const;
void load_from_globals(); void load_from_project_settings();
void load_default(); void load_default();
InputMap(); InputMap();

2
main/main.cpp
View File

@@ -1143,7 +1143,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
use_custom_res = false; use_custom_res = false;
input_map->load_default(); //keys for editor input_map->load_default(); //keys for editor
} else { } 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"))) { if (bool(ProjectSettings::get_singleton()->get("application/run/disable_stdout"))) {