Refactor costume handling: replaced CostumeSend with CostumeInf, updated packet handling, and improved string safety in CostumeInf constructor. Adjusted Makefile for debugging settings. Added Makefile to .gitignore.

Author: KleinTimmi

.gitignore

@@ -10,4 +10,5 @@ Custom Stage Builds/**
 
 compile_commands.json
 
-Ultimate_SMO_Compiler.bat
+Ultimate_SMO_Compiler.bat
+Makefile

Makefile

@@ -7,8 +7,8 @@ SMOVER ?= 100
 BUILDVER ?= 101 
 BUILDVERSTR ?= 1.3.0
 IP ?= 192.168.0.9 # ftp server ip (usually is switch's local IP)
-DEBUGLOG ?= 0 # defaults to disable debug logger 
-SERVERIP ?= 192.168.0.58 # put debug logger server IP here
+DEBUGLOG ?= 1 # defaults to disable debug logger 
+SERVERIP ?= 192.168.178.37 # put debug logger server IP here
 ISEMU ?= 0 # set to 1 to compile for emulators
 
 PROJNAME ?= StarlightBase

include/packets/CostumeInf.h

@@ -2,13 +2,21 @@
 
 #include "Packet.h"
 
+// Structure for sending/receiving costume information (Mod <-> Server)
 struct PACKED CostumeInf : Packet {
-    CostumeInf() : Packet() {this->mType = PacketType::COSTUMEINF;  mPacketSize = sizeof(CostumeInf) - sizeof(Packet);};
+    CostumeInf() : Packet() {
+        this->mType = PacketType::COSTUMEINF;
+        mPacketSize = sizeof(CostumeInf) - sizeof(Packet);
+    }
     CostumeInf(const char* body, const char* cap) : Packet() {
         this->mType = PacketType::COSTUMEINF;
         mPacketSize = sizeof(CostumeInf) - sizeof(Packet);
-        strcpy(bodyModel, body);
-        strcpy(capModel, cap);
+        if (body)
+            strncpy(bodyModel, body, COSTUMEBUFSIZE - 1);
+        bodyModel[COSTUMEBUFSIZE - 1] = '\0';
+        if (cap)
+            strncpy(capModel, cap, COSTUMEBUFSIZE - 1);
+        capModel[COSTUMEBUFSIZE - 1] = '\0';
     }
     char bodyModel[COSTUMEBUFSIZE] = {};
     char capModel[COSTUMEBUFSIZE] = {};

include/packets/CostumeSend.hpp

@@ -28,7 +28,6 @@ enum PacketType : short {
         CMD,            // = 12
         EXTRA,          // = 15
         HEALTH_COINS,   // = 16 
-        COSTUMESEND,    // = 17
         End             // end of enum for bounds checking
 };
 
@@ -48,8 +47,7 @@ USED static const char *packetNames[] = {
     "Change Stage",
     "Server Command",
     "Extras Packets (infCapDives & Noclip)",
-    "Health and Coins",
-    "Send Costume"
+    "Health and Coins"
 };
 
 enum SenderType {

include/packets/Packet.h

@@ -75,7 +75,6 @@
 #include "packets/PlayerInfPacket.h"
 #include "packets/ShineCollect.h"
 #include "packets/Extras.hpp"
-#include "packets/CostumeSend.hpp"
 
 
 #include "puppets/PuppetInfo.h"
@@ -242,7 +241,7 @@ class Client {
         void updateCaptureInfo(CaptureInf* packet);
         void sendToStage(ChangeStagePacket* packet);
         void handleExtrasPacket(ExtrasPacket* curPacket);
-        void handleCostumSend(CoustumeSend* curPacket);
+        void handleCostumSend(CostumeInf* curPacket);
 
         void disconnectPlayer(PlayerDC *packet);
 

include/server/Client.hpp

@@ -41,7 +41,6 @@
 
 #include "packets/Extras.h"
 #include "packets/Extras.hpp"
-#include "packets/CostumeSend.hpp"
 #include "server/ExtrasCode.hpp"
 
 static int pInfSendTimer = 0;
@@ -120,10 +119,16 @@ void updatePlayerInfo(GameDataHolderAccessor holder, PlayerActorBase* playerBase
 
         pInfSendTimer = 0;
     }
+        auto hakoniwaPlayer = static_cast<PlayerActorHakoniwa*>(playerBase);
 
-        handleNoclip(static_cast<PlayerActorHakoniwa*>(playerBase), gNoclip, isYukimaru);
-        handleInfiniteCapBounce(static_cast<PlayerActorHakoniwa*>(playerBase), gInfiniteCapBounce);
-        setOutfit(static_cast<PlayerActorHakoniwa*>(playerBase),BodyName, CapName);
+        handleNoclip(hakoniwaPlayer, gNoclip, isYukimaru);
+        handleInfiniteCapBounce(hakoniwaPlayer, gInfiniteCapBounce);
+        /*
+        if (hakoniwaPlayer && BodyName && CapName) {
+            setOutfit(hakoniwaPlayer, BodyName, CapName);
+        } else {
+            Logger::log("[ERROR] setOutfit: Nullpointer! player=%p, BodyName=%p, CapName=%p\n", hakoniwaPlayer, BodyName, CapName);
+        }*/
 
 }
 

source/main.cpp

@@ -7,6 +7,7 @@
 #include "packets/Packet.h"
 #include "packets/Extras.h"
 #include "packets/Extras.hpp"
+#include "packets/CostumeInf.h"
 
 #include "server/hns/HideAndSeekMode.hpp"
 #include "layouts/CustomMsg.h"
@@ -391,8 +392,9 @@ void Client::readFunc() {
             case PacketType::EXTRA:
                 handleExtrasPacket((ExtrasPacket*)curPacket);
                 break;
-            case PacketType::COSTUMESEND:
-                handleCostumSend((CoustumeSend*)curPacket);
+            case PacketType::COSTUMEINF:
+                handleCostumSend((CostumeInf*)curPacket);
+                updateCostumeInfo((CostumeInf*)curPacket);
                 break;
                 // Send relevant info packets when another client is connected
 
@@ -407,9 +409,6 @@ void Client::readFunc() {
                  if (lastCostumeInfPacket.mUserID == mUserID)
                      mSocket->send(&lastCostumeInfPacket);
 
-                break;
-            case PacketType::COSTUMEINF:
-                updateCostumeInfo((CostumeInf*)curPacket);
                 break;
             case PacketType::SHINECOLL:
                 updateShineInfo((ShineCollect*)curPacket);
@@ -900,7 +899,9 @@ void Client::updatePlayerConnect(PlayerConnect* packet) {
  * @param packet 
  */
 void Client::updateGameInfo(GameInf *packet) {
-
+Logger::log("Received GameInfo packet: size=%zu, type=%d, scenarioNo=%d, stageName=%s, is2D=%d\n",
+    sizeof(GameInf), packet->mType, packet->scenarioNo, packet->stageName, packet->is2D);
+    
     PuppetInfo* curInfo = findPuppetInfo(packet->mUserID, false);
 
     if (!curInfo) {
@@ -965,7 +966,7 @@ void Client::handleExtrasPacket(ExtrasPacket* curPacket) {
  * 
  * @param Packet
  */
-void Client::handleCostumSend(CoustumeSend* curPacket) {
+void Client::handleCostumSend(CostumeInf* curPacket) {
     if (!curPacket) {
         Logger::log("[ERROR] handleCostumSend: Received null packet\n");
         return;
@@ -976,8 +977,8 @@ void Client::handleCostumSend(CoustumeSend* curPacket) {
     extern const char* CapName;
 
     // Set the global costume variables
-    BodyName = curPacket->BodyName;
-    CapName = curPacket->CapName;
+    BodyName = curPacket->bodyModel;
+    CapName = curPacket->capModel;
 
     Logger::log("[DEBUG] handleCostumSend: Received costume - Body: %s, Cap: %s\n", 
                 BodyName ? BodyName : "null", CapName ? CapName : "null");