From 0b971d7926871a9cb1c60e196a09e58992190d58 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 9 Aug 2012 21:44:59 +0000 Subject: [PATCH] input: allow to easily track more than one input stick. --- src/input/input.cpp | 8 ++++---- src/input/input.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/input/input.cpp b/src/input/input.cpp index 51776373..5637b28d 100644 --- a/src/input/input.cpp +++ b/src/input/input.cpp @@ -217,13 +217,13 @@ void Input::DestroyStick(Stick *stick) Ticker::Unref(stick); } -Stick *Input::TrackStick() +Stick *Input::TrackStick(int desired) { /* FIXME: add the possibility to choose amongst sticks */ - if (!data->m_sticks.Count()) + if (desired >= data->m_sticks.Count()) return NULL; - Ticker::Ref(data->m_sticks[0]); - return data->m_sticks[0]; + Ticker::Ref(data->m_sticks[desired]); + return data->m_sticks[desired]; } void Input::UntrackStick(Stick *stick) diff --git a/src/input/input.h b/src/input/input.h index 86652fc1..79b879db 100644 --- a/src/input/input.h +++ b/src/input/input.h @@ -49,7 +49,7 @@ public: static Stick *CreateStick(); static void DestroyStick(Stick *stick); - static Stick *TrackStick(); + static Stick *TrackStick(int desired); static void UntrackStick(Stick *stick); };