Cleaned up compiler warnings.

include/dawn/dawn.h

@@ -55,12 +55,12 @@
 #include "physics/aabb.h"
 
 // Poker Game Logic
-#include "poker/turn.h"
 #include "poker/bet.h"
 #include "poker/card.h"
 #include "poker/dealer.h"
 #include "poker/player.h"
 #include "poker/poker.h"
+#include "poker/turn.h"
 #include "poker/winner.h"
 
 // User Interface Objects

platform/glfw/glwfwplatform.c

@@ -132,6 +132,6 @@ void glfwOnError(int error, const char* description) {
 
 void glfwOnCursor(GLFWwindow *window, double x, double y) {
   input_t *input = &GAME_STATE->engine.input;
-  input->buffer[INPUT_MOUSE_X] = x;
+  input->buffer[INPUT_MOUSE_X] = (float)x;
-  input->buffer[INPUT_MOUSE_Y] = y;
+  input->buffer[INPUT_MOUSE_Y] = (float)y;
 }

src/display/debug/grid.c

@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "grid.h"
-
-griddebug_t * gridDebugCreate() {
-  griddebug_t *grid = malloc(sizeof(griddebug_t));
-
-  float vertices[GRID_VERTICE_COUNT];
-  indice_t indices[GRID_INDICE_COUNT];
-
-  float overall = GRID_COLUMN_ROWS_SIZE*GRID_COLUMN_ROWS;
-  float off = overall/2.0;
-
-  int32_t i = 0;
-  for (int32_t y = 0; y <= GRID_COLUMN_ROWS; ++y) {
-    for (int32_t x = 0; x <= GRID_COLUMN_ROWS; ++x) {
-      float fx = ((float)x/(float)GRID_COLUMN_ROWS) * overall;
-      float fy = ((float)y/(float)GRID_COLUMN_ROWS) * overall;
-
-      vertices[i] = off - fx, vertices[i+1] = 0, vertices[i+2] = off - fy;
-      i += 3;
-    }
-  }
-
-  i = 0;
-  for (int32_t y = 0; y < GRID_COLUMN_ROWS; ++y) {
-    for (int32_t x = 0; x < GRID_COLUMN_ROWS; ++x) {
-      int row1 = y * (GRID_COLUMN_ROWS+1);
-      int row2 = (y+1) * (GRID_COLUMN_ROWS+1);
-
-      // Line 0
-      indices[i+0] = (indice_t)(row1+x);
-      indices[i+1] = (indice_t)(row1+x+1);
-
-      // Line 1
-      indices[i+2] = (indice_t)(row1+x+1);
-      indices[i+3] = (indice_t)(row2+x+1);
-
-      // Line 3
-      indices[i+4] = (indice_t)(row1+x);
-      indices[i+5] = (indice_t)(row2+x);
-
-      // Line 4
-      indices[i+6] = (indice_t)(row2+x);
-      indices[i+7] = (indice_t)(row2+x+1);
-      i += 8;
-    }
-  }
-
-  glGenBuffers(1, &grid->vertexBuffer);
-  glBindBuffer(GL_ARRAY_BUFFER, grid->vertexBuffer);
-  glBufferData(GL_ARRAY_BUFFER,
-    GRID_VERTICE_COUNT*sizeof(float), vertices, GL_STATIC_DRAW
-  );
-
-  glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, 0);
-  glEnableVertexAttribArray(0);
-  
-  glGenBuffers(1, &grid->indexBuffer);
-  glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, grid->indexBuffer);
-  glBufferData(GL_ELEMENT_ARRAY_BUFFER,
-    GRID_INDICE_COUNT * sizeof(indice_t), indices, GL_STATIC_DRAW
-  );
-
-  return grid;
-}
-
-void gridDebugRender(griddebug_t *grid) {
-  glBindBuffer(GL_ARRAY_BUFFER, grid->vertexBuffer);
-  glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, grid->indexBuffer);
-  
-  glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, 0);
-  glEnableVertexAttribArray(0);
-  glDrawElements(GL_LINES, GRID_INDICE_COUNT, GL_UNSIGNED_INT, 0);
-}
-
-void gridDebugDispose(griddebug_t *grid) {
-  free(grid);
-}

src/display/debug/grid.h

@@ -1,33 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include <dawn/dawn.h>
-
-/**
- * Create a grid debug tool.
- * 
- * @return Grid Debug tool.
- * @deprecated
- */
-griddebug_t * gridDebugCreate();
-
-/**
- * Render a grid debug tool.
- * 
- * @param grid Grid debug tool to render.
- * @deprecated
- */
-void gridDebugRender(griddebug_t *grid);
-
-/**
- * Dispose a previously created grid debug tool
- * 
- * @param grid Grid tool to clean up.
- * @deprecated
- */
-void gridDebugDispose(griddebug_t *grid);

src/display/framebuffer.c

@@ -60,7 +60,7 @@ void frameBufferResize(framebuffer_t *frameBuffer,int32_t width,int32_t height){
 
 void frameBufferUnbind(render_t *render, bool clear) {
   glBindFramebuffer(GL_FRAMEBUFFER, 0);
-  glViewport(0, 0, render->width, render->height);
+  glViewport(0, 0, (GLsizei)render->width, (GLsizei)render->height);
 
   if(clear) {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

src/game/poker/actions/start.h

@@ -12,6 +12,7 @@
 #include "../../../poker/actions/match.h"
 #include "../discussion/pokerdiscussion.h"
 #include "action.h"
+#include "round.h"
 
 void _pokerGameActionStartOnStart(
   queue_t *queue, queueaction_t *action, uint8_t i
@@ -26,4 +27,4 @@ void _pokerGameActionStartOnEnd(queue_t *queue,queueaction_t *action,uint8_t i);
  * @param game Game to add to.
  * @return The queued action.
  */
-queueaction_t * pokerGameAcionStartAdd(pokergame_t *game);
+queueaction_t * pokerGameActionStartAdd(pokergame_t *game);

src/game/poker/pokergame.h

@@ -14,6 +14,7 @@
 #include "actions/start.h"
 #include "pokerui.h"
 #include "pokerrender.h"
+#include "actions/start.h"
 
 #include "../../ui/frame.h"
 #include "../../physics/aabb.h"

src/poker/actions/match.h

@@ -6,6 +6,7 @@
 #pragma once
 #include <dawn/dawn.h>
 #include "../../display/animation/queue.h"
+#include "../bet.h"
 
 /** Callback for when the poker match aciton starts */
 void _pokerActionMatchOnStart(queue_t *queue, queueaction_t *action, uint8_t i);