From 6c391f1c9772d19c93a7d6148e09cef0de108304 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Mon, 15 Aug 2016 01:55:58 +0200
Subject: oops forgot gamepad

---
 controller.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/controller.lua b/controller.lua
index 1ef3a1a..982e5c7 100644
--- a/controller.lua
+++ b/controller.lua
@@ -56,13 +56,14 @@ function Controller.testControl(set, key, joystick)
 		end
 	end
 end
---love.keyboard.isDown(set[action])
---set.joystick:isGamepadDown(set[action])
+
 -- Checks if given action of given set is down
 function Controller.isDown(set, action)
 	if set ~= nil then
 		if set.joystick == nil then
 			return love.keyboard.isDown(set[action])
+		else
+			return set.joystick:isGamepadDown(set[action])
 		end
 	end
 end
-- 
cgit v1.1