mirror of
https://github.com/godotengine/godot
synced 2024-09-05 12:18:25 +00:00
Merge pull request #43661 from EricEzaM/PR/INP2-rename_load_from_globals
load_from_globals() -> load_from_project_settings()
This commit is contained in:
commit
2ca1c17a5c
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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"))) {
|
||||
|
|
Loading…
Reference in a new issue