added btn enum

elmaxe · Dec 6, 2018 · 1523e6b · 1523e6b
1 parent 0890c27
commit 1523e6b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/src/game_logic.c b/src/game_logic.c
@@ -48,21 +48,21 @@ void move_dino(Dino *dino) {
   // If in jump and jump button not pressed, high down accel.
   if (round(dino->y_pos) != DINO_BASE_POS) {
     // If duck button pressed even higher down accel.
-    if ((getbtns() & 0x2) >> 1) {
+    if ((is_pressed(BTN3)) >> 1) {
       dino->y_accel = DINO_DUCK_ACCEL;
     } else {
       dino->y_accel = DINO_REG_ACCEL;
     }
   }
   // If jump button pressed, low down accel.
-  if ((getbtns() & 0x4) >> 2) {
+  if ((is_pressed(BTN4) & 0x4) >> 2) {
     jump_dino(dino);
     if (round(dino->y_pos) != DINO_BASE_POS) {
       dino->y_accel = DINO_JUMP_ACCEL;
     }
   }
   // If duck button pressed point graphic to duck graphic
-  if ((getbtns() & 0x2) >> 1) {
+  if ((is_pressed(BTN3) & 0x2) >> 1) {
     dino->sprite.graphic = &dino_graphic_duck;
   } else {
     dino->sprite.graphic = &dino_graphic;

diff --git a/src/input.c b/src/input.c
@@ -22,3 +22,14 @@ int getbtns(void){
   input &= 0x7;
   return input;
 }
+
+int is_pressed(Button btn) {
+  switch (btn) {
+    case BTN2:
+      return getbtns() & 0x1;
+    case BTN3:
+      return (getbtns() & 0x2) >> 1;
+    case BTN4:
+      return (getbtns() & 0x4) >> 2;
+  }
+}
diff --git a/src/input.h b/src/input.h
@@ -5,5 +5,9 @@
    For copyright and licensing, see file COPYING
 */
 
-int getbtns();
+typedef enum Button {
+  BTN2, BTN3, BTN4
+} Button;
+
+int is_pressed();
 int getsw();
diff --git a/src/loop.c b/src/loop.c
@@ -57,21 +57,20 @@ void loop() {
     pixelbuffer_to_buffer();
     clear_pixelbuffer();
     display_buffer();
+    if (is_pressed(BTN2)) {
+      GAME_STATE = 1;
+      srand(seed);
+    }
     /*
-    display_string(0, "Dinosaur Run");
+    display_string(0, "Dino Run");
     display_string(1, "by M.Wesslen");
     display_string(2, "and A.Elmarsson");
     display_string(3, "Press any button");
     display_textbuffer();*/
-  } else {
+  } else if (GAME_STATE == 2){
     update_game_state();
     update_graphics();
   }
-
-  if (getbtns() & 0x1) {
-    GAME_STATE = 1;
-    srand(seed);
-  }
   quicksleep(150000);
 }