diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-12 08:12:28 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-12 08:12:28 -0300 |
| commit | a73cf7f79447480b59ac15c9461a2664ac4bc34f (patch) | |
| tree | 73013a5276d84c4b6ee9af3f3dec59b87daac009 | |
| parent | 9251298f46537cde669e66ed740c9987678c4617 (diff) | |
| parent | 25d19e08bb8fe409920a06429f531895d081e1f7 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
| -rw-r--r-- | core/variant_op.cpp | 2 | ||||
| -rw-r--r-- | platform/iphone/os_iphone.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 1bcfa7d2ae..e33b79e63c 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -2635,7 +2635,7 @@ bool Variant::in(const Variant& p_index, bool *r_valid) const { if (l) { for(int i=0;i<l;i++) { - if ((*arr)[i]==p_index) + if (evaluate(OP_EQUAL,(*arr)[i],p_index)) return true; } diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index 93f4d00e05..3db5e1d215 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -226,6 +226,8 @@ void OSIPhone::mouse_button(int p_idx, int p_x, int p_y, bool p_pressed, bool p_ queue_event(ev); }; + mouse_list.pressed[p_idx] = p_pressed; + if (p_use_as_mouse) { InputEvent ev; @@ -245,8 +247,6 @@ void OSIPhone::mouse_button(int p_idx, int p_x, int p_y, bool p_pressed, bool p_ ev.mouse_button.doubleclick = p_doubleclick; ev.mouse_button.pressed = p_pressed; - mouse_list.pressed[p_idx] = p_pressed; - queue_event(ev); }; }; |