feature macros removed

src/common/service.h

@@ -7,10 +7,3 @@
 #define __PET_SYSTEM__
 #define __UDP_BLOCK__
 #endif
-
-/*
-This fixes the POS_FIGHTING state, when a character will enter POS_FIGHTING state,
-after 10s of no damage dealt, should've been switched to POS_STANDING state.
-Files affected: char.cpp, char.h, char_battle.cpp, char_skill.cpp
-*/
-#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT

src/game/char.cpp

@@ -361,9 +361,7 @@ void CHARACTER::Initialize()
 	m_bIsLoadedAffect = false;
 	cannot_dead = false;
 
-#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT
 	m_dwLastCombatTime = 0;
-#endif
 
 #ifdef __PET_SYSTEM__
 	m_petSystem = 0;
@@ -4064,7 +4062,6 @@ void CHARACTER::UpdateStateMachine(DWORD dwPulse)
 	if (IsDead())
 		return;
 
-#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT
 	if (IsPC() && IsPosition(POS_FIGHTING))
 	{
 		const DWORD now = get_dword_time();
@@ -4076,7 +4073,6 @@ void CHARACTER::UpdateStateMachine(DWORD dwPulse)
 		if (now - m_dwLastCombatTime >= 10000)
 			SetVictim(NULL); // triggers battle_end() -> POS_STANDING
 	}
-#endif
 
 	Update();
 	m_dwNextStatePulse = dwPulse + m_dwStateDuration;

src/game/char.h

@@ -2038,7 +2038,6 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider
 		int m_iLastPMPulse;
 		int m_iPMCounter;
 
-#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT
 	public:
 		void EnterCombat();
 		void UpdateLastCombatTime() { m_dwLastCombatTime = get_dword_time(); }
@@ -2046,7 +2045,6 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider
 
 	private:
 		DWORD m_dwLastCombatTime;
-#endif
 };
 
 ESex GET_SEX(LPCHARACTER ch);

src/game/char_battle.cpp

@@ -1592,7 +1592,6 @@ void CHARACTER::SendDamagePacket(LPCHARACTER pAttacker, int Damage, BYTE DamageF
 	}
 }
 
-#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT
 void CHARACTER::EnterCombat()
 {
 	if (!IsPC())
@@ -1608,7 +1607,6 @@ void CHARACTER::EnterCombat()
 	if (m_dwLastCombatTime == 0)
 		m_dwLastCombatTime = get_dword_time();
 }
-#endif
 
 //
 // CHARACTER::Damage 메소드는 this가 데미지를 입게 한다.
@@ -2305,7 +2303,6 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
 	//
 	if (!cannot_dead)
 	{
-#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT
 		// REAL combat activity only: final damage > 0
 		if (dam > 0)
 		{
@@ -2320,7 +2317,6 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
 				pAttacker->EnterCombat();
 			}
 		}
-#endif
 		PointChange(POINT_HP, -dam, false);
 	}
 

src/game/char_skill.cpp

@@ -2462,12 +2462,10 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste
 	if (!pkSk)
 		return false;
 
-#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT
 	if (IsPC() && IS_SET(pkSk->dwFlag, SKILL_FLAG_ATTACK))
 	{
 		EnterCombat();
 	}
-#endif
 
 	if (bCanUseHorseSkill && pkSk->dwType != SKILL_TYPE_HORSE)
 		return BATTLE_NONE;