1 files changed, 78 insertions, 28 deletions

diff --git a/src/controller.c b/src/controller.c
index 5fb1e0b..4e488e9 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -1,46 +1,96 @@
+/*
+ * Copyright (c) 2021, Johnny Richard
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include <SDL.h>
 #include "controller.h"
 
 
-void 
-controller_update(controller_t *self, 
+void
+controller_update(controller_t *self,
                   SDL_Event    *event)
 {
   if (event->type == SDL_KEYDOWN) {
     switch (event->key.keysym.sym) {
-      case SDLK_UP:
-        self->up = true;
-        break;
-      case SDLK_DOWN:
-        self->down = true;
-        break;
-      case SDLK_LEFT:
-        self->left = true;
-        break;
-      case SDLK_RIGHT:
-        self->right = true;
-        break;
+    case SDLK_UP:
+      self->pressed_buttons |= BTN_UP;
+      break;
+    case SDLK_DOWN:
+      self->pressed_buttons |= BTN_DOWN;
+      break;
+    case SDLK_LEFT:
+      self->pressed_buttons |= BTN_LEFT;
+      break;
+    case SDLK_RIGHT:
+      self->pressed_buttons |= BTN_RIGHT;
+      break;
     }
   }
 
   if (event->type == SDL_KEYUP) {
     switch (event->key.keysym.sym) {
-      case SDLK_UP:
-        self->up = false;
-        break;
+    case SDLK_UP:
+      self->pressed_buttons ^= BTN_UP;
+      break;
+    case SDLK_DOWN:
+      self->pressed_buttons ^= BTN_DOWN;
+      break;
+    case SDLK_LEFT:
+      self->pressed_buttons ^= BTN_LEFT;
+      break;
+    case SDLK_RIGHT:
+      self->pressed_buttons ^= BTN_RIGHT;
+      break;
+    }
+  }
+}
 
-      case SDLK_DOWN:
-        self->down = false;
-        break;
+bool
+controller_is_up_pressed(controller_t *self)
+{
+  return self->pressed_buttons & BTN_UP;
+}
 
-      case SDLK_LEFT:
-        self->left = false;
-        break;
+bool
+controller_is_down_pressed(controller_t *self)
+{
+  return self->pressed_buttons & BTN_DOWN;
+}
 
-      case SDLK_RIGHT:
-        self->right = false;
-        break;
-    }
-  }
+bool
+controller_is_right_pressed(controller_t *self)
+{
+  return self->pressed_buttons & BTN_RIGHT;
 }
 
+bool
+controller_is_left_pressed(controller_t *self)
+{
+  return self->pressed_buttons & BTN_LEFT;
+}