From 0dbedd18fc62f700e92a4cf581e505d849bc47ad Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Wed, 5 Nov 2014 21:20:42 -0300 Subject: SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around --- core/os/input_event.cpp | 4 ++-- core/os/input_event.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/os') diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index 499ec0c08e..27c7c10aef 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -141,11 +141,11 @@ InputEvent::operator String() const { return ""; } -void InputEvent::set_as_action(const String& p_action) { +void InputEvent::set_as_action(const String& p_action, bool p_pressed) { type=ACTION; action.action=InputMap::get_singleton()->get_action_id(p_action); - action.pressed=false; + action.pressed=p_pressed; } bool InputEvent::is_pressed() const { diff --git a/core/os/input_event.h b/core/os/input_event.h index 2c10bffcd2..218ff327d1 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -288,7 +288,7 @@ struct InputEvent { bool is_pressed() const; bool is_action(const String& p_action) const; bool is_echo() const; - void set_as_action(const String& p_action); + void set_as_action(const String& p_action, bool p_pressed); bool operator==(const InputEvent &p_event) const; operator String() const; -- cgit v1.2.3