src/command.c

@@ -79,7 +79,6 @@ CV_PossibleValue_t kartspeed_cons_t[] = {
 
 static boolean execversion_enabled = false;
 consvar_t cv_execversion = {"execversion","1",CV_CALL,CV_Unsigned, CV_EnforceExecVersion, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_birdmod = {"birdmod", "0", CV_SAVE|CV_NOSHOWHELP, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 // for default joyaxis detection
 #if 0

src/command.h

@@ -143,7 +143,6 @@ extern CV_PossibleValue_t CV_Natural[];
 extern CV_PossibleValue_t kartspeed_cons_t[];
 
 extern consvar_t cv_execversion;
-extern consvar_t cv_birdmod;
 
 void CV_InitFilterVar(void);
 void CV_ToggleExecVersion(boolean enable);

src/m_menu.c

@@ -3426,19 +3426,6 @@ void M_Drawer(void)
 	interpTimerHackAllow = false;
 }
 
-static tic_t disclaimertic;
-
-static void
-M_AcceptBird (event_t *ev)
-{
-	(void)ev;
-	if (disclaimertic >= 3*TICRATE)
-	{
-		CV_SetValue(&cv_birdmod, 1);
-		M_StopMessage(0);
-	}
-}
-
 //
 // M_StartControlPanel
 //
@@ -3633,23 +3620,6 @@ void M_StartControlPanel(void)
 	}
 
 	CON_ToggleOff(); // move away console
-
-	if (cv_birdmod.value == 0)
-	{
-		currentMenu->lastOn = itemOn;
-
-		M_StartMessage(
-				"\x82WARNING\n\x80"
-				"This version of bird mod includes\n"
-				"a feature that may cause motion\n"
-				"sickness for some people.\n\n"
-
-				"You may want to look at\n"
-				"the\x82 Bird Options\x80 first.\n\n"
-
-				"(wait 3 seconds...)",
-				M_AcceptBird, MM_EVENTHANDLER);
-	}
 }
 
 void M_EndModeAttackRun(void)
@@ -3758,33 +3728,6 @@ void M_Ticker(void)
 #endif
 
 	CL_TimeoutServerList();
-
-	if (menuactive && cv_birdmod.value == 0)
-	{
-		if (disclaimertic < 3*TICRATE)
-		{
-			disclaimertic++;
-
-			if (disclaimertic % TICRATE == 0)
-			{
-				char *p = strrchr(MessageDef.menuitems[0].text, '\n');
-
-				if (disclaimertic == TICRATE)
-				{
-					strcpy(&p[1], "(wait 2 seconds...)");
-				}
-				else
-				{
-					strcpy(&p[1], "(wait 1 second...)");
-				}
-			}
-		}
-		else
-		{
-			char *p = strrchr(MessageDef.menuitems[0].text, '\n');
-			strcpy(&p[1], "(press a key)");
-		}
-	}
 }
 
 //

src/m_misc.c

@@ -501,8 +501,6 @@ void M_FirstLoadConfig(void)
 	// register execversion here before we load any configs
 	CV_RegisterVar(&cv_execversion);
 
-	CV_RegisterVar(&cv_birdmod);
-
 	// temporarily reset execversion to default
 	// we shouldn't need to do this, but JUST in case...
 	CV_ToggleExecVersion(true);

src/p_user.c

@@ -7135,11 +7135,11 @@ consvar_t cv_cam4_speed = {"cam4_speed", "0.4", CV_FLOAT|CV_SAVE, CV_CamSpeed, N
 consvar_t cv_cam4_rotate = {"cam4_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate4_OnChange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_cam4_rotspeed = {"cam4_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_tilting = {"tilting", "On", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_quaketilt = {"quaketilt", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_tilting = {"tilting", "Off", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_quaketilt = {"quaketilt", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_tiltsmoothing = {"tiltsmoothing", "32", CV_SAVE, CV_Natural, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_actionmovie = {"actionmovie", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_actionmovie = {"actionmovie", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_windowquake = {"windowquake", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 fixed_t t_cam_dist = -42;