Revert "Merge pull request #110 from thedax/master"

This reverts commit d2bdffcc54, reversing
changes made to 8f0d82ffb7.
This commit is contained in:
Henrik Rydgard committed 2013-08-20 15:04:42 +02:00
1 parent d2bdffcc54
commit d45ea84599
3 files changed
+3 -28

No files matched your search

-17
View File
@@ -1,6 +1,5 @@
#include "input/input_state.h"
#include "input/keycodes.h"
#include <vector>
const char *GetDeviceName(int deviceId) {
switch (deviceId) {
@@ -42,22 +41,6 @@ int MapPadButtonFixed(int keycode) {
}
}
std::vector<keycode_t> confirmKeys;
std::vector<keycode_t> cancelKeys;
void SetConfirmCancelKeys(std::vector<keycode_t> confirm, std::vector<keycode_t> cancel) {
confirmKeys = confirm;
cancelKeys = cancel;
}
void AddConfirmKey(keycode_t confirmKey) {
confirmKeys.push_back(confirmKey);
}
void AddCancelKey(keycode_t cancelKey) {
cancelKeys.push_back(cancelKey);
}
uint32_t ButtonTracker::Update() {
pad_buttons_ |= pad_buttons_async_set;
pad_buttons_ &= ~pad_buttons_async_clear;