asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/godotengine/godot

Browse source
This commit is contained in:
Juan Linietsky 2015-12-12 08:12:28 -03:00
commit a73cf7f794
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/variant_op.cpp
View file

@ -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;
}

4
platform/iphone/os_iphone.cpp
View file

@ -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);
};
};