summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreduz <reduzio@gmail.com>2014-03-13 21:14:58 -0700
committerreduz <reduzio@gmail.com>2014-03-13 21:14:58 -0700
commite20e3c9525c2f0d5bb95e85138a8d88a0088d439 (patch)
tree9279508be90097f365d82212490a78764a80df2f
parentbdb5d68e77a0b2d8b06c469ee91d0d09cd4fb8db (diff)
parentc573adb8293dc53bf2ba17a0342b10f39965fbf5 (diff)
Merge pull request #198 from gamedevsam/master
Fixing compile error related to missing return value from input.cpp
-rw-r--r--core/os/input.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp
index e732eac323..d7c0d86d64 100644
--- a/core/os/input.cpp
+++ b/core/os/input.cpp
@@ -283,7 +283,7 @@ Point2 InputDefault::get_mouse_speed() const {
int InputDefault::get_mouse_button_mask() const {
- OS::get_singleton()->get_mouse_button_state();
+ return OS::get_singleton()->get_mouse_button_state();
}