Added Quit Prompt option, removed -fitz option (from Ironwail)

Author: vsonnier

Quake/cl_main.c

@@ -51,6 +51,7 @@ cvar_t cl_maxpitch = {"cl_maxpitch", "90", CVAR_ARCHIVE};  // johnfitz -- variab
 cvar_t cl_minpitch = {"cl_minpitch", "-90", CVAR_ARCHIVE}; // johnfitz -- variable pitch clamping
 
 cvar_t cl_startdemos = {"cl_startdemos", "1", CVAR_ARCHIVE};
+cvar_t cl_confirmquit = {"cl_confirmquit", "0", CVAR_ARCHIVE};
 
 client_static_t cls;
 client_state_t	cl;
@@ -1399,6 +1400,7 @@ void CL_Init (void)
 	Cvar_RegisterVariable (&cl_minpitch); // johnfitz -- variable pitch clamping
 
 	Cvar_RegisterVariable (&cl_startdemos);
+	Cvar_RegisterVariable (&cl_confirmquit);
 
 	Cmd_AddCommand ("entities", CL_PrintEntities_f);
 	Cmd_AddCommand ("disconnect", CL_Disconnect_f);

Quake/common.c

@@ -49,7 +49,6 @@ cvar_t cmdline = {"cmdline", "", CVAR_ROM /*|CVAR_SERVERINFO*/}; /* sending cmdl
 
 static qboolean com_modified; // set true if using non-id files
 
-qboolean fitzmode;
 qboolean multiuser;
 
 static void COM_Path_f (void);
@@ -1938,9 +1937,6 @@ void COM_Init (void)
 	if (bytes[0] != 0x78 || bytes[1] != 0x56 || bytes[2] != 0x34 || bytes[3] != 0x12)
 		Sys_Error ("Unsupported endianism. Only little endian is supported");
 
-	if (COM_CheckParm ("-fitz"))
-		fitzmode = true;
-
 	if (COM_CheckParm ("-validation"))
 		vulkan_globals.validation = true;
 
@@ -2587,7 +2583,7 @@ static void COM_AddGameDirectoryRoot (const char *base, const char *dir, unsigne
 			com_searchpaths = search;
 		}
 
-		if ((i == 0) && (path_id == 1) && add_embedded && !fitzmode)
+		if ((i == 0) && (path_id == 1) && add_embedded)
 		{
 			size_t vkquake_pak_size_compressed = vkquake_pak_size, vkquake_pak_size_extracted = vkquake_pak_decompressed_size;
 			if (!vkquake_pak_extracted)

Quake/common.h

@@ -484,7 +484,6 @@ qfilesize_t FS_filelength (fshandle_t *fh);
 
 extern struct cvar_s registered;
 extern qboolean		 standard_quake, rogue, hipnotic;
-extern qboolean		 fitzmode;
 /* if true, run in fitzquake mode disabling custom quakespasm hacks */
 
 #endif /* _Q_COMMON_H */

Quake/gl_screen.c

@@ -692,7 +692,7 @@ static void SCR_DrawClock (cb_context_t *cbx)
 		shown_pause = true;
 	}
 
-	if ((scr_clock.value == 0 && scr_clock_off <= 0 && !(sb_showscores && !fitzmode && scr_autoclock.value)) || scr_viewsize.value >= 130)
+	if ((scr_clock.value == 0 && scr_clock_off <= 0 && !(sb_showscores && scr_autoclock.value)) || scr_viewsize.value >= 130)
 		return;
 
 	scr_clock_off -= host_frametime / (cls.demospeed ? cls.demospeed : 1.f);

Quake/host_cmd.c

@@ -3098,7 +3098,7 @@ static void Host_Startdemos_f (void)
 	if (!sv.active && cls.demonum != -1 && !cls.demoplayback)
 	{
 		cls.demonum = 0;
-		if (!fitzmode && !cl_startdemos.value)
+		if (!cl_startdemos.value)
 		{ /* QuakeSpasm customization: */
 			/* go straight to menu, no CL_NextDemo */
 			cls.demonum = -1;

Quake/menu.c

@@ -112,6 +112,7 @@ extern qboolean keydown[256];
 
 extern cvar_t scr_fov;
 extern cvar_t scr_showfps;
+extern cvar_t cl_confirmquit;
 extern cvar_t scr_style;
 extern cvar_t autoload;
 extern cvar_t autofastload;
@@ -666,7 +667,7 @@ void M_Main_Key (int key)
 		key_dest = key_game;
 		m_state = m_none;
 		cls.demonum = m_save_demonum;
-		if (!fitzmode && !cl_startdemos.value) /* QuakeSpasm customization: */
+		if (!cl_startdemos.value) /* QuakeSpasm customization: */
 			break;
 		if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
 			CL_NextDemo ();
@@ -1395,6 +1396,7 @@ enum
 	GAME_OPT_AUTOLOAD,
 	GAME_OPT_STARTUP_DEMOS,
 	GAME_OPT_SHOWFPS,
+	GAME_OPT_CONFIRMQUIT,
 	GAME_OPTIONS_ITEMS
 };
 
@@ -1533,6 +1535,9 @@ static void M_GameOptions_AdjustSliders (int dir, qboolean mouse)
 	case GAME_OPT_SHOWFPS:
 		Cvar_SetValue ("scr_showfps", ((int)scr_showfps.value + 2 + dir) % 2);
 		break;
+	case GAME_OPT_CONFIRMQUIT:
+		Cvar_SetValue ("cl_confirmquit", ((int)cl_confirmquit.value + 2 + dir) % 2);
+		break;
 	}
 }
 
@@ -1688,6 +1693,11 @@ static void M_GameOptions_Draw (cb_context_t *cbx)
 			M_Print (cbx, MENU_LABEL_X, y, "Show FPS");
 			M_DrawCheckbox (cbx, MENU_VALUE_X, y, scr_showfps.value);
 			break;
+
+		case GAME_OPT_CONFIRMQUIT:
+			M_Print (cbx, MENU_LABEL_X, y, "Quit Prompt");
+			M_DrawCheckbox (cbx, MENU_VALUE_X, y, cl_confirmquit.value);
+			break;
 		}
 	}
 
@@ -3494,6 +3504,7 @@ static void M_Quit_Char (int key)
 
 	case 'y':
 	case 'Y':
+	case ' ':
 		m_is_quitting = true;
 		IN_Deactivate (true);
 		key_dest = key_console;
@@ -3513,10 +3524,13 @@ static qboolean M_Quit_TextEntry (void)
 static void M_Quit_Draw (cb_context_t *cbx) // johnfitz -- modified for new quit message
 {
 	char msg1[40];
-	char msg2[] = "by Axel Gneiting"; /* msg2/msg3 are mostly [40] */
-	char msg3[] = "Press y to quit";
+	char msg2[] = "by Axel Gneiting and devs"; /* msg2/msg3 are mostly [40] */
+	char msg3[] = "Press y/space to quit";
 	int	 boxlen;
 
+	if (!cl_confirmquit.value)
+		return;
+
 	if (was_in_menus)
 	{
 		m_state = m_quit_prevstate;
@@ -4568,7 +4582,7 @@ void M_Draw (cb_context_t *cbx)
 		break;
 
 	case m_quit:
-		if (!fitzmode)
+		if (!cl_confirmquit.value)
 		{ /* QuakeSpasm customization: */
 			/* Quit now! S.A. */
 			m_is_quitting = true;

Quake/sbar.c

@@ -501,20 +501,19 @@ void Sbar_SoloScoreboard (cb_context_t *cbx)
 	char cleanname[sizeof (cl.levelname)];
 	COM_SanitizeDescriptionString (cleanname, sizeof (cleanname), cl.levelname, false);
 
-	if (!fitzmode)
-	{ /* QuakeSpasm customization: */
-		q_snprintf (str, sizeof (str), "skill %i", (int)(skill.value + 0.5));
-		Sbar_DrawString (cbx, (left + right) / 2 - strlen (str) * 4, 12, str);
+	/* QuakeSpasm customization: */
+	q_snprintf (str, sizeof (str), "skill %i", (int)(skill.value + 0.5));
+	Sbar_DrawString (cbx, (left + right) / 2 - strlen (str) * 4, 12, str);
 
-		q_snprintf (str, sizeof (str), "%s (%s)", cleanname, cl.mapname);
+	q_snprintf (str, sizeof (str), "%s (%s)", cleanname, cl.mapname);
+
+	len = strlen (str);
+	if (len > 40)
+		Sbar_DrawScrollString (cbx, 0, 4, 320, str);
+	else
+		Sbar_DrawString (cbx, 160 - len * 4, 4, str);
+	return;
 
-		len = strlen (str);
-		if (len > 40)
-			Sbar_DrawScrollString (cbx, 0, 4, 320, str);
-		else
-			Sbar_DrawString (cbx, 160 - len * 4, 4, str);
-		return;
-	}
 	minutes = cl.time / 60;
 	seconds = cl.time - 60 * minutes;
 	tens = seconds / 10;