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

src/game/char.h

@@ -2048,8 +2048,6 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider
 		int m_iLastPMPulse;
 		int m_iPMCounter;
 
-#ifdef FIX_BATTLE_INACTIVITY_TIMEOUT
-	// tw1x1: POS_FIGHTING timer fix
 	public:
 		void EnterCombat();
 		void UpdateLastCombatTime() { m_dwLastCombatTime = get_dword_time(); }
@@ -2057,8 +2055,6 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider
 
 	private:
 		DWORD m_dwLastCombatTime;
-	// tw1x1: end
-#endif
 };
 
 ESex GET_SEX(LPCHARACTER ch);