Players work now so thats cool

Author: Finnerex

src/collide.c

@@ -29,13 +29,12 @@ void collideballs(ball_data* ball1, ball_data* ball2) {
 
 }
 
-int num_stripes = 7;
-int num_solids = 7;
 
-void check_pockets(ball_data* ball) {
 
-    static const int pocket_x[] = {15, LCD_WIDTH / 2, LCD_WIDTH - 15, 15,                LCD_WIDTH / 2,     LCD_WIDTH - 15};
-    static const int pocket_y[] = {15, 10,            15,             TABLE_HEIGHT - 15, TABLE_HEIGHT - 10, TABLE_HEIGHT - 15};
+void check_pockets(ball_data* ball, bool* next_turn, int* num_solids, int* num_stripes, bool is_player_1_turn, gfx_sprite_t** player_1_type) {
+
+    static const int pocket_x[] = {14, LCD_WIDTH / 2, LCD_WIDTH - 14, 14,                LCD_WIDTH / 2,     LCD_WIDTH - 14};
+    static const int pocket_y[] = {14, 10,            14,             TABLE_HEIGHT - 14, TABLE_HEIGHT - 10, TABLE_HEIGHT - 14};
     static int next_pocketed_x = 8;
 
     for (int i = 0; i < 6; i++) {
@@ -58,7 +57,13 @@ void check_pockets(ball_data* ball) {
 
             } else {
 
-                (ball->sprite == stripe) ? num_stripes-- : num_solids-- ;
+                if (*player_1_type == NULL)
+                    *player_1_type = (is_player_1_turn) ? ball->sprite : (ball->sprite == solid) ? stripe : solid;
+
+                if ((*player_1_type == ball->sprite && is_player_1_turn) || (*player_1_type != ball->sprite && !is_player_1_turn))
+                    *next_turn = true;
+
+                (ball->sprite == stripe) ? *num_stripes-- : *num_solids-- ;
 
                 ball->x = next_pocketed_x;
                 ball->y = TABLE_HEIGHT + 8;

src/collide.h

@@ -33,7 +33,7 @@ typedef struct cue_data {
 void collideballs(ball_data* ball1, ball_data* ball2);
 void collidewalls(ball_data* ball);
 
-void check_pockets(ball_data* ball);
+void check_pockets(ball_data* ball, bool* next_turn, int* num_solids, int* num_stripes, bool is_player_1_turn, gfx_sprite_t** player_1_type);
 
 float time_of_collision(ball_data *ball1, ball_data *ball2);
 

src/draw.c

@@ -93,4 +93,22 @@ float closest_pos(float x, float y, float o_x, float o_y, float min_distance, fl
 
     return min_distance;
 
+}
+
+void draw_players(gfx_sprite_t* player_1_type, bool is_player_1_turn) {
+    gfx_SetColor(3);
+    gfx_SetTextFGColor(3);
+    gfx_PrintStringXY("Player 1", 8, TABLE_HEIGHT + 20);
+    gfx_PrintStringXY("Player 2", LCD_WIDTH - 60, TABLE_HEIGHT + 20);
+
+    if (player_1_type != NULL) {
+        gfx_TransparentSprite_NoClip(player_1_type, 66, TABLE_HEIGHT + 19);
+        gfx_TransparentSprite_NoClip((player_1_type == solid) ? stripe : solid, LCD_WIDTH - 72, TABLE_HEIGHT + 19);
+    }
+
+    if (is_player_1_turn)
+        gfx_Line_NoClip(8, TABLE_HEIGHT + 30, 60, TABLE_HEIGHT + 30);
+    else
+        gfx_Line_NoClip(LCD_WIDTH - 60, TABLE_HEIGHT + 30, LCD_WIDTH - 8, TABLE_HEIGHT + 30);
+    
 }

src/draw.h

@@ -16,6 +16,8 @@ float closest_pos(float x, float y, float o_x, float o_y, float min_distance, fl
 
 void draw_setup(ball_data balls[16], cue_data* queue);
 
+void draw_players(gfx_sprite_t* player_1_type, bool is_player_1_turn);
+
 #if __cplusplus
 }
 #endif

src/main.c

@@ -26,6 +26,16 @@ ball_data balls[16];
 enum gamestates{start, setup, animate, run};
 int gamestate = setup;
 
+bool start_of_setup = false;
+
+// player turns
+bool is_player_1_turn = true;
+bool extra_turn = false;
+gfx_sprite_t* player_1_type = NULL;
+
+int num_stripes = 7;
+int num_solids = 7;
+
 // frame for animation of cue
 int frame = 0;
 
@@ -89,13 +99,26 @@ bool step(void) {
 
     if (gamestate == setup) {
 
-        // scratch
-        if (balls[15].pocketed) {
-            balls[15].x = 67;
-            balls[15].y = 81;
-            balls[15].pocketed = false;
+        if (start_of_setup) {
+
+            if (balls[15].pocketed) { // scratch
+                balls[15].x = 67;
+                balls[15].y = 81;
+                balls[15].pocketed = false;
+                extra_turn = false;
+            }
+
+            // if player sunk own ball, dont switch  
+            if (!extra_turn)
+                is_player_1_turn = !is_player_1_turn;
+            else
+                extra_turn = false;
+
+            start_of_setup = false;
         }
 
+        
+
         // speed multiplier for power and angle
         if (kb_Data[1] & kb_2nd) {
             speedmult = 4;
@@ -160,7 +183,7 @@ bool step(void) {
                 balls[i].y -= balls[i].vy;
             }
 
-            check_pockets(&balls[i]);
+            check_pockets(&balls[i], &extra_turn, &num_solids, &num_stripes, is_player_1_turn, &player_1_type);
 
             collidewalls(&balls[i]); // this jawn worked well enough without multiple per frame
 
@@ -179,8 +202,10 @@ bool step(void) {
         }
 
         // if the counter it equal to the number of balls, end the run state
-        if (num_stopped == 16) 
+        if (num_stopped == 16) {
             gamestate = setup;
+            start_of_setup = true;
+        }
 
     } 
 
@@ -206,6 +231,10 @@ void draw(void) {
     // for (int i = 0; i < 6; i++) {
     //     gfx_Circle(pocket_x[i], pocket_y[i], 8);
     // }
+    
+
+    // draw player stuff
+    draw_players(player_1_type, is_player_1_turn);
 
     // draw balls
     for (int i = 0; i < 16; i++) {