From b1b441cef97f00dee6425f8fab692640cca2c393 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Tue, 24 Aug 2021 10:07:04 -0700
Subject: [PATCH] Added rewind method.

---
 include/dawn/game/poker/pokergame.h       |  4 ++++
 include/dawn/game/poker/pokergameaction.h |  5 ++---
 src/display/animation/queue.c             | 11 +++--------
 src/game/poker/actions/bet.c              |  1 -
 src/game/poker/actions/look.c             |  9 +++++----
 src/util/array.c                          | 18 ++++++++++++++++++
 src/util/array.h                          | 17 ++++++++++++++++-
 7 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/include/dawn/game/poker/pokergame.h b/include/dawn/game/poker/pokergame.h
index bd80315c..081e326f 100644
--- a/include/dawn/game/poker/pokergame.h
+++ b/include/dawn/game/poker/pokergame.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "../../libs.h"
+#include "../../display/animation/queue.h"
 #include "pokergameassets.h"
 #include "pokerworld.h"
 #include "pokerui.h"
@@ -44,4 +45,7 @@ typedef struct {
 
   /** UI For the Game */
   pokerui_t ui;
+
+  /** Data for the actions */
+  pokergameactiondata_t actionData[ANIMATION_QUEUE_ITEM_MAX];
 } pokergame_t;
\ No newline at end of file
diff --git a/include/dawn/game/poker/pokergameaction.h b/include/dawn/game/poker/pokergameaction.h
index 07072ad9..25e3ebe9 100644
--- a/include/dawn/game/poker/pokergameaction.h
+++ b/include/dawn/game/poker/pokergameaction.h
@@ -10,6 +10,5 @@
 
 
 typedef struct {
-  pokergame_t *game;
-  uint8_t player;
-} pokergameactionlook_t;
\ No newline at end of file
+  uint8_t lookAtPlayer;
+} pokergameactiondata_t;
\ No newline at end of file
diff --git a/src/display/animation/queue.c b/src/display/animation/queue.c
index d02a23a8..6741f285 100644
--- a/src/display/animation/queue.c
+++ b/src/display/animation/queue.c
@@ -67,21 +67,16 @@ void queueDispose(queue_t *queue) {
 
 void queueRestack(queue_t *queue) {
   uint8_t i;
-  queueaction_t items[ANIMATION_QUEUE_ITEM_MAX];
 
-  // Take the current queue and copy it.
-  arrayCopy(sizeof(queueaction_t),
-    queue->items+queue->current, queue->count - queue->current,
-    items
+  // Rewind the array.
+  arrayRewind(sizeof(queueaction_t), queue->items, ANIMATION_QUEUE_START,
+    queue->current, queue->count
   );
 
   // Now rewind the stack
   queue->count -= queue->current;
   queue->current = 0;
 
-  // Now copy back
-  arrayCopy(sizeof(queueaction_t), items, queue->count, queue->items);
-
   // Now fix indexes
   for(i = 0; i < queue->count; i++) {
     queue->items[i].index = i;
diff --git a/src/game/poker/actions/bet.c b/src/game/poker/actions/bet.c
index 50b092c1..f9fdb2b3 100644
--- a/src/game/poker/actions/bet.c
+++ b/src/game/poker/actions/bet.c
@@ -16,7 +16,6 @@ void _pokerGameActionBetOnUpdate(
   pokergame_t *game = (pokergame_t *)action->data;
   pokerplayer_t *player;
 
-
   // As of right now the queue should basically be empty besides this item, so
   // let's restack
   queueRestack(queue);
diff --git a/src/game/poker/actions/look.c b/src/game/poker/actions/look.c
index 43cd029e..ce16a892 100644
--- a/src/game/poker/actions/look.c
+++ b/src/game/poker/actions/look.c
@@ -10,15 +10,16 @@
 
 void _pokerGameActionLookOnStart(
   queue_t *queue, queueaction_t *action, uint8_t i
-) {
-
-  printf("Looking at %u\n", (uint8_t)action->data);
-  pokerWorldLookAtPlayer(action);
+) { 
+  pokergame_t *game = (pokergame_t *)action->data;
+  pokergameactiondata_t *data = game->actionData + i;
+  printf("Looking at %u\n", data->lookAtPlayer);
   queueNext(queue);
 }
 
 queueaction_t * pokerGameActionLookAdd(pokergame_t *game, uint8_t playerIndex) {
   queueaction_t *action = pokerGameActionAdd(game);
   action->onStart = &_pokerGameActionLookOnStart;
+  game->actionData[action->index].lookAtPlayer = playerIndex;
   return action;
 }
\ No newline at end of file
diff --git a/src/util/array.c b/src/util/array.c
index 77f32d3c..9a54084f 100644
--- a/src/util/array.c
+++ b/src/util/array.c
@@ -86,4 +86,22 @@ int32_t arrayFindString(char **array, int32_t arrayLength, char *value) {
     if(strcmp(array[i], value) == 0) return i;
   }
   return -1;
+}
+
+void arrayRewind(size_t size, void *source, int32_t length, int32_t start,
+  int32_t count
+) {
+  if(count == -1) count = length - start;
+
+  // Create a temporary new array to house the data.
+  void *temporary = malloc(size * count);
+  
+  // Copy the data from the source to the temporary array.
+  arrayCopy(size, arrayGet(size, source, start), count, temporary);
+
+  // Now copy the data back to the source array.
+  arrayCopy(size, temporary, count, source);
+
+  // Cleanup the temporary array.
+  free(temporary);
 }
\ No newline at end of file
diff --git a/src/util/array.h b/src/util/array.h
index b8f95458..43323a6a 100644
--- a/src/util/array.h
+++ b/src/util/array.h
@@ -99,4 +99,19 @@ int32_t _arraySorterUint8(const void* left, const void* right);
  * @param value The value to search for.
  * @return The index that the strings exists within the array.
  */
-int32_t arrayFindString(char **array, int32_t arrayLength, char *value);
\ No newline at end of file
+int32_t arrayFindString(char **array, int32_t arrayLength, char *value);
+
+/**
+ * Rewinds an array backwards. This is used to take an array that has some data
+ * used towards the end of an array, but the data near the start is no longer
+ * used. This will take the end data and put it back at the start.
+ * 
+ * @param size The size of each element within the array.
+ * @param source The array itself.
+ * @param length The total length of the array.
+ * @param start The first index within the array that you want to keep.
+ * @param count Count of items after start to use. Use -1 to take the remaining.
+ */
+void arrayRewind(size_t size, void *source, int32_t length, int32_t start,
+  int32_t end
+);
\ No newline at end of file