feature macros removed

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);
 	}