Added Chat Log

Merge pull request #2 from Kgamer77/message-system

Author: DaDev123

.gitignore

@@ -13,3 +13,4 @@ compile_commands.json
 
 Ultimate_SMO_Compiler.bat
 Makefile
+/.vs

include/debugMenu.hpp

@@ -18,4 +18,6 @@ extern sead::TextWriter *gTextWriter;
 
 bool setupDebugMenu(agl::DrawContext* context, sead::Viewport* viewport);
 
-void drawBackground(agl::DrawContext *context);
+void drawBackground(agl::DrawContext *context);
+
+void drawChatBackground(agl::DrawContext *context, float rows);

include/packets/MessagePacket.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "Packet.h"
+
+struct PACKED MessagePacket : Packet {
+    MessagePacket() : Packet() {
+        this->mType = PacketType::MESSAGE;
+        mPacketSize = sizeof(MessagePacket) - sizeof(Packet);
+    };
+
+    short senderId = 0;
+    short messageType = 0;
+    char message[MESSAGESIZE] = {};
+};

include/packets/Packet.h

@@ -9,6 +9,7 @@
 
 #define PACKBUFSIZE      0x30
 #define COSTUMEBUFSIZE   0x20
+#define MESSAGESIZE      0x4B
 
 #define MAXPACKSIZE      0x100
 
@@ -27,6 +28,7 @@ enum PacketType : short {
     CAPTUREINF,
     CHANGESTAGE,
     CMD,
+    MESSAGE,
     End // end of enum for bounds checking
 };
 
@@ -45,7 +47,8 @@ USED static const char *packetNames[] = {
     "Moon Collection",
     "Capture Info",
     "Change Stage",
-    "Server Command"
+    "Server Command",
+    "Message"
 };
 
 enum SenderType {
@@ -80,6 +83,7 @@ struct PACKED Packet {
 #include "packets/GameInf.h"
 #include "packets/TagInf.h"
 //#include "packets/FreezeInf.h"
+#include "packets/MessagePacket.h"
 #include "packets/CostumeInf.h"
 #include "packets/ServerCommand.h"
 #include "packets/ShineCollect.h"

include/server/Client.hpp

@@ -158,6 +158,8 @@ class Client {
     static sead::FixedSafeString<0x20> getUsername() { 
         return sInstance ? sInstance->mUsername : sead::FixedSafeString<0x20>::cEmptyString;
     }
+    static sead::FixedSafeString<MESSAGESIZE> getMessage(int index);
+    static void setMessage(int index, const char* message);
 
     // ===== SERVER CONFIGURATION =====
     static const int getCurrentPort();
@@ -223,6 +225,7 @@ class Client {
     void updateCaptureInfo(CaptureInf* packet);
     void sendToStage(ChangeStagePacket* packet);
     void disconnectPlayer(PlayerDC *packet);
+    void updateMessages(MessagePacket *packet);
 
     // ===== UTILITY METHODS =====
     PuppetInfo* findPuppetInfo(const nn::account::Uid& id, bool isFindAvailable);
@@ -247,6 +250,9 @@ class Client {
     int collectedShineCount = 0;
     int lastCollectedShine = -1;
 
+    // ===== MESSAGE MEMBERS =====
+    sead::SafeArray<sead::FixedSafeString<MESSAGESIZE>, 3> messages;
+
     // ===== PACKET BACKUPS =====
     PlayerInf lastPlayerInfPacket = PlayerInf();
     GameInf lastGameInfPacket = GameInf();

source/debugMenu.cpp

@@ -43,4 +43,17 @@ void drawBackground(agl::DrawContext *context) {
     agl::utl::DevTools::drawTriangleImm(context, p1, p2, p3, c);
     agl::utl::DevTools::drawTriangleImm(context, p3, p4, p2, c);
 
+}
+
+void drawChatBackground(agl::DrawContext* context, float rows) {
+    sead::Vector3<float> p1(-1, -.50 - 0.05 * rows, 0);   // top left
+    sead::Vector3<float> p2(-.2, -.50 - 0.05 * rows, 0);  // top right
+    sead::Vector3<float> p3(-1, -.7, 0);                  // bottom left
+    sead::Vector3<float> p4(-.2, -.7, 0);                 // bottom right
+    sead::Color4f c(.1, .1, .1, .7);
+
+    agl::utl::DevTools::beginDrawImm(context, sead::Matrix34<float>::ident,
+                                     sead::Matrix44<float>::ident);
+    agl::utl::DevTools::drawTriangleImm(context, p1, p2, p3, c);
+    agl::utl::DevTools::drawTriangleImm(context, p3, p4, p2, c);
 }

source/main.cpp

@@ -55,6 +55,7 @@
 // ===== GLOBAL VARIABLES =====
 static int pInfSendTimer = 0;
 static int gameInfSendTimer = 0;
+static int chatUpdateTimer = 0;
 static int debugPuppetIndex = 0;
 static int debugCaptureIndex = 0;
 static int pageIndex = 0;
@@ -90,6 +91,31 @@ void updatePlayerInfo(GameDataHolderAccessor holder, PlayerActorBase* playerBase
         gameInfSendTimer = 0;
     }
 
+    if (chatUpdateTimer >= 300)
+    {
+        if (!Client::getMessage(0).isEmpty())
+        {
+            Client::setMessage(0, "");
+        }
+        if (!Client::getMessage(1).isEmpty())
+        {
+            Client::setMessage(0, Client::getMessage(1).cstr());
+            Client::setMessage(1, "");
+        }
+        if (!Client::getMessage(2).isEmpty())
+        {
+            Client::setMessage(1, Client::getMessage(2).cstr());
+            Client::setMessage(2, "");
+        }
+        chatUpdateTimer = 0;
+    }
+    else if (!Client::getMessage(0).isEmpty() || !Client::getMessage(1).isEmpty() ||
+        !Client::getMessage(2).isEmpty())
+    {
+        chatUpdateTimer++;
+    }
+
+    
     pInfSendTimer++;
     gameInfSendTimer++;
 }
@@ -155,32 +181,32 @@ void drawMainHook(HakoniwaSequence* curSequence, sead::Viewport* viewport, sead:
     gTextWriter->printf("Your TCP status: %s\n", socket->getStateChar());
 
     sead::Heap* clientHeap = Client::getClientHeap();
-if (clientHeap) {
+    if (clientHeap) {
     sead::Heap* gmHeap = GameModeManager::instance()->getHeap();
-    if (gmHeap) {
-        // Validate heaps before using them
-        if (clientHeap->getSize() > 0 && gmHeap->getSize() > 0) {
-            size_t clientUsed = clientHeap->getSize() - clientHeap->getFreeSize();
-            size_t clientTotal = clientHeap->getSize();
-            size_t gmUsed = gmHeap->getSize() - gmHeap->getFreeSize();
-            size_t gmTotal = gmHeap->getSize();
+        if (gmHeap) {
+            // Validate heaps before using them
+            if (clientHeap->getSize() > 0 && gmHeap->getSize() > 0) {
+                size_t clientUsed = clientHeap->getSize() - clientHeap->getFreeSize();
+                size_t clientTotal = clientHeap->getSize();
+                size_t gmUsed = gmHeap->getSize() - gmHeap->getFreeSize();
+                size_t gmTotal = gmHeap->getSize();
 
-            gTextWriter->printf(
-                "Heap Use: %.1f/%.0f (Client) %.1f/%.0f (Gmode)\n",
-                0.0009765625 * clientUsed,
-                0.0009765625 * clientTotal,
-                0.0009765625 * gmUsed,
-                0.0009765625 * gmTotal
-            );
+                gTextWriter->printf(
+                    "Heap Use: %.1f/%.0f (Client) %.1f/%.0f (Gmode)\n",
+                    0.0009765625 * clientUsed,
+                    0.0009765625 * clientTotal,
+                    0.0009765625 * gmUsed,
+                    0.0009765625 * gmTotal
+                );
+            } else {
+                gTextWriter->printf("Heap Use: Invalid heap sizes\n");
+            }
         } else {
-            gTextWriter->printf("Heap Use: Invalid heap sizes\n");
+        gTextWriter->printf("Heap Use: GameMode heap unavailable\n");
         }
     } else {
-        gTextWriter->printf("Heap Use: GameMode heap unavailable\n");
+        gTextWriter->printf("Heap Use: Client heap unavailable\n");
     }
-} else {
-    gTextWriter->printf("Heap Use: Client heap unavailable\n");
-}
 
     gTextWriter->printf(
         "Queue Count: %d/%d (Send) %d/%d (Receive)\n",
@@ -221,6 +247,24 @@ if (clientHeap) {
         GameMode      gameMode     = GameModeManager::instance()->getGameMode();
         GameModeBase* gameModeBase = GameModeManager::instance()->getMode<GameModeBase>();
 
+        if (!(Client::getMessage(0) == Client::getMessage(1) &&
+              Client::getMessage(1) == Client::getMessage(2))) {
+            if (Client::getMessage(0) == Client::getMessage(1))
+                drawChatBackground((agl::DrawContext*)drawContext, 3.f);
+            else if (Client::getMessage(1).isEmpty())
+                drawChatBackground((agl::DrawContext*)drawContext, 2.f);
+            else
+                drawChatBackground((agl::DrawContext*)drawContext, 1.f);
+
+            gTextWriter->beginDraw();
+            gTextWriter->setCursorFromTopLeft(sead::Vector2f(10.f, (dispHeight * 7 / 10) + 60.f));
+            gTextWriter->setScaleFromFontHeight(15.f);
+
+            gTextWriter->printf("%s\n", Client::getMessage(0).cstr());
+            gTextWriter->printf("%s\n", Client::getMessage(1).cstr());
+            gTextWriter->printf("%s\n", Client::getMessage(2).cstr());
+        }
+
         gTextWriter->printf("(ZR ←)------------ Page %d/%d -------------(ZR →)\n", pageIndex + 1, maxPages);
 
         switch (pageIndex)

source/server/Client.cpp

@@ -48,6 +48,8 @@ Client::Client() {
 
     collectedShineCount = 0;
 
+    messages.fill(sead::FixedSafeString<MESSAGESIZE>());
+
     mShineArray.allocBuffer(100, nullptr); // max of 100 shine actors in buffer
 
     nn::account::GetLastOpenedUser(&mUserID);
@@ -406,6 +408,9 @@ void Client::readFunc() {
             case PacketType::SHINECOLL:
                 updateShineInfo((ShineCollect*)curPacket);
                 break;
+            case PacketType::MESSAGE:
+                updateMessages((MessagePacket*)curPacket);
+                break;
             case PacketType::PLAYERDC:
                 Logger::log("Received Player Disconnect!\n");
                 curPacket->mUserID.print();
@@ -1016,6 +1021,28 @@ void Client::updateGameInfo(GameInf *packet) {
     }
 }
 
+/**
+ * @brief
+ *
+ * @param packet
+ */
+void Client::updateMessages(MessagePacket* packet)
+{
+    if (!sInstance)
+    {
+        return;
+    }
+    
+    for (int i = 0; i < 3; i++)
+    {
+        if (sInstance->messages[i].isEmpty())
+        {
+            messages[i].append(packet->message);
+        }
+    }
+
+}
+
 /**
  * @brief 
  * 
@@ -1434,6 +1461,30 @@ void Client::clearArrays() {
     }
 }
 
+/**
+ * @brief
+ *
+ */
+sead::FixedSafeString<MESSAGESIZE> Client::getMessage(int index) {
+    if (!sInstance) {
+        return sead::FixedSafeString<MESSAGESIZE>();
+    }
+
+    return sInstance->messages[index];
+}
+
+/**
+ * @brief
+ *
+ */
+void Client::setMessage(int index, const char* message) {
+    if (!sInstance) {
+        return;
+    }
+
+    sInstance->messages[index] = message;
+}
+
 /**
  * @brief 
  *