From 36b81dcd9b4cfbcbe4925b140d44151c97e679d2 Mon Sep 17 00:00:00 2001
From: Thomas Edvalson <machin3@gmail.com>
Date: Mon, 7 Dec 2015 23:19:52 -0500
Subject: [PATCH] Add isKeypress to emu and fix docs

---
 include/cpp3ds/Window/Keyboard.hpp | 6 +-----
 src/cpp3ds/Window/Keyboard.cpp     | 2 +-
 src/emu3ds/Window/Keyboard.cpp     | 5 +++++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/cpp3ds/Window/Keyboard.hpp b/include/cpp3ds/Window/Keyboard.hpp
index 94032d1..5af2741 100644
--- a/include/cpp3ds/Window/Keyboard.hpp
+++ b/include/cpp3ds/Window/Keyboard.hpp
@@ -126,7 +126,7 @@ private:
 ///
 /// Usage example:
 /// \code
-/// if (cpp3ds::Keyboard::isKeyPressed(cpp3ds::Mouse, cpp3ds::Keyboard::Left))
+/// if (cpp3ds::Keyboard::isKeyPressed(cpp3ds::Keyboard::Left))
 /// {
 ///     // move left...
 /// }
@@ -134,10 +134,6 @@ private:
 /// {
 ///     // move right...
 /// }
-/// else if (cpp3ds::Keyboard::isKeyPressed(cpp3ds::Keyboard::Escape))
-/// {
-///     // quit...
-/// }
 /// \endcode
 ///
 /// \see cpp3ds::Joystick, cpp3ds::Touch
diff --git a/src/cpp3ds/Window/Keyboard.cpp b/src/cpp3ds/Window/Keyboard.cpp
index 695203e..dea2454 100644
--- a/src/cpp3ds/Window/Keyboard.cpp
+++ b/src/cpp3ds/Window/Keyboard.cpp
@@ -16,7 +16,7 @@ bool Keyboard::isKeyDown(Key key) {
 
 ////////////////////////////////////////////////////////////
 bool Keyboard::isKeyPressed(Key key) {
-	return (m_keysPressed& static_cast<u32>(key));
+	return (m_keysPressed & static_cast<u32>(key));
 }
 
 ////////////////////////////////////////////////////////////
diff --git a/src/emu3ds/Window/Keyboard.cpp b/src/emu3ds/Window/Keyboard.cpp
index 0f4728e..69df0a3 100644
--- a/src/emu3ds/Window/Keyboard.cpp
+++ b/src/emu3ds/Window/Keyboard.cpp
@@ -7,6 +7,11 @@ namespace cpp3ds {
 float Keyboard::m_slider3d     = 0;
 float Keyboard::m_sliderVolume = 0;
 
+////////////////////////////////////////////////////////////
+bool Keyboard::isKeyDown(Key key) {
+	return isKeyPressed(key);
+}
+
 ////////////////////////////////////////////////////////////
 bool Keyboard::isKeyPressed(Key key) {
 	return sf::Keyboard::isKeyPressed(static_cast<sf::Keyboard::Key>(key));