Merge pull request #1 from Kgamer77/main

Fixed setoutfit command

Author: KleinTimmi

include/packets/ChangeCostume.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Packet.h"
+
+struct PACKED ChangeCostume : Packet {
+    ChangeCostume() : Packet() {
+        this->mType = PacketType::CHANGECOSTUME;
+        mPacketSize = sizeof(ChangeCostume) - sizeof(Packet);
+    };
+    ChangeCostume(const char* body, const char* cap) : Packet() {
+        this->mType = PacketType::CHANGECOSTUME;
+        mPacketSize = sizeof(ChangeCostume) - sizeof(Packet);
+        strcpy(bodyModel, body);
+        strcpy(capModel, cap);
+    }
+    char bodyModel[COSTUMEBUFSIZE] = {};
+    char capModel[COSTUMEBUFSIZE] = {};
+};

include/packets/Packet.h

@@ -28,6 +28,8 @@ enum PacketType : short {
         CMD,            // = 12
         EXTRA,          // = 15
         HEALTH_COINS,   // = 16 
+        MODS,           // = 17 
+        CHANGECOSTUME,  // = 18 
         End             // end of enum for bounds checking
 };
 

include/server/Client.hpp

@@ -75,6 +75,7 @@
 #include "packets/PlayerInfPacket.h"
 #include "packets/ShineCollect.h"
 #include "packets/Extras.hpp"
+#include "packets/ChangeCostume.h"
 
 
 #include "puppets/PuppetInfo.h"
@@ -239,6 +240,7 @@ class Client {
         void updateHackCapInfo(HackCapInf *packet);
         void updateGameInfo(GameInf *packet);
         void updateCostumeInfo(CostumeInf *packet);
+        void changeCostume(ChangeCostume* packet);
         void updateShineInfo(ShineCollect *packet);
         void updatePlayerConnect(PlayerConnect *packet);
         void updateCaptureInfo(CaptureInf* packet);

source/server/Client.cpp

@@ -409,6 +409,9 @@ void Client::readFunc() {
             case PacketType::COSTUMEINF:
                 updateCostumeInfo((CostumeInf*)curPacket);
                 break;
+            case PacketType::CHANGECOSTUME:
+                changeCostume((ChangeCostume*)curPacket);
+                break;
             case PacketType::SHINECOLL:
                 updateShineInfo((ShineCollect*)curPacket);
                 break;
@@ -850,6 +853,21 @@ void Client::updateCostumeInfo(CostumeInf *packet) {
     strcpy(curInfo->costumeHead, packet->capModel);
 }
 
+/**
+ * @brief
+ *
+ * @param packet
+ */
+void Client::changeCostume(ChangeCostume* packet) {
+    
+    // Set outfit when costume info is received
+    if (sInstance) {
+        GameDataFunction::wearCostume(sInstance->mHolder, packet->bodyModel);
+        GameDataFunction::wearCap(sInstance->mHolder, packet->capModel);
+        Logger::log("Set outfit from costume packet: Body=%s, Cap=%s\n", packet->bodyModel, packet->capModel);
+    }
+}
+
 /**
  * @brief 
  *