refactor: replace manual dynamic allocation with smart pointers

Author: LuisOtavio13

src/Main.cpp

@@ -8,17 +8,16 @@
 #include <game_sa/CPlayerPed.h>
 #include <game_sa/CTimer.h>
 #include "../utils/log.h"
-#include "events/ProcessEvent.hpp"
+#include "./events/ProcessEvent.hpp"
 #include <iostream>
 #include <string>
 #include <fstream>
-#include <sstream> // Para stringstream
-
-// Função auxiliar para converter qualquer tipo para string
+#include <sstream> 
+#include "./global/Name.hpp"
 
 
 ServerSocket* g_Server = nullptr;
-
+std::string nome = "";
 using namespace plugin;
 
 class JumpDetectorPlugin
@@ -69,7 +68,7 @@ class JumpDetectorPlugin
            writeLog("ERRO: playerPed é NULL!");
        }
 
-       // Ler nome
+       
        writeLog("Tentando ler name.txt...");
        std::ifstream arquivo("name.txt");
        std::string name;
@@ -84,6 +83,7 @@ class JumpDetectorPlugin
            arquivo.close();
            return;
        }
+       nome = name;
        arquivo.close();
        writeLog("name.txt lido com sucesso: '" + name + "'");
 

src/events/ProcessEvent.cpp

@@ -2,17 +2,18 @@
 #include "./onPlayerJump/onPlayerJump.hpp"
 #include "../../utils/log.h"
 #include "./onMove/onMove.hpp"
+#include <memory>
 
 #if PROCESSEVENT
 
 void ProcessEvent::create()
 {
     if (m_cj)
     {
-        m_jumpEvent = new CEventOnPlayerJump(m_cj);
-        m_deadEvent = new onPlayerDead(m_cj);
-        m_damageEvent = new onPlayerDamage(m_cj, server);
-        onmove = new onMove(m_cj);
+        m_jumpEvent = std::make_shared<CEventOnPlayerJump>(m_cj);
+        m_deadEvent = std::make_unique<onPlayerDead>(m_cj);
+        m_damageEvent = std::make_unique<onPlayerDamage>(m_cj);
+        onmove = std::make_unique<onMove>(m_cj);
     }
     cjA = nullptr;
 }
@@ -32,7 +33,7 @@ void ProcessEvent::execute()
             CPed *playerPed = FindPlayerPed();
             if (playerPed && !m_jumpEvent)
             {
-                m_jumpEvent = new CEventOnPlayerJump(playerPed);
+                m_jumpEvent = std::make_shared<CEventOnPlayerJump>(playerPed);
                 if (m_jumpEvent)
                 {
 
@@ -57,9 +58,6 @@ void ProcessEvent::execute()
 
 ProcessEvent::~ProcessEvent()
 {
-    if (m_jumpEvent) 
-    {
-        delete m_jumpEvent;
-    }
+    
 }
 #endif

src/events/ProcessEvent.hpp

@@ -5,7 +5,7 @@
 #include "./onPlayerDead/onPlayerDead.hpp"
 #include "./onPlayerDamage/onPlayerDamage.hpp"
 #include "./onMove/onMove.hpp"
-
+#include <memory>
 
 #define PROCESSEVENT 1
 
@@ -15,12 +15,15 @@ class ProcessEvent {
 
     private:
         CPed* m_cj;
-        ServerSocket* server;
         CPed* cjA;
-        CEventOnPlayerJump* m_jumpEvent;
-        onPlayerDead* m_deadEvent;
-        onPlayerDamage* m_damageEvent;
-        onMove* onmove;
+
+        std::unique_ptr<ServerSocket> server;
+
+        std::shared_ptr<CEventOnPlayerJump> m_jumpEvent;
+        std::unique_ptr<onPlayerDead> m_deadEvent;
+        std::unique_ptr<onPlayerDamage> m_damageEvent;
+        std::unique_ptr<onMove> onmove;
+
         unsigned int m_lastStatsTime;
         int m_jumpCount;
         bool m_initialized;

src/events/hook_base.hpp

@@ -0,0 +1,20 @@
+
+#ifndef HOOK_BASE
+#define HOOK_BASE
+
+#include <plugin.h>
+
+class hook_base
+{
+private:
+    CPed* cj;
+public:
+    hook_base();
+    ~hook_base();
+    void run();
+};
+
+
+
+
+#endif

src/events/onMove/onMove.cpp

@@ -7,7 +7,8 @@
 #include "../../../utils/log.h"
 #include <iostream>
 #include <string>
-#if onMoveDefine
+#include "../../global/Name.hpp"
+
 
 onMove::~onMove() {}
 
@@ -17,11 +18,7 @@ void onMove::run(CPed *cja)
     if (!cja)
         return;
 
-    std::ifstream arquivo("name.txt");
-
-    std::string name;
-    std::getline(arquivo, name);
-    arquivo.close();
+    
     CVector currentPos = cja->GetPosition();
 
     float currentX, currentY, currentZ;
@@ -52,7 +49,7 @@ void onMove::run(CPed *cja)
 
         if (g_Server)
         {
-            std::string msg = "onMovimentPlayer::"+ name + "::" + std::to_string(currentPos.x) + "::" + std::to_string(currentPos.y) + "::" + std::to_string(currentPos.z) + "::" + std::to_string(lastX) + "::" + std::to_string(lastY) + "::" + std::to_string(lastZ);
+            std::string msg = "onMovimentPlayer::"+ nome + "::" + std::to_string(currentPos.x) + "::" + std::to_string(currentPos.y) + "::" + std::to_string(currentPos.z) + "::" + std::to_string(lastX) + "::" + std::to_string(lastY) + "::" + std::to_string(lastZ);
             g_Server->sendEventServer(msg.c_str());
         }
     }
@@ -63,4 +60,3 @@ void onMove::run(CPed *cja)
     lastY = currentY;
     lastZ = currentZ;
 }
-#endif

src/events/onMove/onMove.hpp

@@ -2,14 +2,13 @@
 #include <CVector.h>
 #include <plugin.h>
 #include <game_sa/CPed.h>
-#define onMoveDefine 1
 
-#if onMoveDefine
+
 
 class onMove{
 
 private:
-    CPed *cj;
+    CPed* cj;
     CVector vector;
     CVector lastPosition;
     float lastX, lastY, lastZ;
@@ -20,8 +19,7 @@ class onMove{
 
     ~onMove();
 
-    void run(CPed *cja);
+    void run(CPed *cja) ;
 
 };
 
-#endif

src/events/onPlayerDamage/onPlayerDamage.cpp

@@ -10,7 +10,7 @@
 
 
 #if ONPLAYERDAMAGE
-onPlayerDamage::onPlayerDamage(CPed *cj, ServerSocket* server) : cj(cj), wasVida(cj->m_fHealth),
+onPlayerDamage::onPlayerDamage(CPed *cj) : cj(cj), wasVida(cj->m_fHealth),
 server(server)
 {
 }
@@ -33,7 +33,7 @@ void onPlayerDamage::execute()
         float dano = wasVida - cj->m_fHealth;
         if (dano > 0.1f )
         {
-            onPlayerDamageServer(dano, server, name);
+            onPlayerDamageServer(dano, g_Server, name);
         }
         wasVida = cj->m_fHealth;
     }

src/events/onPlayerDamage/onPlayerDamage.hpp

@@ -7,13 +7,15 @@
 
 #if ONPLAYERDAMAGE
 
+
+
 class onPlayerDamage {
 private:
     CPed* cj;
     ServerSocket* server;
     float wasVida;
 public:
-    explicit onPlayerDamage(CPed* cj, ServerSocket* server);
+    explicit onPlayerDamage(CPed* cj);
     ~onPlayerDamage();
     void execute();
 };

src/global/Name.hpp

@@ -0,0 +1,4 @@
+#pragma once
+#include <string>
+
+extern std::string nome;