diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd69f0209..4a9c0b533 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,6 +49,8 @@ if( NOT PROJECT_LIBRARIES )
 	set( PROJECT_LIBRARIES "" )
 endif()
 
+add_definitions( -DTHIS_IS_GZDOOM )
+
 if( WIN32 )
 
 	add_definitions( -D_WIN32 )
diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp
index 8dc10fa11..e2876da9a 100644
--- a/src/d_netinfo.cpp
+++ b/src/d_netinfo.cpp
@@ -63,7 +63,7 @@ CVAR (Int,		team,					TEAM_NONE,	CVAR_USERINFO | CVAR_ARCHIVE);
 CVAR (String,	gender,					"male",		CVAR_USERINFO | CVAR_ARCHIVE);
 CVAR (Bool,		neverswitchonpickup,	false,		CVAR_USERINFO | CVAR_ARCHIVE);
 CVAR (Float,	movebob,				0.25f,		CVAR_USERINFO | CVAR_ARCHIVE);
-CVAR (Bool,     fviewbob,               true,       CVAR_USERINFO | CVAR_ARCHIVE);
+CVAR (Bool,		fviewbob,               true,       CVAR_USERINFO | CVAR_ARCHIVE);
 CVAR (Float,	stillbob,				0.f,		CVAR_USERINFO | CVAR_ARCHIVE);
 CVAR (Float,	wbobspeed,				1.f,		CVAR_USERINFO | CVAR_ARCHIVE);
 CVAR (Float,	wbobfire,				0.f,		CVAR_USERINFO | CVAR_ARCHIVE);
@@ -81,7 +81,7 @@ enum
 	INFO_Gender,
 	INFO_NeverSwitchOnPickup,
 	INFO_MoveBob,
-    INFO_FViewBob,
+	INFO_FViewBob,
 	INFO_StillBob,
 	INFO_WBobSpeed,
 	INFO_WBobFire,
diff --git a/src/playsim/d_player.h b/src/playsim/d_player.h
index 5363a3687..8de552e04 100644
--- a/src/playsim/d_player.h
+++ b/src/playsim/d_player.h
@@ -226,10 +226,10 @@ struct userinfo_t : TMap<FName,FBaseCVar *>
 	{
 		return *static_cast<FFloatCVar *>(*CheckKey(NAME_MoveBob));
 	}
-    double GetFViewBob() const
-    {
-        return *static_cast<FBoolCVar *>(*CheckKey(NAME_FViewBob));
-    }
+	double GetFViewBob() const
+	{
+		return *static_cast<FBoolCVar *>(*CheckKey(NAME_FViewBob));
+	}
 	double GetStillBob() const
 	{
 		return *static_cast<FFloatCVar *>(*CheckKey(NAME_StillBob));
diff --git a/src/playsim/p_acs.cpp b/src/playsim/p_acs.cpp
index 8d3873386..374a1611d 100644
--- a/src/playsim/p_acs.cpp
+++ b/src/playsim/p_acs.cpp
@@ -531,11 +531,11 @@
 		PLAYERINFO_GENDER,
 		PLAYERINFO_NEVERSWITCH,
 		PLAYERINFO_MOVEBOB,
-        PLAYERINFO_FVIEWBOB,
 		PLAYERINFO_STILLBOB,
 		PLAYERINFO_PLAYERCLASS,
 		PLAYERINFO_FOV,
 		PLAYERINFO_DESIREDFOV,
+		PLAYERINFO_FVIEWBOB,
 	};
 
 
@@ -9955,11 +9955,11 @@ scriptwait:
 				case PLAYERINFO_GENDER:			STACK(2) = userinfo->GetGender(); break;
 				case PLAYERINFO_NEVERSWITCH:	STACK(2) = userinfo->GetNeverSwitch(); break;
 				case PLAYERINFO_MOVEBOB:		STACK(2) = DoubleToACS(userinfo->GetMoveBob()); break;
-                case PLAYERINFO_FVIEWBOB:		STACK(2) = DoubleToACS(userinfo->GetFViewBob()); break;
 				case PLAYERINFO_STILLBOB:		STACK(2) = DoubleToACS(userinfo->GetStillBob()); break;
 				case PLAYERINFO_PLAYERCLASS:	STACK(2) = userinfo->GetPlayerClassNum(); break;
 				case PLAYERINFO_DESIREDFOV:		STACK(2) = (int)pl->DesiredFOV; break;
 				case PLAYERINFO_FOV:			STACK(2) = (int)pl->FOV; break;
+				case PLAYERINFO_FVIEWBOB:		STACK(2) = DoubleToACS(userinfo->GetFViewBob()); break;
 				default:						STACK(2) = 0; break;
 				}
 			}
diff --git a/src/playsim/p_mobj.cpp b/src/playsim/p_mobj.cpp
index 6908a9b95..996ddf716 100644
--- a/src/playsim/p_mobj.cpp
+++ b/src/playsim/p_mobj.cpp
@@ -2410,8 +2410,8 @@ static void P_ZMovement (AActor *mo, double oldfloorz)
 	}
 	if (mo->player && (mo->flags & MF_NOGRAVITY) && (mo->Z() > mo->floorz))
 	{
-        FBaseCVar* const fViewBobCvar = G_GetUserCVar(int(mo->player - players),"FViewBob");
-        bool const fViewBob = fViewBobCvar->GetGenericRep(fViewBobCvar->GetRealType()).Bool;
+		FBaseCVar* const fViewBobCvar = G_GetUserCVar(int(mo->player - players),"FViewBob");
+		bool const fViewBob = fViewBobCvar->GetGenericRep(fViewBobCvar->GetRealType()).Bool;
 
 		if (!mo->IsNoClip2() && fViewBob)
 		{
diff --git a/src/playsim/p_user.cpp b/src/playsim/p_user.cpp
index 8f5e7e5a1..1636139ad 100644
--- a/src/playsim/p_user.cpp
+++ b/src/playsim/p_user.cpp
@@ -798,8 +798,8 @@ DEFINE_ACTION_FUNCTION(_PlayerInfo, GetMoveBob)
 
 DEFINE_ACTION_FUNCTION(_PlayerInfo, GetFViewBob)
 {
-    PARAM_SELF_STRUCT_PROLOGUE(player_t);
-    ACTION_RETURN_BOOL(self->userinfo.GetFViewBob());
+	PARAM_SELF_STRUCT_PROLOGUE(player_t);
+	ACTION_RETURN_BOOL(self->userinfo.GetFViewBob());
 }
 
 DEFINE_ACTION_FUNCTION(_PlayerInfo, GetStillBob)
diff --git a/wadsrc/static/zscript/actors/player/player.zs b/wadsrc/static/zscript/actors/player/player.zs
index deb16ef20..bd5710e68 100644
--- a/wadsrc/static/zscript/actors/player/player.zs
+++ b/wadsrc/static/zscript/actors/player/player.zs
@@ -592,7 +592,7 @@ class PlayerPawn : Actor
 
 		if (bFly && !GetCVar("FViewBob"))
 		{
-		    bob = 0;
+			bob = 0;
 		}
 		else if (still)
 		{