Separate classes into headers

hrmorley34 · Jul 16, 2023 · b502f1e · b502f1e
1 parent 9bd626a
commit b502f1e
Show file tree

Hide file tree

Showing 30 changed files with 1,016 additions and 895 deletions.
diff --git a/images/scripts/imagedata.hpp b/images/scripts/imagedata.hpp
@@ -1,8 +1,8 @@
 #include "../imageclasses.hpp"
 #include "../card.hpp"
 
-#ifndef IMAGEDATA_H
-#define IMAGEDATA_H
+#ifndef GEN_IMAGEDATA_H
+#define GEN_IMAGEDATA_H
 
 #pragma region IMAGEDATA
 const Image CardImage;

diff --git a/src/card.hpp b/src/card.hpp
@@ -18,7 +18,7 @@ enum Colour : uint8_t
     Black = 1
 };
 
-Colour GetSuitColour(const Suit suit)
+inline Colour GetSuitColour(const Suit suit)
 {
     return (Colour)(suit >> 1);
 }
@@ -30,17 +30,11 @@ struct Card
 private:
     uint8_t ivalue; // 0bssrrrr for suit (0-3), rank (1-13)
 
-    void SetInternal(const Suit suit, const Rank rank)
-    {
-        ivalue = (uint8_t)suit << 4 | (uint8_t)rank;
-    }
-
 public:
-    Card() : ivalue(0) {}
+    Card()
+        : ivalue(0) {}
     Card(const Suit suit, const Rank rank)
-    {
-        SetInternal(suit, rank);
-    }
+        : ivalue((uint8_t)suit << 4 | (uint8_t)rank) {}
 
     bool operator==(const Card c) const
     {

diff --git a/src/cardclasses.cpp b/src/cardclasses.cpp
@@ -0,0 +1,4 @@
+#include "card.hpp"
+#include "cardcolumn.c.hpp"
+#include "cardll.c.hpp"
+#include "cardllpointer.hpp"
diff --git a/src/cardcolumn.c.hpp b/src/cardcolumn.c.hpp
@@ -0,0 +1,95 @@
+#include "cardcolumn.hpp"
+
+CardColumn::CardColumn() {}
+
+void CardColumn::PushLeft(const Card card)
+{
+    revealed.PushLeft(card);
+}
+
+void CardColumn::PushUnrevealed(const Card card)
+{
+    unrevealed.PushLeft(card);
+}
+
+void CardColumn::Reveal()
+{
+    if (!revealed.empty())
+        return;
+    if (unrevealed.empty())
+        return;
+    revealed.PushRight(unrevealed.PopLeft());
+}
+
+void CardColumn::MoveMany(int count, CardColumn *dest)
+{
+    revealed.MoveMany(count, &(dest->revealed));
+    Reveal();
+}
+// void CardColumn::MoveMany(int count, CardLL *dest)
+// {
+//     revealed.MoveMany(count, dest);
+//     Reveal();
+// }
+// void CardColumn::MoveManyFrom(int count, CardLL *src)
+// {
+//     src->MoveMany(count, &revealed);
+// }
+
+Card CardColumn::PopLeft()
+{
+    if (revealed.empty())
+        Reveal();
+    Card c = revealed.PopLeft();
+    Reveal();
+    return c;
+}
+
+Card CardColumn::Peek() const
+{
+    // if (revealed.empty())
+    //     Reveal();
+    return revealed.Peek();
+}
+
+Card CardColumn::PeekAt(const int index) const
+{
+    // if (revealed.empty())
+    //     Reveal();
+    return revealed.PeekAt(index);
+}
+
+int CardColumn::revealedlength() const
+{
+    return revealed.length();
+}
+
+int CardColumn::unrevealedlength() const
+{
+    return unrevealed.length();
+}
+
+bool CardColumn::empty() const
+{
+    return revealed.empty() && unrevealed.empty();
+}
+
+int CardColumn::WriteToArray(SaveData *const arr) const
+{
+    int length = unrevealed.WriteToArray(arr);
+    length += revealed.WriteToArray(arr + length);
+    return length;
+}
+
+int CardColumn::GetWriteLength() const
+{
+    return unrevealed.GetWriteLength() +
+           revealed.GetWriteLength();
+}
+
+int CardColumn::ReadFromArray(const SaveData *const arr)
+{
+    int length = unrevealed.ReadFromArray(arr);
+    length += revealed.ReadFromArray(arr + length);
+    return length;
+}
diff --git a/src/cardcolumn.hpp b/src/cardcolumn.hpp
@@ -12,99 +12,27 @@ class CardColumn
     CardLL unrevealed;
 
 public:
-    CardColumn() {}
+    CardColumn();
 
-    void PushLeft(const Card card)
-    {
-        revealed.PushLeft(card);
-    }
+    void PushLeft(const Card card);
+    void PushUnrevealed(const Card card);
+    void Reveal();
 
-    void PushUnrevealed(const Card card)
-    {
-        unrevealed.PushLeft(card);
-    }
+    void MoveMany(int count, CardColumn *dest);
+    // void MoveMany(int count, CardLL *dest);
+    // void MoveManyFrom(int count, CardLL *src);
 
-    void Reveal()
-    {
-        if (!revealed.empty())
-            return;
-        if (unrevealed.empty())
-            return;
-        revealed.PushRight(unrevealed.PopLeft());
-    }
+    Card PopLeft();
+    Card Peek() const;
+    Card PeekAt(const int index) const;
 
-    void MoveMany(int count, CardColumn *dest)
-    {
-        revealed.MoveMany(count, &(dest->revealed));
-        Reveal();
-    }
-    // void MoveMany(int count, CardLL *dest)
-    // {
-    //     revealed.MoveMany(count, dest);
-    //     Reveal();
-    // }
-    // void MoveManyFrom(int count, CardLL *src)
-    // {
-    //     src->MoveMany(count, &revealed);
-    // }
+    int revealedlength() const;
+    int unrevealedlength() const;
+    bool empty() const;
 
-    Card PopLeft()
-    {
-        if (revealed.empty())
-            Reveal();
-        Card c = revealed.PopLeft();
-        Reveal();
-        return c;
-    }
-
-    Card Peek() const
-    {
-        // if (revealed.empty())
-        //     Reveal();
-        return revealed.Peek();
-    }
-
-    Card PeekAt(const int index) const
-    {
-        // if (revealed.empty())
-        //     Reveal();
-        return revealed.PeekAt(index);
-    }
-
-    int revealedlength() const
-    {
-        return revealed.length();
-    }
-
-    int unrevealedlength() const
-    {
-        return unrevealed.length();
-    }
-
-    bool empty() const
-    {
-        return revealed.empty() && unrevealed.empty();
-    }
-
-    int WriteToArray(SaveData *const arr) const
-    {
-        int length = unrevealed.WriteToArray(arr);
-        length += revealed.WriteToArray(arr + length);
-        return length;
-    }
-
-    int GetWriteLength() const
-    {
-        return unrevealed.GetWriteLength() +
-               revealed.GetWriteLength();
-    }
-
-    int ReadFromArray(const SaveData *const arr)
-    {
-        int length = unrevealed.ReadFromArray(arr);
-        length += revealed.ReadFromArray(arr + length);
-        return length;
-    }
+    int WriteToArray(SaveData *const arr) const;
+    int GetWriteLength() const;
+    int ReadFromArray(const SaveData *const arr);
 };
 
 #endif