From 2e350ac5a7b9cc8136d0a1350efdb2aedabc9568 Mon Sep 17 00:00:00 2001
From: jedi95 <jedi95@gmail.com>
Date: Wed, 16 Aug 2023 22:09:09 -0600
Subject: [PATCH] Version 0.816

- Add fn_crouchToggle to replace cl_crouchToggle (which is server controlled)
- Expanded range for fn_fov (45-100)
- Clean up commented code

Signed-off-by: jedi95 <jedi95@gmail.com>
---
 Mods/Falcon/Code/Actor.cpp                    |  6 ---
 .../Code/Expansion/Weapons/GrenadeLaunch.cpp  | 15 +-----
 Mods/Falcon/Code/FalconVersion.h              |  2 +-
 Mods/Falcon/Code/GameCVars.cpp                | 14 +++---
 Mods/Falcon/Code/GameCVars.h                  |  1 +
 Mods/Falcon/Code/GameFactory.cpp              |  2 +-
 Mods/Falcon/Code/GameRules.cpp                | 17 ++++---
 Mods/Falcon/Code/GameRulesClientServer.cpp    |  7 ---
 Mods/Falcon/Code/GrabHandler.cpp              |  2 +-
 Mods/Falcon/Code/GunTurret.cpp                | 33 -------------
 Mods/Falcon/Code/HUD/HUD.cpp                  | 33 +------------
 Mods/Falcon/Code/HUD/HUD.h                    |  3 --
 Mods/Falcon/Code/HUD/HUDCrosshair.cpp         |  8 +---
 Mods/Falcon/Code/HUD/HUDInstantAction.h       |  4 --
 Mods/Falcon/Code/HUD/HUDInterfaceEffects.cpp  |  3 --
 Mods/Falcon/Code/HUD/HUDPDA.cpp               |  6 ---
 Mods/Falcon/Code/HUD/HUDPowerStruggle.cpp     |  3 +-
 Mods/Falcon/Code/HUD/HUDRadar.cpp             |  6 +--
 Mods/Falcon/Code/HUD/HUDScopes.cpp            |  6 +--
 Mods/Falcon/Code/HUD/HUDSoundImpl.cpp         |  1 -
 Mods/Falcon/Code/HUD/HUDTagNames.cpp          | 46 -------------------
 Mods/Falcon/Code/HUD/HUDTextChat.cpp          |  1 -
 Mods/Falcon/Code/HUD/HUDTextChat.h            |  2 -
 Mods/Falcon/Code/HUD/HUDTextEvents.cpp        | 34 ++------------
 Mods/Falcon/Code/HUD/HUDVehicleInterface.cpp  | 19 +-------
 Mods/Falcon/Code/HomingMissile.cpp            |  4 +-
 Mods/Falcon/Code/Nodes/HUDNodes.cpp           |  3 --
 Mods/Falcon/Code/PlayerInput.cpp              |  5 +-
 Mods/Falcon/Code/RocketLauncher.h             |  5 +-
 Mods/Falcon/Code/Scout.h                      |  1 -
 30 files changed, 36 insertions(+), 256 deletions(-)

diff --git a/Mods/Falcon/Code/Actor.cpp b/Mods/Falcon/Code/Actor.cpp
index 1a2e799..c5278ad 100644
--- a/Mods/Falcon/Code/Actor.cpp
+++ b/Mods/Falcon/Code/Actor.cpp
@@ -232,9 +232,6 @@ CActor::CActor()
 , m_reviveNoReactionTime(0.f)
 {
 	m_currentPhysProfile=GetDefaultProfile(eEA_Physics);
-	//memset(&m_stances,0,sizeof(m_stances));
-	//SetupStance(STANCE_NULL,&SStanceInfo());
-
 	m_timeImpulseRecover = 0.0f;
 	m_airResistance = 0.0f;
 	m_airControl = 1.0f;
@@ -891,7 +888,6 @@ void CActor::RagDollize( bool fallAndPlay )
 			IAnimationGraphState *animGraph = GetAnimationGraphState();
 			if (animGraph)
 				animGraph->PushForcedState( "FallAndPlay" );
-				//animGraph->SetInput("Signal", "fall");
 		}
 
 		// [Mikko] 12.10.2007 Skipping the timer reset here or else QL tranquilized characters does not work.
@@ -1459,10 +1455,8 @@ void CActor::Update(SEntityUpdateContext& ctx, int slot)
 	// NOTE Sep 13, 2007: <pvl> UpdateGrab() moved into an animation system callback -
 	// due to complexities in update ordering previous frame's bone positions
 	// were still used by the GrabHandler when updated from here.
-	//UpdateGrab(ctx.fFrameTime);
 	UpdateAnimGraph( m_pAnimatedCharacter?m_pAnimatedCharacter->GetAnimationGraphState():NULL );
 
-	//
 	// get stats table
 	if (!m_actorStats)
 	{
diff --git a/Mods/Falcon/Code/Expansion/Weapons/GrenadeLaunch.cpp b/Mods/Falcon/Code/Expansion/Weapons/GrenadeLaunch.cpp
index f58cf0c..72615e5 100644
--- a/Mods/Falcon/Code/Expansion/Weapons/GrenadeLaunch.cpp
+++ b/Mods/Falcon/Code/Expansion/Weapons/GrenadeLaunch.cpp
@@ -123,7 +123,7 @@ class CGrenadeLaunch::ScheduleReload
 	CWeapon *_pWeapon;
 };
 
-bool CGrenadeLaunch::Shoot(bool resetAnimation, bool autoreload/* =true */, bool noSound /* =false */)
+bool CGrenadeLaunch::Shoot(bool resetAnimation, bool autoreload, bool noSound)
 {
 	IEntityClass* spawn_ammo = m_grenadeLaunchParams.ammo_type_class;
 
@@ -141,13 +141,9 @@ bool CGrenadeLaunch::Shoot(bool resetAnimation, bool autoreload/* =true */, bool
 	}
 	
 	bool res = InternalShoot(spawn_ammo, resetAnimation, autoreload, noSound);
-	//bool res = CSingle::Shoot(resetAnimation, autoreload, noSound);
 
 	if (m_grenadeLaunchParams.remote_detonated && m_projectileId && m_projectileId != m_lastGrenadeId)
 	{
-		/*if (m_launchedGrenades.size() >= m_fireparams.clip_size)
-			StartSecondaryFire(0);*/
-
 		m_launchedGrenades.push_back(m_projectileId);
 		m_lastGrenadeId=m_projectileId;
 	}
@@ -166,13 +162,9 @@ void CGrenadeLaunch::NetShootEx(const Vec3 &pos, const Vec3 &dir, const Vec3 &ve
 	IEntityClass* spawn_ammo = m_grenadeLaunchParams.ammo_type_class;
 
 	InternalNetShootEx(spawn_ammo, pos, dir, vel, hit, extra, ph);
-	//CSingle::NetShootEx(pos, dir, vel, hit, extra, ph);
 
 	if (m_grenadeLaunchParams.remote_detonated && m_projectileId && m_projectileId != m_lastGrenadeId)
 	{
-		/*if (m_launchedGrenades.size() >= m_fireparams.clip_size)
-			StartSecondaryFire(0);*/
-
 		m_launchedGrenades.push_back(m_projectileId);
 		m_lastGrenadeId=m_projectileId;
 	}
@@ -191,8 +183,6 @@ void CGrenadeLaunch::NetStartSecondaryFire()
 	for(TLaunchedGrenades::const_iterator it=m_launchedGrenades.begin(); it != m_launchedGrenades.end(); ++it)
 	{
 		IEntity *pGrenade=gEnv->pEntitySystem->GetEntity(*it);
-		//IGameObject *pBomb=gEnv->pGame->GetIGameFramework()->GetGameObject(*it);
-
 		if (pGrenade)
 		{
 			// Trigger grenade explosion
@@ -320,8 +310,6 @@ void CGrenadeLaunch::Update(float frameTime, uint frameId)
 		QuatT tr=pMagazine->GetAttRelativeDefault();
 		Quat rot;
 
-		//gEnv->pLog->Log(">>> Rotate ratio: %f", ratio);
-
 		rot=Quat::CreateSlerp(tr.q, m_magazineRotation, min(ratio, 1.0f));
 		tr.q=rot;
 		pMagazine->SetAttRelativeDefault(tr);
@@ -355,7 +343,6 @@ void CGrenadeLaunch::ResetShells()
 	if (pCharacter) 
 	{
 		IAttachmentManager* pAttachMan = pCharacter->GetIAttachmentManager();
-		// gEnv->pLog->Log(">>> Resetting shells at shot count: %d", shot_count);
 
 		if (m_magazineDrum >= 0)
 		{
diff --git a/Mods/Falcon/Code/FalconVersion.h b/Mods/Falcon/Code/FalconVersion.h
index 4bf6541..38a6746 100644
--- a/Mods/Falcon/Code/FalconVersion.h
+++ b/Mods/Falcon/Code/FalconVersion.h
@@ -6,7 +6,7 @@
 #include "gitparams.h"
 
 #define _Falcon_Version_Major 0
-#define _Falcon_Version_Minor 815
+#define _Falcon_Version_Minor 816
 
 #define _Falcon_Commit STR(GIT_CUR_COMMIT)
 #define _Falcon_ISA "SSE2"
diff --git a/Mods/Falcon/Code/GameCVars.cpp b/Mods/Falcon/Code/GameCVars.cpp
index 2438d42..1c18f8a 100644
--- a/Mods/Falcon/Code/GameCVars.cpp
+++ b/Mods/Falcon/Code/GameCVars.cpp
@@ -56,13 +56,13 @@ static void BroadcastChangeSafeMode( ICVar * )
 void OnFOVUpdated(ICVar* cvar)
 {
 	float newValue = cvar->GetFVal();
-	if (newValue > 75.0f) {
-		CryLogAlways("Maximum FOV is 75");
-		cvar->Set(75);
+	if (newValue > 100.0f) {
+		CryLogAlways("Maximum FOV is 100");
+		cvar->Set(100);
 	}
-	else if (newValue < 50.0f) {
-		CryLogAlways("Maximum FOV is 50");
-		cvar->Set(50);
+	else if (newValue < 45.0f) {
+		CryLogAlways("Maximum FOV is 45");
+		cvar->Set(45);
 	}
 }
 
@@ -147,6 +147,7 @@ void SCVars::InitCVars(IConsole *pConsole)
 
 	// Falcon client options
 	pConsole->Register("fn_constantMouseSensitivity", &fn_constantMouseSensitivity, 0, VF_RESTRICTEDMODE | VF_NOT_NET_SYNCED, "0 = Sensitivity depends on set mass multiplier. 1 = Sensitivity ignores mass. 2 = Sensitivity follows default mass");
+	pConsole->Register("fn_crouchToggle", &fn_crouchToggle, 0, VF_RESTRICTEDMODE | VF_NOT_NET_SYNCED, "Makes the crouch key work as a toggle");
 	pConsole->Register("fn_disableShootZoom", &fn_disableShootZoom, 0, VF_RESTRICTEDMODE | VF_NOT_NET_SYNCED, "Disables the zoom in effect when shooting");
 	pConsole->Register("fn_enableFPBody", &fn_enableFpBody, 0, VF_NOT_NET_SYNCED | VF_RESTRICTEDMODE, "Enable first person body on custom characters");
 	pConsole->Register("fn_fixExplosivePlant", &fn_fixExplosivePlant, 1, VF_NOT_NET_SYNCED | VF_RESTRICTEDMODE, "Fix planting mines and claymores with high FPS");
@@ -595,6 +596,7 @@ void SCVars::ReleaseCVars()
 
 	// Falcon client options
 	pConsole->UnregisterVariable("fn_constantMouseSensitivity", true);
+	pConsole->UnregisterVariable("fn_crouchToggle", true);
 	pConsole->UnregisterVariable("fn_disableShootZoom", true);
 	pConsole->UnregisterVariable("fn_enableFPBody", true);
 	pConsole->UnregisterVariable("fn_fixExplosivePlant", true);
diff --git a/Mods/Falcon/Code/GameCVars.h b/Mods/Falcon/Code/GameCVars.h
index 5123028..15a0120 100644
--- a/Mods/Falcon/Code/GameCVars.h
+++ b/Mods/Falcon/Code/GameCVars.h
@@ -35,6 +35,7 @@ struct SCVars
 
 	// Falcon client options
 	int fn_constantMouseSensitivity;
+	int fn_crouchToggle;
 	int fn_disableShootZoom;
 	int fn_enableFpBody;
 	int fn_fixExplosivePlant;
diff --git a/Mods/Falcon/Code/GameFactory.cpp b/Mods/Falcon/Code/GameFactory.cpp
index 0e70147..62eedea 100644
--- a/Mods/Falcon/Code/GameFactory.cpp
+++ b/Mods/Falcon/Code/GameFactory.cpp
@@ -26,7 +26,7 @@
 #include "Hunter.h"
 #include "Trooper.h"
 #include "Shark.h"
-//
+
 #include "Item.h"
 #include "Weapon.h"
 #include "VehicleWeapon.h"
diff --git a/Mods/Falcon/Code/GameRules.cpp b/Mods/Falcon/Code/GameRules.cpp
index e69e49e..0ba95d2 100644
--- a/Mods/Falcon/Code/GameRules.cpp
+++ b/Mods/Falcon/Code/GameRules.cpp
@@ -1079,16 +1079,16 @@ string CGameRules::VerifyName(const char *name, IEntity *pEntity)
 {
 	string nameFormatter(name);
 
-	// size limit is 26
-	if (nameFormatter.size()>26)
-		nameFormatter.resize(26);
-
 	// no spaces at start/end
 	nameFormatter.TrimLeft(' ');
 	nameFormatter.TrimRight(' ');
 
+	// size limit is 26
+	if (nameFormatter.size()>26)
+		nameFormatter.resize(26);
+
 	// no $ at the beginning (Patch3: colors are forbidden)
-	nameFormatter.TrimLeft('$');
+	nameFormatter.replace("$", "_");
 
 	// no empty names
 	if (nameFormatter.empty())
@@ -1103,16 +1103,15 @@ string CGameRules::VerifyName(const char *name, IEntity *pEntity)
 	// search for duplicates
 	if (IsNameTaken(nameFormatter.c_str(), pEntity))
 	{
-		int n=1;
+		int n = 1;
 		string appendix;
-		do 
+		do
 		{
 			appendix.Format("(%d)", n++);
-		} while(IsNameTaken(nameFormatter+appendix));
+		} while (IsNameTaken(nameFormatter + appendix));
 
 		nameFormatter.append(appendix);
 	}
-
 	return nameFormatter;
 }
 
diff --git a/Mods/Falcon/Code/GameRulesClientServer.cpp b/Mods/Falcon/Code/GameRulesClientServer.cpp
index 6dafd01..1b3bc7e 100644
--- a/Mods/Falcon/Code/GameRulesClientServer.cpp
+++ b/Mods/Falcon/Code/GameRulesClientServer.cpp
@@ -368,12 +368,6 @@ void CGameRules::CullEntitiesInExplosion(const ExplosionInfo &explosionInfo)
 //------------------------------------------------------------------------
 void CGameRules::ClientExplosion(const ExplosionInfo &explosionInfo)
 {
-	// let 3D engine know about explosion (will create holes and remove vegetation)
-	//if (explosionInfo.hole_size > 0.0f)
-	//{
-		//gEnv->p3DEngine->OnExplosion(explosionInfo.pos, explosionInfo.hole_size, true);
-	//}
-
 	TExplosionAffectedEntities affectedEntities;
 
 	if (gEnv->bServer)
@@ -988,7 +982,6 @@ IMPLEMENT_RMI(CGameRules, ClTaggedEntity)
 	if (!params.entityId)
 		return true;
 
-	//SAFE_HUD_FUNC(GetRadar()->AddTaggedEntity(params.entityId)); //we have no tagging anymore, just temp and non-temp adding
 	SAFE_HUD_FUNC(GetRadar()->AddEntityToRadar(params.entityId));
 
 	SEntityEvent scriptEvent( ENTITY_EVENT_SCRIPT_EVENT );
diff --git a/Mods/Falcon/Code/GrabHandler.cpp b/Mods/Falcon/Code/GrabHandler.cpp
index 4148229..120fe72 100644
--- a/Mods/Falcon/Code/GrabHandler.cpp
+++ b/Mods/Falcon/Code/GrabHandler.cpp
@@ -576,7 +576,7 @@ bool CAnimatedGrabHandler::SetGrab(SmartScriptTable &rParams)
 	return true;
 }
 
-bool CAnimatedGrabHandler::StartGrab(/*EntityId objectId*/)
+bool CAnimatedGrabHandler::StartGrab()
 {
 	if (m_grabStats.grabAnimGraphSignal)
 	{
diff --git a/Mods/Falcon/Code/GunTurret.cpp b/Mods/Falcon/Code/GunTurret.cpp
index a63eb20..7299fe2 100644
--- a/Mods/Falcon/Code/GunTurret.cpp
+++ b/Mods/Falcon/Code/GunTurret.cpp
@@ -314,9 +314,6 @@ void CGunTurret::ReadProperties(IScriptTable *pProperties)
 //------------------------------------------------------------------------
 bool CGunTurret::ReadItemParams(const IItemParamsNode *root)
 {
-  //m_tpgeometry.position.Set(0.f, 0.f, 0.f);
-  //m_aux0geometry.position.Set(0.f, 0.f, 0.f);
-  
   if (!CWeapon::ReadItemParams(root))
 	return false;
 
@@ -330,16 +327,7 @@ bool CGunTurret::ReadItemParams(const IItemParamsNode *root)
 	reader.Read("barrel_helper", m_barrelHelper);
 	reader.Read("fire_helper", m_fireHelper);
 	reader.Read("rocket_helper", m_rocketHelper);
-	/*Matrix34 tm = GetEntity()->GetSlotLocalTM(eIGS_Aux0,false);
-
-	tm.SetTranslation(GetSlotHelperPos(eIGS_Aux0,m_radarHelper.c_str(),false));
-	GetEntity()->SetSlotLocalTM(eIGS_ThirdPerson,tm);
 
-	if (GetEntity()->IsSlotValid(eIGS_Aux1))
-	  {
-	  tm.SetTranslation(GetSlotHelperPos(eIGS_ThirdPerson,m_barrelHelper.c_str(),false));
-	  GetEntity()->SetSlotLocalTM(eIGS_Aux1,tm);
-	}*/   
 		m_radarHelperPos = GetSlotHelperPos(eIGS_Aux0, m_radarHelper.c_str(), false);
 		m_barrelHelperPos = GetSlotHelperPos(eIGS_ThirdPerson, m_barrelHelper.c_str(), false);
 		m_fireHelperPos = GetSlotHelperPos(eIGS_ThirdPerson, m_fireHelper.c_str(), false);
@@ -514,7 +502,6 @@ Vec3 CGunTurret::GetFiringPos(const Vec3 &probableHit) const
 //------------------------------------------------------------------------
 Vec3 CGunTurret::GetWeaponPos() const
 {
-	//return GetEntity()->GetWorldPos();
 	return GetEntity()->GetSlotWorldTM(eIGS_ThirdPerson).GetTranslation();  
 }
 
@@ -542,24 +529,6 @@ bool CGunTurret::IsTargetHostile(IActor *pTarget) const
 	bool sameTeam = (m_turretparams.team == 0) || (team == 0) || (m_turretparams.team == team);
 
 	return !sameSpecies || !sameTeam;
-
-	/*	IVehicle *pVehicle=g_pGame->GetIGameFramework()->GetIVehicleSystem()->GetVehicle(pTarget->GetId());
-	if (pVehicle)
-	{
-	int seatCount=pVehicle->GetSeatCount();
-	for (int i=0; i<seatCount; i++)
-	{
-	IVehicleSeat *pVehicleSeat=pVehicle->GetSeatById(i);
-	if (pVehicleSeat && pVehicleSeat->GetPassenger())
-	{
-	IEntity *pPassenger=gEnv->pEntitySystem->GetEntity(pVehicleSeat->GetPassenger());
-	if (pPassenger && IsTargetHostile(pPassenger))
-	return true;
-	}
-	}
-	}
-	return false;
-	*/
 }
 
 //------------------------------------------------------------------------
@@ -1141,7 +1110,6 @@ void CGunTurret::UpdateOrientation(float deltaTime)
 	{
 		weaponTM.SetRotationXYZ(weaponAngles);  
 		Vec3 w_trans = turretTM.TransformPoint(m_radarHelperPos);
-		//Vec3 w_trans = GetSlotHelperPos(eIGS_Aux0,m_radarHelper.c_str(),false);
 		weaponTM.SetTranslation(w_trans);
 
 	GetEntity()->SetSlotLocalTM(eIGS_ThirdPerson, weaponTM);
@@ -1149,7 +1117,6 @@ void CGunTurret::UpdateOrientation(float deltaTime)
 	if (GetEntity()->IsSlotValid(eIGS_Aux1))
 	{
 			Vec3 b_trans = weaponTM.TransformPoint(m_barrelHelperPos);
-			//Vec3 b_trans = GetSlotHelperPos(eIGS_ThirdPerson,m_barrelHelper.c_str(),false);
 	  weaponTM.SetTranslation(b_trans);
 			GetEntity()->SetSlotLocalTM(eIGS_Aux1, weaponTM*m_barrelRotation);
 	}
diff --git a/Mods/Falcon/Code/HUD/HUD.cpp b/Mods/Falcon/Code/HUD/HUD.cpp
index af106bd..79b0903 100644
--- a/Mods/Falcon/Code/HUD/HUD.cpp
+++ b/Mods/Falcon/Code/HUD/HUD.cpp
@@ -1407,26 +1407,6 @@ void CHUD::OnLoadingStart(ILevelInfo *pLevel)
 
 	m_pHUDCrosshair->GetFlashAnim()->Invoke("clearDamageDirection");
 	m_pHUDCrosshair->GetFlashAnim()->GetFlashPlayer()->Advance(0.1f);
-	/*m_pHUDScopes->ShowBinoculars(false);
-
-	ShowKillAreaWarning(false, 0);
-	BreakHUD(0);
-
-	GetMissionObjectiveSystem().DeactivateObjectives(false); //deactivate old objectives
-	m_animMessages.Invoke("reset");	//reset update texts
-
-	if(m_pHUDVehicleInterface && m_pHUDVehicleInterface->GetHUDType() != CHUDVehicleInterface::EHUD_NONE)
-		m_pHUDVehicleInterface->OnExitVehicle(NULL);
-
-	m_currentGoal.clear();
-	m_currentMainObjective.clear();
-
-	//disable alien fear effect
-	m_fSetAgressorIcon = 0.0f;
-	m_animTargetter.SetVisible(false);
-	m_bThirdPerson = false;
-
-	m_uiWeapondID = 0;*/
 }
 
 //-----------------------------------------------------------------------------------------------------
@@ -1705,11 +1685,6 @@ void CHUD::HandleFSCommand(const char *szCommand,const char *szArgs)
 	{
 		PlaySound(ESound_Malfunction);
 	}
-/*	else if(!stricmp(szCommand,"soundstop_malfunction"))
-	{
-		note: hud_malfunction has been changed to oneshot instead of looping sound
-		PlaySound(ESound_Malfunction,false);
-	}*/
 	else if(!stricmp(szCommand,"vehicle_init"))
 	{
 		PlaySound(ESound_VehicleIn);
@@ -1724,11 +1699,9 @@ void CHUD::HandleFSCommand(const char *szCommand,const char *szArgs)
 	}
 	else if(!stricmp(szCommand,"hud_download_loop"))
 	{
-		//PlaySound(ESound_DownloadLoop);
 	}
 	else if(!stricmp(szCommand,"hud_download_stop"))
 	{
-		//PlaySound(ESound_DownloadLoop,false);
 		PlaySound(ESound_DownloadStop);
 	}
 	else if(!stricmp(szCommand, "closeBinoculars"))
@@ -2247,8 +2220,6 @@ bool CHUD::OnAction(const ActionId& action, int activationMode, float value)
 				CPlayer *pPlayer = static_cast<CPlayer *>(pActor);
 				if (pPlayer && pPlayer->GetNanoSuit() && !pPlayer->GetNanoSuit()->IsActive())
 					return false;
-/*				if(!m_animQuickMenu.IsLoaded())
-					m_animQuickMenu.Reload();*/
 				m_animQuickMenu.Invoke("showQuickMenu");
 				m_animQuickMenu.SetVariable("_alpha",100);
 				
@@ -2829,7 +2800,6 @@ bool CHUD::ShowPDA(bool show, bool buyMenu)
 		}
 		else	
 		{
-			//m_animBuyZoneIcon.SetVisible(m_pHUDPowerStruggle->m_bInBuyZone&&m_pModalHUD!=&m_animBuyMenu);
 			m_buyMenuKeyLog.m_state = SBuyMenuKeyLog::eBMKL_Tab;
 		}
 
@@ -3486,7 +3456,7 @@ void CHUD::OnPostUpdate(float frameTime)
 		}
 
 		CGameRules *pGameRules=g_pGame->GetGameRules();
-		if(gEnv->bMultiplayer && pPlayer->GetSpectatorMode() /*|| (pGameRules && pGameRules->GetTeamCount() > 1 && pGameRules->GetTeam(pPlayer->GetEntityId()) == 0))*/) //SPECTATOR Mode
+		if(gEnv->bMultiplayer && pPlayer->GetSpectatorMode()) //SPECTATOR Mode
 		{
 			if(!m_animSpectate.IsLoaded())
 			{
@@ -4122,7 +4092,6 @@ bool CHUD::UpdateTimers(float frameTime)
 	// FIXME: this should be moved to ::EnergyChanged
 	if(m_fSuitEnergy > (NANOSUIT_ENERGY*0.25f) && m_pNanoSuit->GetSuitEnergy() < (NANOSUIT_ENERGY*0.25f))
 	{
-		//DisplayFlashMessage("@energy_critical", 3, ColorF(1.0,0,0));
 		if(now.GetMilliSeconds() - m_fLastSoundPlayedCritical > 30000)
 		{
 			m_fLastSoundPlayedCritical = now.GetMilliSeconds();
diff --git a/Mods/Falcon/Code/HUD/HUD.h b/Mods/Falcon/Code/HUD/HUD.h
index 7344718..236867e 100644
--- a/Mods/Falcon/Code/HUD/HUD.h
+++ b/Mods/Falcon/Code/HUD/HUD.h
@@ -289,7 +289,6 @@ class CHUD :	public CHUDCommon,
 	static void OnCrosshairCVarChanged(ICVar *pCVar);
 	static void OnSubtitleCVarChanged (ICVar* pCVar);
 	static void OnSubtitlePanoramicHeightCVarChanged (ICVar* pCVar);
-	// 
 
 	enum HUDSubtitleMode
 	{
@@ -790,8 +789,6 @@ class CHUD :	public CHUDCommon,
 	float m_fFlashTimer;
 	float m_fFlashTime;
 	float m_fBlindTime;
-//	float m_fSetAgressorIcon;
-//	EntityId  m_agressorIconID;
 	int		m_lastPlayerPPSet;
 
 	//entity classes for faster comparison
diff --git a/Mods/Falcon/Code/HUD/HUDCrosshair.cpp b/Mods/Falcon/Code/HUD/HUDCrosshair.cpp
index eb56ceb..6807bbf 100644
--- a/Mods/Falcon/Code/HUD/HUDCrosshair.cpp
+++ b/Mods/Falcon/Code/HUD/HUDCrosshair.cpp
@@ -163,7 +163,7 @@ void CHUDCrosshair::Update(float fDeltaTime)
 	if(m_animCrossHair.GetVisible() && !g_pHUD->InSpectatorMode())
 	{
 		//also disables the damage indicator
-		if(/*g_pGameCVars->hud_crosshair>0 && m_iCrosshair > 0 &&*/ (g_pGameCVars->g_difficultyLevel<4 || gEnv->bMultiplayer))
+		if(g_pGameCVars->g_difficultyLevel<4 || gEnv->bMultiplayer)
 		{
 			m_animCrossHair.GetFlashPlayer()->Advance(fDeltaTime);
 			m_animCrossHair.GetFlashPlayer()->Render();
@@ -318,11 +318,6 @@ bool CHUDCrosshair::IsFriendlyEntity(IEntity *pEntity)
 		if(pVehicle && pGameRules->GetTeam(pVehicle->GetEntityId()) == iClientTeam && pVehicle->GetStatus().passengerCount)
 		{
 			IActor *pDriver = pVehicle->GetDriver();
-			/*if(pDriver && pGameRules->GetTeam(pDriver->GetEntityId()) == iClientTeam)
-				bFriendly = true;
-			else
-				bFriendly = false;*/
-
 			bFriendly = true;
 
 			//fix for bad raycast
@@ -404,7 +399,6 @@ void CHUDCrosshair::UpdateCrosshair()
 	if(iNewFriendly != m_iFriendlyTarget)
 	{
 		m_iFriendlyTarget = iNewFriendly;
-		//m_animCrossHair.Invoke("setFriendly", m_iFriendlyTarget);
 		if(iNewFriendly)
 			m_animFriendCross.SetVisible(true);
 		else
diff --git a/Mods/Falcon/Code/HUD/HUDInstantAction.h b/Mods/Falcon/Code/HUD/HUDInstantAction.h
index 9a45097..9599e43 100644
--- a/Mods/Falcon/Code/HUD/HUDInstantAction.h
+++ b/Mods/Falcon/Code/HUD/HUDInstantAction.h
@@ -38,10 +38,6 @@ class CHUDInstantAction : public CHUDObject
 	void SetHUDColor();
 	void UpdateStats();
 
-//	virtual bool IsFactoryType(EntityId entity, EBuyMenuPage type);
-
-//	bool IsPlayerSpecial();
-
 	int m_ownScore;
 
 private:
diff --git a/Mods/Falcon/Code/HUD/HUDInterfaceEffects.cpp b/Mods/Falcon/Code/HUD/HUDInterfaceEffects.cpp
index 1c4be47..1e990fe 100644
--- a/Mods/Falcon/Code/HUD/HUDInterfaceEffects.cpp
+++ b/Mods/Falcon/Code/HUD/HUDInterfaceEffects.cpp
@@ -152,7 +152,6 @@ void CHUD::UpdateMissionObjectiveIcon(EntityId objective, int friendly, FlashOnS
 					id = info.pCharacter->GetISkeletonPose()->GetJointIDByName("Bip01 Head");
 				if (id >= 0)
 				{
-					//vPos = pCharacter->GetISkeleton()->GetHelperPos(helper);
 					vWorldPos = info.pCharacter->GetISkeletonPose()->GetAbsJointByID(id).t;
 					if (!vWorldPos.IsZero())
 					{
@@ -366,8 +365,6 @@ void CHUD::UpdateMissionObjectiveIcon(EntityId objective, int friendly, FlashOnS
 		{
 			localizedText = LocalizeWithParams(GetPlayerRank(objective, true), true);
 			icon.text.append(localizedText);
-
-			//localizedText = LocalizeWithParams(" ", true);
 			icon.text.append(L" ");
 		}
 	}
diff --git a/Mods/Falcon/Code/HUD/HUDPDA.cpp b/Mods/Falcon/Code/HUD/HUDPDA.cpp
index 25be81b..538e229 100644
--- a/Mods/Falcon/Code/HUD/HUDPDA.cpp
+++ b/Mods/Falcon/Code/HUD/HUDPDA.cpp
@@ -180,12 +180,6 @@ void CHUD::HandleFSCommandPDA(const char *strCommand,const char *strArgs)
 		int tab = atoi(strArgs);
 		HUD_CALL_LISTENERS(PDATabChanged(tab));
 	}
-/*	else if(0 == strcmp(strCommand,"ChangeTeam"))
-	{
-		char strConsole[256];
-		sprintf(strConsole,"team %s",strArgs);
-		gEnv->pConsole->ExecuteString(strConsole);
-	}*/
 }
 
 //-----------------------------------------------------------------------------------------------------
diff --git a/Mods/Falcon/Code/HUD/HUDPowerStruggle.cpp b/Mods/Falcon/Code/HUD/HUDPowerStruggle.cpp
index eaf9d8b..21eee83 100644
--- a/Mods/Falcon/Code/HUD/HUDPowerStruggle.cpp
+++ b/Mods/Falcon/Code/HUD/HUDPowerStruggle.cpp
@@ -465,7 +465,6 @@ void CHUDPowerStruggle::Update(float fDeltaTime)
 			}
 
 		}
-		//gEnv->pRenderer->Set2DMode(false, 0, 0);
 	}
 }
 
@@ -1278,7 +1277,7 @@ void CHUDPowerStruggle::GetItemList(EBuyMenuPage itemType, std::vector<SItem> &i
 
 //-----------------------------------------------------------------------------------------------------
 
-void CHUDPowerStruggle::DetermineCurrentBuyZone(bool sendToFlash, bool force /* = false*/)
+void CHUDPowerStruggle::DetermineCurrentBuyZone(bool sendToFlash, bool force)
 {
 	IActor *pActor=g_pGame->GetIGameFramework()->GetClientActor();
 	if(!pActor) return;
diff --git a/Mods/Falcon/Code/HUD/HUDRadar.cpp b/Mods/Falcon/Code/HUD/HUDRadar.cpp
index 7822237..6498563 100644
--- a/Mods/Falcon/Code/HUD/HUDRadar.cpp
+++ b/Mods/Falcon/Code/HUD/HUDRadar.cpp
@@ -1043,8 +1043,6 @@ void CHUDRadar::UpdateCompassStealth(CActor *pActor, float fDeltaTime)
 	{
 		SAIDetectionLevels levels;
 		gEnv->pAISystem->GetDetectionLevels(0, levels);
-		//			float exposure = 0, threat = 0;
-		//			gEnv->pAISystem->GetExposureAndThreat(NULL, exposure, threat);
 
 		static int test = 0;
 		if (test == 0)
@@ -1072,8 +1070,6 @@ void CHUDRadar::UpdateCompassStealth(CActor *pActor, float fDeltaTime)
 	}		
 	if(m_fLastStealthValueStatic != fStealthValueStatic && !gEnv->bMultiplayer)
 	{
-		//m_flashRadar->CheckedInvoke("Root.RadarCompassStealth.StealthExposure.gotoAndStop", fStealthValueStatic);
-
 		g_pGame->GetHUD()->SetStealthExposure(fStealthValueStatic);
 		m_fLastStealthValueStatic = fStealthValueStatic;
 	}
@@ -1092,7 +1088,7 @@ void CHUDRadar::UpdateCompassStealth(CActor *pActor, float fDeltaTime)
 			originalDirection = 2.0f;
 		else if(originalDirection < -0.1f)
 			originalDirection = -2.0f;
-		fCompass = m_fLastCompassRot + (compassDir * m_jammingValue * 10.0f * fDeltaTime) /*+ fDeltaTime*((compassDir > 0)?3.0f:(-3.0f))*/ + originalDirection * fDeltaTime;
+		fCompass = m_fLastCompassRot + (compassDir * m_jammingValue * 10.0f * fDeltaTime) + originalDirection * fDeltaTime;
 		if(fCompass > gf_PI)
 			fCompass = -gf_PI + (fabsf(fCompass) - fabsf(int(fCompass / gf_PI) * gf_PI));
 		else if(fCompass < -gf_PI)
diff --git a/Mods/Falcon/Code/HUD/HUDScopes.cpp b/Mods/Falcon/Code/HUD/HUDScopes.cpp
index 2557bc1..5886a8c 100644
--- a/Mods/Falcon/Code/HUD/HUDScopes.cpp
+++ b/Mods/Falcon/Code/HUD/HUDScopes.cpp
@@ -255,9 +255,6 @@ void CHUDScopes::DisplayBinoculars(CPlayer* pPlayerActor)
 				{
 					if(g_pGame->GetGameRules()->GetTeam(pPlayerActor->GetEntityId()) == g_pGame->GetGameRules()->GetTeam(pEntity->GetId()))
 						continue;
-
-					// Do not display any silouhette in MP (Eric's request)
-//					SetSilhouette(pActor,NULL);
 				}
 			}
 		}
@@ -317,7 +314,7 @@ void CHUDScopes::ShowBinoculars(bool bVisible, bool bShowIfNoHUD, bool bNoFadeOu
 		m_bDestroyBinocularsAtNextFrame = false;
 		g_pHUD->SetAirStrikeBinoculars(true);
 	}
-	else /* if(!bVisible) */
+	else
 	{
 		if(m_bShowBinoculars)
 		{
@@ -352,7 +349,6 @@ void CHUDScopes::SetBinocularsDistance(float fDistance)
 
 void CHUDScopes::SetBinocularsZoomMode(int iZoomMode)
 {
-//	m_animBinoculars.Invoke("setZoomMode", iZoomMode);
 	m_iZoomLevel = iZoomMode;
 }
 
diff --git a/Mods/Falcon/Code/HUD/HUDSoundImpl.cpp b/Mods/Falcon/Code/HUD/HUDSoundImpl.cpp
index 99953a5..3fb6fc9 100644
--- a/Mods/Falcon/Code/HUD/HUDSoundImpl.cpp
+++ b/Mods/Falcon/Code/HUD/HUDSoundImpl.cpp
@@ -175,7 +175,6 @@ void CHUD::PlayStatusSound(const char* name, bool forceSuitSound)
 	if(!gEnv->pSoundSystem)
 		return;
 
-	//string strSound("languages/dialog/suit/");
 	string strSound;
 
 	//we don't want to play the suit sounds at once (because of quick mode change key)
diff --git a/Mods/Falcon/Code/HUD/HUDTagNames.cpp b/Mods/Falcon/Code/HUD/HUDTagNames.cpp
index 4a4bd80..05763a6 100644
--- a/Mods/Falcon/Code/HUD/HUDTagNames.cpp
+++ b/Mods/Falcon/Code/HUD/HUDTagNames.cpp
@@ -400,50 +400,6 @@ void CHUDTagNames::DrawTagName(IVehicle *pVehicle)
 		}
 
 		SAFE_HUD_FUNC(UpdateMissionObjectiveIcon(pActor->GetEntityId(), (pActor->GetHealth() <= 0)?0:friendly, iTeam==1?eOS_NKPlayer:eOS_USPlayer, false, Vec3(0,0,0), true));
-
-		/*
-		const char *szRank = GetPlayerRank(uiEntityId);
-
-		IEntity *pEntity = pActor->GetEntity();
-		if(!pEntity)
-			continue;
-
-		char szText[HUD_MAX_STRING_SIZE];
-		if(szRank)
-		{
-			sprintf(szText,"%s %s",szRank,pEntity->GetName());
-		}
-		else
-		{
-			sprintf(szText,"%s",pEntity->GetName());
-		}
-
-		if(0 == iClientTeam)
-		{
-			if(uiEntityId && IsFriendlyToClient(uiEntityId))
-			{
-				rgbTagName = COLOR_FRIEND;
-			}
-		}
-		else if(uiEntityId && pGameRules->GetTeam(uiEntityId) == iClientTeam)
-		{
-			rgbTagName = COLOR_FRIEND;
-		}
-		
-		if(pActor->GetHealth() <= 0)
-		{
-			rgbTagName = COLOR_DEAD;
-		}
-
-		m_tagNamesVector.resize(m_tagNamesVector.size()+1);
-
-		STagName *pTagName = &m_tagNamesVector[m_tagNamesVector.size()-1];
-
-		pTagName->strName			= szText;
-		pTagName->vWorld			= vWorldPos;
-		pTagName->bDrawOnTop	= bDrawOnTop;
-		pTagName->rgb					= rgbTagName;
-		*/
 	}
 
 	DrawTagNames();
@@ -496,7 +452,6 @@ void CHUDTagNames::Update()
 			if(pClientActor->GetSpectatorMode() == CActor::eASM_Follow && pClientActor->GetSpectatorTarget() == pActor->GetEntityId())
 				continue;
 
-			//DrawTagName(pActor);
 			int friendly = 1;
 			if(alreadySelected)
 			{
@@ -576,7 +531,6 @@ void CHUDTagNames::Update()
 				IActor *pActor = g_pGame->GetIGameFramework()->GetIActorSystem()->GetActor(pEnemyTagName->uiEntityId);
 				if(pActor)
 				{
-					//DrawTagName(pActor);
 					int team = pGameRules->GetTeam(pActor->GetEntityId());
 					if(team!=iClientTeam || pGameRules->GetTeamCount()<=1)
 						SAFE_HUD_FUNC(UpdateMissionObjectiveIcon(pActor->GetEntityId(), (pActor->GetHealth() <= 0)?0:2, team==1?eOS_NKPlayer:eOS_USPlayer, false, Vec3(0,0,0), true));
diff --git a/Mods/Falcon/Code/HUD/HUDTextChat.cpp b/Mods/Falcon/Code/HUD/HUDTextChat.cpp
index e96d5c8..0965700 100644
--- a/Mods/Falcon/Code/HUD/HUDTextChat.cpp
+++ b/Mods/Falcon/Code/HUD/HUDTextChat.cpp
@@ -238,7 +238,6 @@ void CHUDTextChat::Flush(bool close)
 	{
 		m_isListening = false;
 		gEnv->pInput->SetExclusiveListener(NULL);
-		//((CHUD*)m_parent)->ShowTextField(false);
 		m_flashChat->Invoke("setVisibleChatBox", 0);
 		m_flashChat->Invoke("GamepadAvailable", false);
 		m_textInputActive = false;
diff --git a/Mods/Falcon/Code/HUD/HUDTextChat.h b/Mods/Falcon/Code/HUD/HUDTextChat.h
index 0a479e1..e195ba5 100644
--- a/Mods/Falcon/Code/HUD/HUDTextChat.h
+++ b/Mods/Falcon/Code/HUD/HUDTextChat.h
@@ -95,8 +95,6 @@ class CHUDTextChat : public CHUDObject,public IInputEventListener, public IFSCom
 	bool					m_showVirtualKeyboard;
 
 	bool					m_anyCurrentText;
-	/*bool					m_showing;
-	float					m_lastUpdate;*/
 	float					m_repeatTimer;
 	SInputEvent		m_repeatEvent;
 };
diff --git a/Mods/Falcon/Code/HUD/HUDTextEvents.cpp b/Mods/Falcon/Code/HUD/HUDTextEvents.cpp
index fba571d..6e6b01e 100644
--- a/Mods/Falcon/Code/HUD/HUDTextEvents.cpp
+++ b/Mods/Falcon/Code/HUD/HUDTextEvents.cpp
@@ -121,22 +121,6 @@ namespace NSKeyTranslation
 		inString.insert(pos, wcharString.c_str());
 	}
 
-	/*
-	template<size_t S>
-	void InsertString(CryFixedStringT<S>& inString, size_t pos, const wchar_t* s)
-	{
-		CryFixedStringT<64> charString;
-		TruncateToChar(s, charString);
-		inString.insert(pos, charString.c_str());
-	}
-
-	template<size_t S>
-	void InsertString(CryFixedStringT<S>& inString, size_t pos, const char* s)
-	{
-		inString.insert(pos, s);
-	}
-	*/
-
 	// Replaces all occurrences of %[actionmap:actionid] with the current key binding
 	template<size_t S>
 	void ReplaceActions(ILocalizationManager* pLocMgr, CryFixedWStringT<S>& inString)
@@ -170,7 +154,6 @@ namespace NSKeyTranslation
 					*t2 = 0;
 					const typename T::value_type* actionMapName = inString.begin()+pos+actionPrefixLen;
 					const typename T::value_type* actionName = inString.begin()+pos1+1;
-					// CryLogAlways("Found: '%S' '%S'", actionMapName, actionName);
 					bool bFound = LookupBindInfo(actionMapName, actionName, bPreferXI, gBindInfo);
 					*t1 = actionDelim; // re-replace ':'
 					*t2 = actionDelimEnd; // re-replace ']'
@@ -271,7 +254,7 @@ CHUD::LocalizeWithParams(const char* label, bool bAdjustActions, const char* par
 }
 
 
-void CHUD::DisplayFlashMessage(const char* label, int pos /* = 1 */, const ColorF &col /* = Col_White */, bool formatWStringWithParams /* = false */, const char* paramLabel1 /* = 0 */, const char* paramLabel2 /* = 0 */, const char* paramLabel3 /* = 0 */, const char* paramLabel4 /* = 0 */)
+void CHUD::DisplayFlashMessage(const char* label, int pos, const ColorF &col, bool formatWStringWithParams, const char* paramLabel1, const char* paramLabel2, const char* paramLabel3, const char* paramLabel4)
 {
 	if(!label || m_quietMode)
 		return;
@@ -299,7 +282,7 @@ void CHUD::DisplayFlashMessage(const char* label, int pos /* = 1 */, const Color
 	}
 }
 
-void CHUD::DisplayOverlayFlashMessage(const char* label, const ColorF &col /* = Col_White */, bool formatWStringWithParams /* = false */, const char* paramLabel1 /* = 0 */, const char* paramLabel2 /* = 0 */, const char* paramLabel3 /* = 0 */, const char* paramLabel4 /* = 0 */)
+void CHUD::DisplayOverlayFlashMessage(const char* label, const ColorF &col, bool formatWStringWithParams, const char* paramLabel1, const char* paramLabel2, const char* paramLabel3, const char* paramLabel4)
 {
 	if(!label)
 		return;
@@ -386,8 +369,6 @@ void CHUD::DisplayKillMessage(const char* name, int times, bool teamkill, bool f
 	const wchar_t* localizedText = L"";
 	localizedText = LocalizeWithParams(message.c_str(), true);
 
-	//addKillLog("",true,"para"+Math.round(Math.random()*100), "#FFFF00", "para"+Math.round(Math.random()*100), "#CF3E12");
-
 	if(showname==false)
 	{
 		SFlashVarValue args[2] = {localizedText, true};
@@ -836,7 +817,6 @@ void CHUD::InternalShowSubtitle(const char* subtitleLabel, ISound* pSound, bool
 				if (entry.nChunks == 0)
 				{
 					entry.timeRemaining = std::max(entry.timeRemaining, 0.8f); // minimum is 0.8 seconds
-					// entry.timeRemaining = std::min(entry.timeRemaining*1.3f, entry.timeRemaining+2.5f); // 30 percent longer, but max 2.5 seconds
 					SubtitleAssignCharacterName(entry);
 					entry.localized.append(localizedString.c_str(), localizedString.length());
 				}
@@ -859,7 +839,7 @@ void CHUD::InternalShowSubtitle(const char* subtitleLabel, ISound* pSound, bool
 			}
 		}
 	}
-	else // if (bShow)
+	else
 	{
 		tSoundID soundId = pSound ? pSound->GetId() : INVALID_SOUNDID;
 		for (TSubtitleEntries::iterator iter = m_subtitleEntries.begin(); iter != m_subtitleEntries.end(); )
@@ -883,7 +863,7 @@ void CHUD::InternalShowSubtitle(const char* subtitleLabel, ISound* pSound, bool
 	}
 }
 
-void CHUD::SetRadioButtons(bool active, int buttonNo /* = 0 */)
+void CHUD::SetRadioButtons(bool active, int buttonNo)
 {
 	if(active)
 	{
@@ -1129,7 +1109,7 @@ void CHUD::ShowWarningMessage(EWarningMessages message, const char* optionalText
 		pPlayer->GetPlayerInput()->DisableXI(true);
 }
 
-void CHUD::HandleWarningAnswer(const char* warning /* = NULL */)
+void CHUD::HandleWarningAnswer(const char* warning)
 {
 	m_animWarningMessages.SetVisible(false);
 	CPlayer *pPlayer = static_cast<CPlayer *>(g_pGame->GetIGameFramework()->GetClientActor());
@@ -1138,7 +1118,6 @@ void CHUD::HandleWarningAnswer(const char* warning /* = NULL */)
 	{
 		if(!strcmp(warning, "suicide"))
 		{
-			//SwitchToModalHUD(NULL,false);
 			gEnv->pConsole->ExecuteString("kill me");
 		}
 		else if(!strcmp(warning, "spectate"))
@@ -1203,7 +1182,6 @@ void CHUD::UpdateSubtitlesManualRender(float frameTime)
 					}
 				}
 			}
-			//
 
 			if (entry.bPersistant == false)
 			{
@@ -1281,7 +1259,6 @@ void CHUD::UpdateSubtitlesManualRender(float frameTime)
 		IRenderer* pRenderer = gEnv->pRenderer;
 		const float x = 0.0f;
 		const float maxWidth = 700.0f;
-		// float y = 600.0f - (g_pGameCVars->hud_panoramicHeight * 600.0f / 768.0f) + 2.0f;
 		float y = 600.0f - (g_pGameCVars->hud_subtitlesHeight * 6.0f) + 1.0f; // subtitles height is in percent of screen height (600.0)
 
 		pUIDraw->PreRender();
@@ -1316,7 +1293,6 @@ void CHUD::UpdateSubtitlesManualRender(float frameTime)
 				}
 				pUIDraw->GetWrappedTextDimW(m_pDefaultFont,&sizeX, &sizeY, maxWidth, textSize, textSize, szLocText);
 				pUIDraw->DrawWrappedTextW(m_pDefaultFont,x, y, maxWidth, textSize, textSize, szLocText, clr.a, clr.r, clr.g, clr.b, 
-					// UIDRAWHORIZONTAL_LEFT,UIDRAWVERTICAL_TOP,UIDRAWHORIZONTAL_LEFT,UIDRAWVERTICAL_TOP);
 					UIDRAWHORIZONTAL_CENTER,UIDRAWVERTICAL_TOP,UIDRAWHORIZONTAL_CENTER,UIDRAWVERTICAL_TOP);
 			}
 			else
diff --git a/Mods/Falcon/Code/HUD/HUDVehicleInterface.cpp b/Mods/Falcon/Code/HUD/HUDVehicleInterface.cpp
index 6864e7f..590813c 100644
--- a/Mods/Falcon/Code/HUD/HUDVehicleInterface.cpp
+++ b/Mods/Falcon/Code/HUD/HUDVehicleInterface.cpp
@@ -32,7 +32,7 @@ CHUDVehicleInterface::CHUDVehicleInterface(CHUD *pHUD, CGameFlashAnimation *pAmm
 	m_lastSetFriendly = m_friendlyFire = false;
 	m_seatId = InvalidVehicleSeatId;
 
-	m_iSecondaryAmmoCount = m_iPrimaryAmmoCount = m_iSecondaryClipSize = m_iPrimaryClipSize = 0;// m_iHeat = 0;
+	m_iSecondaryAmmoCount = m_iPrimaryAmmoCount = m_iSecondaryClipSize = m_iPrimaryClipSize = 0;
 	m_iLastReloadBarValue = -1;
 
 	m_animMainWindow.Init("Libs/UI/HUD_VehicleHUD.gfx", eFD_Center, eFAF_ManualRender|eFAF_Visible|eFAF_ThisHandler);
@@ -841,19 +841,6 @@ void CHUDVehicleInterface::ShowVehicleInterface(EVehicleHud type, bool forceFlas
 						iPrimaryAmmoCount=pWeapon->GetAmmoCount(pAmmoType);
 					}
 
-					/*if(pFireMode->CanOverheat())
-					{
-						int heat = int(pFireMode->GetHeat()*100);
-						if(m_iHeat != heat)
-						{
-							SFlashVarValue args[2] = {true, pFireMode->GetHeat()*100};
-							g_pAmmo->Invoke("setOverheatBar", args, 2);
-							m_iHeat = heat;
-						}
-					}
-					else
-						m_iHeat = 0;*/
-					
 					int fmIdx = g_pHUD->GetSelectedFiremode();
 					if(fmIdx == 8 || fmIdx == 15 || fmIdx == 22 || fmIdx == 24) //infite ammo firemodes
 						iSecondaryClipSize = -1;
@@ -894,8 +881,6 @@ void CHUDVehicleInterface::ShowVehicleInterface(EVehicleHud type, bool forceFlas
 			{
 				SFlashVarValue args[7] = {iSecondaryAmmoCount, iPrimaryAmmoCount, iSecondaryClipSize, iPrimaryClipSize, 0, "", false};
 				g_pAmmo->Invoke("setAmmo", args, 7);
-				//if(iSecondaryClipSize == -1)
-				//	g_pAmmo->Invoke("setFireMode", 8);
 				m_iSecondaryAmmoCount	= iSecondaryAmmoCount;
 				m_iPrimaryAmmoCount		= iPrimaryAmmoCount;
 				m_iSecondaryClipSize	= iSecondaryClipSize;
@@ -984,8 +969,6 @@ void CHUDVehicleInterface::ShowVehicleInterface(EVehicleHud type, bool forceFlas
 		}
 
 		sprintf(szAltitude,"%.2f",fAltitude);
-
-		//g_pHUD->GetGPSPosition(szN,szW);
 		m_animMainWindow.Invoke("setHorizon", fHorizon);
 	}
 	if(type == EHUD_VTOL || type == EHUD_HELI)
diff --git a/Mods/Falcon/Code/HomingMissile.cpp b/Mods/Falcon/Code/HomingMissile.cpp
index 9e98089..e3ab9ea 100644
--- a/Mods/Falcon/Code/HomingMissile.cpp
+++ b/Mods/Falcon/Code/HomingMissile.cpp
@@ -126,7 +126,6 @@ void CHomingMissile::UpdateControlledMissile(float frameTime)
 						pTarget->GetWorldBounds(box);
 						Vec3 finalDes = box.GetCenter();
 						SetDestination(finalDes);
-						//SetDestination( box.GetCenter() );
 					}
 
 					m_lockedTimer+=0.05f;
@@ -169,7 +168,6 @@ void CHomingMissile::UpdateControlledMissile(float frameTime)
 
 						eyePos = viewParams.position;
 						eyeDir = viewParams.rotation * Vec3(0,1,0);
-						//eyeDir = (viewParams.targetPos - viewParams.position).GetNormalizedSafe();
 					}
 
 					int pierceability=7;
@@ -388,7 +386,7 @@ void CHomingMissile::UpdateCruiseMissile(float frameTime)
 
 		if (goalAngle > maxAngle+0.05f)    
 			dir = (Vec3::CreateSlerp(currentDir, goalDir, maxAngle/goalAngle)).normalize();
-		else //if (goalAngle < 0.005f)
+		else
 			dir = goalDir;
 	}
 
diff --git a/Mods/Falcon/Code/Nodes/HUDNodes.cpp b/Mods/Falcon/Code/Nodes/HUDNodes.cpp
index e9304b7..9fa3586 100644
--- a/Mods/Falcon/Code/Nodes/HUDNodes.cpp
+++ b/Mods/Falcon/Code/Nodes/HUDNodes.cpp
@@ -51,8 +51,6 @@ class CFlowNode_PDAMessage : public CFlowBaseNode
 	{
 		if(eFE_Activate == event && IsPortActive(pActInfo,0))
 		{
-			//SGameObjectEvent evt(GetPortString(pActInfo,1).c_str(),eGOEF_ToAll);
-
 			const string& type = GetPortString(pActInfo,2);
 
 			if(type.empty())
@@ -1514,5 +1512,4 @@ REGISTER_FLOW_NODE("HUD:NightVision",									 CFlowNode_HUDNightVision);
 REGISTER_FLOW_NODE("HUD:Binoculars",									 CFlowNode_HUDBinoculars);
 REGISTER_FLOW_NODE_SINGLETON("HUD:ProgressBar",				 CFlowNode_HUDProgressBar);
 REGISTER_FLOW_NODE_SINGLETON("HUD:Objectives",				 CFlowNode_HUDObjectives);
-// REGISTER_FLOW_NODE_SINGLETON("HUD:TutorialMsg",        CFlowNode_HUDTutorial);
 REGISTER_FLOW_NODE_SINGLETON("HUD:OverlayMsg",         CFlowNode_HUDOverlayMessage);
\ No newline at end of file
diff --git a/Mods/Falcon/Code/PlayerInput.cpp b/Mods/Falcon/Code/PlayerInput.cpp
index 6bb6bb6..52ff072 100644
--- a/Mods/Falcon/Code/PlayerInput.cpp
+++ b/Mods/Falcon/Code/PlayerInput.cpp
@@ -827,8 +827,6 @@ void CPlayerInput::SerializeSaveGame( TSerialize ser )
 			if(proning)
 				OnAction(g_pGame->Actions().prone, 1, 1.0f);
 		}
-
-		//ser.Value("Actions", m_actions); //don't serialize the actions - this will only lead to repeating movement (no key-release)
 	}
 }
 
@@ -1071,7 +1069,7 @@ bool CPlayerInput::OnActionCrouch(EntityId entityId, const ActionId& actionId, i
 			m_pPlayer->GetNanoSuit()->Tap(eNA_Crouch);
 		}
 
-		if (g_pGameCVars->cl_crouchToggle)
+		if (g_pGameCVars->fn_crouchToggle)
 		{
 			if (value > 0.0f)
 			{
@@ -1085,7 +1083,6 @@ bool CPlayerInput::OnActionCrouch(EntityId entityId, const ActionId& actionId, i
 		{
 			if (value > 0.0f)
 			{
-				//if (m_pPlayer->m_params.speedMultiplier > 0.99f)
 				m_actions |= ACTION_CROUCH;
 			}
 			else
diff --git a/Mods/Falcon/Code/RocketLauncher.h b/Mods/Falcon/Code/RocketLauncher.h
index 5051a2c..1850ff9 100644
--- a/Mods/Falcon/Code/RocketLauncher.h
+++ b/Mods/Falcon/Code/RocketLauncher.h
@@ -31,8 +31,8 @@ class CRocketLauncher : public CWeapon
 	virtual bool SetAspectProfile(EEntityAspects aspect, uint8 profile);
 	virtual void Select(bool select);
 	virtual void UpdateFPView(float frameTime);
-	virtual void PickUp(EntityId pickerId, bool sound, bool select/* =true */, bool keepHistory/* =true */);
-	virtual void Drop(float impulseScale, bool selectNext/* =true */, bool byDeath/* =false */);
+	virtual void PickUp(EntityId pickerId, bool sound, bool select, bool keepHistory);
+	virtual void Drop(float impulseScale, bool selectNext, bool byDeath);
 	virtual void ProcessEvent(SEntityEvent& event);
 
 	virtual void GetAttachmentsAtHelper(const char *helper, std::vector<string> &rAttachments);
@@ -53,7 +53,6 @@ class CRocketLauncher : public CWeapon
 	//Laser beam (TP) - It works more or less like LAM.cpp
 	void ActivateTPLaser(bool activate);
 	void UpdateTPLaser(float frameTime);
-	void AttachFakeLaserToOwner(bool attach);
 
 	int		m_dotEffectSlot;
 	bool	m_auxSlotUsed;
diff --git a/Mods/Falcon/Code/Scout.h b/Mods/Falcon/Code/Scout.h
index 6ab03fc..92c41a1 100644
--- a/Mods/Falcon/Code/Scout.h
+++ b/Mods/Falcon/Code/Scout.h
@@ -49,7 +49,6 @@ class CScout :
 	virtual void SetActorMovement(SMovementRequestParams &control);
 
 	virtual void FullSerialize( TSerialize ser );
-	//virtual bool NetSerialize( TSerialize ser, EEntityAspects aspect, uint8 profile, int flags );
 
 	void GetMemoryStatistics(ICrySizer * s);