feature macros removed

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