Change the const_cast by removing const

Sphereserver · Oct 11, 2024 · 56d5f1f · 56d5f1f
1 parent 4183b84
commit 56d5f1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/network/send.cpp b/src/network/send.cpp
@@ -128,13 +128,13 @@ PacketCombatDamage::PacketCombatDamage(const CClient* target, word damage, CUID
  *
  *
  ***************************************************************************/
-PacketObjectStatus::PacketObjectStatus(const CClient* target, CObjBase* object) : PacketSend(XCMD_Status, 7, g_Cfg.m_fUsePacketPriorities? PRI_LOW : PRI_NORMAL)
+PacketObjectStatus::PacketObjectStatus(CClient* target, CObjBase* object) : PacketSend(XCMD_Status, 7, g_Cfg.m_fUsePacketPriorities? PRI_LOW : PRI_NORMAL)
 {
 	ADDTOCALLSTACK("PacketObjectStatus::PacketObjectStatus");
     ASSERT(object);
 
 	const CNetState * state = target->GetNetState();
-	const CChar *character = target->GetChar();
+	CChar *character = target->GetChar();
 	CChar *objectChar = object->IsChar() ? static_cast<CChar *>(object) : nullptr;
 	bool fCanRename = false;
 
@@ -154,8 +154,7 @@ PacketObjectStatus::PacketObjectStatus(const CClient* target, CObjBase* object)
         CScriptTriggerArgs args;
         args.m_s1 = object->GetName();
 
-        CChar* pCharBase = const_cast<CChar*>(character); // Remove the const to be able to use on OnTrigger
-        if (objectChar->OnTrigger(CTRIG_DisplayName, pCharBase, &args) == TRIGRET_RET_TRUE)
+        if (objectChar->OnTrigger(CTRIG_DisplayName, character, &args) == TRIGRET_RET_TRUE)
         {
             bCustomName = 1;
             sShowName = args.m_s1;

diff --git a/src/network/send.h b/src/network/send.h
@@ -111,7 +111,7 @@ class PacketCombatDamage : public PacketSend
 class PacketObjectStatus : public PacketSend
 {
 public:
-	PacketObjectStatus(const CClient* target, CObjBase* object);
+	PacketObjectStatus(CClient* target, CObjBase* object);
 
 private:
 	void WriteVersionSpecific(const CClient* target, CChar* other, byte version);