Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 06:01:14 +00:00
Code Issues Projects Releases Packages 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_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;