Make compile

UOResistance · Jan 28, 2025 · 5173a22 · 5173a22
1 parent d378993
commit 5173a22
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/common/version/GitRevision.h b/src/common/version/GitRevision.h
@@ -1,2 +1,8 @@
-#define __GITHASH__ "f24687c5330f8fbf7b7ae9f626447fc91e280d77"
-#define __GITREVISION__ 3473
+#ifndef _INC_GITREVISION_H
+#define _INC_GITREVISION_H
+
+#define __GITHASH__ "d37899393226f982da3c8d1da45efadf2f7b39b2"
+#define __GITREVISION__ 3931
+#define __GITBRANCH__ "Resistance_TicFix"
+
+#endif // _INC_GITREVISION_H
diff --git a/src/game/CTimedObject.cpp b/src/game/CTimedObject.cpp
@@ -62,7 +62,7 @@ void CTimedObject::_SetTimeout(int64 iDelayInMsecs)
 {
     ADDTOCALLSTACK_DEBUG("CTimedObject::_SetTimeout");
     // Assume we have the mutex already locked here
-    g_Log.EventDebug("[%p] _SetTimeout to %" PRId64 ".\n", (void*)this, iDelayInMsecs);
+    //g_Log.EventDebug("[%p] _SetTimeout to %" PRId64 ".\n", (void*)this, iDelayInMsecs);
 
     const ProfileTask timersTask(PROFILE_TIMERS); // profile the settimeout proccess.
     if (_IsDeleted()) //prevent deleted objects from setting new timers to avoid nullptr calls

diff --git a/src/game/chars/CCharAct.cpp b/src/game/chars/CCharAct.cpp
@@ -5496,7 +5496,7 @@ void CChar::SetTriggerActive(lpctstr trig)
 // 4) CHARDEF
 // 5) EVENTSPET/EVENTSPLAYER set on .ini file
 // RETURNS = TRIGRET_TYPE (in cscriptobj.h)
-TRIGRET_TYPE CChar::OnTrigger( lpctstr pszTrigName, CTextConsole * pSrc, CScriptTriggerArgs * pArgs )
+TRIGRET_TYPE CChar:: OnTrigger( lpctstr pszTrigName, CTextConsole * pSrc, CScriptTriggerArgs * pArgs )
 {
 	ADDTOCALLSTACK("CChar::OnTrigger");
 

diff --git a/src/network/send.cpp b/src/network/send.cpp
@@ -2658,19 +2658,21 @@ PacketPaperdoll::PacketPaperdoll(const CClient* target, CChar* character) : Pack
     bool bCustomName = 0;
     CSString sShowName;
 
-
+    CChar* TargetCharacter = const_cast <CChar*>(target->GetChar()); //TRÈS DANGEREUX ICI. On prend un const qu'on modifie a ne plus l'être
     if (IsTrigUsed(TRIGGER_DISPLAYNAME) && (target->GetChar() != character)) //Avoid launch trigger if the target is the same character
     {
         CScriptTriggerArgs args;
         args.m_s1 = character->GetName();
         args.m_iN1 = 1;//Trigger use on paperdoll
-        if (character->OnTrigger(CTRIG_DisplayName, target->GetChar(), &args) == TRIGRET_RET_TRUE)
+        if (character->OnTrigger(CTRIG_DisplayName, TargetCharacter, &args) == TRIGRET_RET_TRUE)
         {
             bCustomName = 1;
             sShowName = args.m_s1;
         }
     }
 
+
+
 	if (character->IsStatFlag(STATF_INCOGNITO))
 	{
 		writeStringFixedASCII(character->GetName(), 60);