metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mr-2' of https://github.com/MindRapist/m2dev-server-src into mr-2

Browse Source
This commit is contained in:
Mind Rapist
2025-12-20 01:56:41 +02:00
parent 47caa3e076 5b5ddd5d6b
commit b389e30db7
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/char.cpp
View File

@@ -364,11 +364,9 @@ void CHARACTER::Initialize()
m_bIsLoadedAffect = false;
cannot_dead = false;
#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT
// tw1x1: POS_FIGHTING timer fix
m_dwLastCombatTime = 0;
// tw1x1: end
#endif
#ifdef __PET_SYSTEM__
m_petSystem = 0;
@@ -4098,8 +4096,6 @@ void CHARACTER::UpdateStateMachine(DWORD dwPulse)
if (IsDead())
return;
#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT
// tw1x1: POS_FIGHTING timer fix
if (IsPC() && IsPosition(POS_FIGHTING))
{
const DWORD now = get_dword_time();
@@ -4111,8 +4107,6 @@ void CHARACTER::UpdateStateMachine(DWORD dwPulse)
if (now - m_dwLastCombatTime >= 10000)
SetVictim(NULL); // triggers battle_end() -> POS_STANDING
}
// tw1x1: end
#endif
Update();
m_dwNextStatePulse = dwPulse + m_dwStateDuration;