X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=c486bcb6fcb600afdcf34cdff8eb767942b48cdd;hp=456d3aa937b93900a95d6befce60e9a67c9cf433;hb=1e1dbc1c5b89ae4ab8cdd9b32dc6413c67f5dd84;hpb=7e1b0dc62d5de63c0de26e17093ecd897a973c20

diff --git a/menu.c b/menu.c
index 456d3aa9..c486bcb6 100644
--- a/menu.c
+++ b/menu.c
@@ -164,7 +164,7 @@ void M_DrawCharacter (float cx, float cy, int num)
 	DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
 }
 
-void M_Print (float cx, float cy, const char *str)
+void M_Print(float cx, float cy, const char *str)
 {
 	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
 }
@@ -174,7 +174,7 @@ void M_PrintRed (float cx, float cy, const char *str)
 	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0);
 }
 
-void M_ItemPrint (float cx, float cy, char *str, int unghosted)
+void M_ItemPrint(float cx, float cy, char *str, int unghosted)
 {
 	if (unghosted)
 		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
@@ -294,7 +294,7 @@ void M_Demo_Draw (void)
 	M_Background(320, 200);
 
 	for (i = 0;i < NumberOfNehahraDemos;i++)
-		M_Print (16, 16 + 8*i, NehahraDemos[i].desc);
+		M_Print(16, 16 + 8*i, NehahraDemos[i].desc);
 
 	// line cursor
 	M_DrawCharacter (8, 16 + demo_cursor*8, 12+((int)(realtime*4)&1));
@@ -577,14 +577,14 @@ void M_SinglePlayer_Draw (void)
 
 		M_DrawTextBox (60, 8 * 8, 23, 4);
 		if (gamemode == GAME_NEXUIZ)
-			M_Print (95, 10 * 8, "Nexuiz is for");
+			M_Print(95, 10 * 8, "Nexuiz is for");
 		else if (gamemode == GAME_GOODVSBAD2)
-			M_Print (95, 10 * 8, "Good Vs Bad 2 is for");
+			M_Print(95, 10 * 8, "Good Vs Bad 2 is for");
 		else if (gamemode == GAME_BATTLEMECH)
-			M_Print (95, 10 * 8, "Battlemech is for");
+			M_Print(95, 10 * 8, "Battlemech is for");
 		else
-			M_Print (95, 10 * 8, "Transfusion is for");
-		M_Print (83, 11 * 8, "multiplayer play only");
+			M_Print(95, 10 * 8, "Transfusion is for");
+		M_Print(83, 11 * 8, "multiplayer play only");
 	}
 	else
 	{
@@ -730,7 +730,7 @@ void M_Load_Draw (void)
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp");
 
 	for (i=0 ; i< MAX_SAVEGAMES; i++)
-		M_Print (16, 32 + 8*i, m_filenames[i]);
+		M_Print(16, 32 + 8*i, m_filenames[i]);
 
 // line cursor
 	M_DrawCharacter (8, 32 + load_cursor*8, 12+((int)(realtime*4)&1));
@@ -748,7 +748,7 @@ void M_Save_Draw (void)
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp");
 
 	for (i=0 ; i<MAX_SAVEGAMES ; i++)
-		M_Print (16, 32 + 8*i, m_filenames[i]);
+		M_Print(16, 32 + 8*i, m_filenames[i]);
 
 // line cursor
 	M_DrawCharacter (8, 32 + load_cursor*8, 12+((int)(realtime*4)&1));
@@ -897,16 +897,17 @@ void M_MultiPlayer_Key (int key, char ascii)
 //=============================================================================
 /* SETUP MENU */
 
-int		setup_cursor = 3;
-int		setup_cursor_table[] = {40, 64, 88, 124};
+int		setup_cursor = 4;
+int		setup_cursor_table[] = {40, 64, 88, 124, 140};
 
 char	setup_myname[32];
 int		setup_oldtop;
 int		setup_oldbottom;
 int		setup_top;
 int		setup_bottom;
+int		setup_rate;
 
-#define	NUM_SETUP_CMDS	4
+#define	NUM_SETUP_CMDS	5
 
 void M_Menu_Setup_f (void)
 {
@@ -916,12 +917,46 @@ void M_Menu_Setup_f (void)
 	strcpy(setup_myname, cl_name.string);
 	setup_top = setup_oldtop = cl_color.integer >> 4;
 	setup_bottom = setup_oldbottom = cl_color.integer & 15;
+	setup_rate = cl_rate.integer;
 }
 
 static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load;
 static qbyte *menuplyr_pixels;
 static unsigned int *menuplyr_translated;
 
+typedef struct ratetable_s
+{
+	int rate;
+	char *name;
+}
+ratetable_t;
+
+#define RATES ((int)(sizeof(setup_ratetable)/sizeof(setup_ratetable[0])))
+static ratetable_t setup_ratetable[] =
+{
+	{1000, "28.8 bad"},
+	{1500, "28.8 mediocre"},
+	{2000, "28.8 good"},
+	{2500, "33.6 mediocre"},
+	{3000, "33.6 good"},
+	{3500, "56k bad"},
+	{4000, "56k mediocre"},
+	{4500, "56k adequate"},
+	{5000, "56k good"},
+	{7000, "64k ISDN"},
+	{15000, "128k ISDN"},
+	{25000, "broadband"}
+};
+
+static int setup_rateindex(int rate)
+{
+	int i;
+	for (i = 0;i < RATES;i++)
+		if (setup_ratetable[i].rate > setup_rate)
+			break;
+	return bound(1, i, RATES) - 1;
+}
+
 void M_Setup_Draw (void)
 {
 	int i;
@@ -933,18 +968,21 @@ void M_Setup_Draw (void)
 	p = Draw_CachePic ("gfx/p_multi.lmp");
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
 
-	M_Print (64, 40, "Your name");
+	M_Print(64, 40, "Your name");
 	M_DrawTextBox (160, 32, 16, 1);
-	M_Print (168, 40, setup_myname);
+	M_Print(168, 40, setup_myname);
 
 	if (gamemode != GAME_GOODVSBAD2)
 	{
-		M_Print (64, 64, "Shirt color");
-		M_Print (64, 88, "Pants color");
+		M_Print(64, 64, "Shirt color");
+		M_Print(64, 88, "Pants color");
 	}
 
-	M_DrawTextBox (64, 124-8, 14, 1);
-	M_Print (72, 124, "Accept Changes");
+	M_Print(64, 124-8, "Network speed limit");
+	M_Print(168, 124, va("%i (%s)", setup_rate, setup_ratetable[setup_rateindex(setup_rate)].name));
+
+	M_DrawTextBox (64, 140-8, 14, 1);
+	M_Print(72, 140, "Accept Changes");
 
 	// LordHavoc: rewrote this code greatly
 	if (menuplyr_load)
@@ -953,7 +991,7 @@ void M_Setup_Draw (void)
 		menuplyr_load = false;
 		menuplyr_top = -1;
 		menuplyr_bottom = -1;
-		if ((f = FS_LoadFile("gfx/menuplyr.lmp", true)))
+		if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true)))
 		{
 			data = LoadLMPAs8Bit (f, 0, 0);
 			menuplyr_width = image_width;
@@ -1020,6 +1058,13 @@ void M_Setup_Key (int k, char ascii)
 			setup_top = setup_top - 1;
 		if (setup_cursor == 2)
 			setup_bottom = setup_bottom - 1;
+		if (setup_cursor == 3)
+		{
+			l = setup_rateindex(setup_rate) - 1;
+			if (l < 0)
+				l = RATES - 1;
+			setup_rate = setup_ratetable[l].rate;
+		}
 		break;
 	case K_RIGHTARROW:
 		if (setup_cursor < 1)
@@ -1030,16 +1075,23 @@ forward:
 			setup_top = setup_top + 1;
 		if (setup_cursor == 2)
 			setup_bottom = setup_bottom + 1;
+		if (setup_cursor == 3)
+		{
+			l = setup_rateindex(setup_rate) + 1;
+			if (l >= RATES)
+				l = 0;
+			setup_rate = setup_ratetable[l].rate;
+		}
 		break;
 
 	case K_ENTER:
 		if (setup_cursor == 0)
 			return;
 
-		if (setup_cursor == 1 || setup_cursor == 2)
+		if (setup_cursor == 1 || setup_cursor == 2 || setup_cursor == 3)
 			goto forward;
 
-		// setup_cursor == 3 (Accept changes)
+		// setup_cursor == 4 (Accept changes)
 		if (strcmp(cl_name.string, setup_myname) != 0)
 			Cbuf_AddText ( va ("name \"%s\"\n", setup_myname) );
 		if (setup_top != setup_oldtop || setup_bottom != setup_oldbottom)
@@ -1106,13 +1158,13 @@ void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
 void M_DrawCheckbox (int x, int y, int on)
 {
 	if (on)
-		M_Print (x, y, "on");
+		M_Print(x, y, "on");
 	else
-		M_Print (x, y, "off");
+		M_Print(x, y, "off");
 }
 
 
-#define OPTIONS_ITEMS 34
+#define OPTIONS_ITEMS 36
 
 int options_cursor;
 
@@ -1160,7 +1212,7 @@ void M_Menu_Options_AdjustSliders (int dir)
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
 	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(0, gl_texture_anisotropy.value + dir, 8));
+		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value + dir, 8));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
 	else if (options_cursor == optnum++)
@@ -1181,6 +1233,10 @@ void M_Menu_Options_AdjustSliders (int dir)
 		Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer);
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&showfps, !showfps.integer);
+	else if (options_cursor == optnum++)
+		Cvar_SetValueQuick (&showtime, !showtime.integer);
+	else if (options_cursor == optnum++)
+		Cvar_SetValueQuick (&showdate, !showdate.integer);
 	else if (options_cursor == optnum++)
 	{
 		if (cl_forwardspeed.value > 200)
@@ -1281,7 +1337,7 @@ void M_Options_Draw (void)
 	M_Options_PrintCheckbox("   Texture Combine", true, gl_combine.integer);
 	M_Options_PrintCheckbox("         Dithering", true, gl_dither.integer);
 	M_Options_PrintCheckbox("Delay gfx (faster)", true, gl_delayfinish.integer);
-	M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.value, 0, 8);
+	M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.value, 1, 8);
 	M_Options_PrintSlider(  "        Game Speed", sv.active, slowmo.value, 0, 5);
 	M_Options_PrintSlider(  "   CD Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
 	M_Options_PrintSlider(  "      Sound Volume", snd_initialized.integer, volume.value, 0, 1);
@@ -1290,6 +1346,8 @@ void M_Options_Draw (void)
 	M_Options_PrintSlider(  "    Crosshair Size", true, crosshair_size.value, 1, 5);
 	M_Options_PrintCheckbox("  Static Crosshair", true, crosshair_static.integer);
 	M_Options_PrintCheckbox("    Show Framerate", true, showfps.integer);
+	M_Options_PrintCheckbox("         Show Time", true, showtime.integer);
+	M_Options_PrintCheckbox("         Show Date", true, showdate.integer);
 	M_Options_PrintCheckbox("        Always Run", true, cl_forwardspeed.value > 200);
 	M_Options_PrintCheckbox("        Lookspring", true, lookspring.integer);
 	M_Options_PrintCheckbox("        Lookstrafe", true, lookstrafe.integer);
@@ -1398,50 +1456,28 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
 	S_LocalSound ("misc/menu3.wav");
 
 	optnum = 0;
-	if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&r_coronas, !r_coronas.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_decals, !cl_decals.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&r_lerpmodels, !r_lerpmodels.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer);
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&r_wateralpha, bound(0, r_wateralpha.value + dir * 0.1, 1));
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10));
-	else if (options_effects_cursor == optnum++)
-		Cvar_SetValueQuick (&r_watershader, bound(0, r_watershader.value + dir * 0.25, 10));
+	     if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_decals, !cl_decals.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpmodels, !r_lerpmodels.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_wateralpha, bound(0, r_wateralpha.value + dir * 0.1, 1));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_watershader, bound(0, r_watershader.value + dir * 0.25, 10));
 }
 
 void M_Options_Effects_Draw (void)
@@ -1461,7 +1497,7 @@ void M_Options_Effects_Draw (void)
 	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8;
 
 	M_Options_PrintSlider(  "      Lights Per Model", true, r_modellights.value, 0, 8);
-	M_Options_PrintCheckbox("               Coronas", true, r_coronas.integer);
+	M_Options_PrintSlider(  "      Corona Intensity", true, r_coronas.value, 0, 4);
 	M_Options_PrintCheckbox("      Use Only Coronas", true, gl_flashblend.integer);
 	M_Options_PrintCheckbox("             Particles", true, cl_particles.integer);
 	M_Options_PrintSlider(  "     Particles Quality", true, cl_particles_quality.value, 1, 4);
@@ -1985,7 +2021,7 @@ void M_FindKeysForCommand (char *command, int *keys)
 
 	count = 0;
 
-	for (j=0 ; j<256 ; j++)
+	for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
 	{
 		b = keybindings[0][j];
 		if (!b)
@@ -2004,7 +2040,7 @@ void M_UnbindCommand (char *command)
 	int		j;
 	char	*b;
 
-	for (j=0 ; j<256 ; j++)
+	for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
 	{
 		b = keybindings[0][j];
 		if (!b)
@@ -2029,9 +2065,9 @@ void M_Keys_Draw (void)
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp");
 
 	if (bind_grab)
-		M_Print (12, 32, "Press a key or button for this action");
+		M_Print(12, 32, "Press a key or button for this action");
 	else
-		M_Print (18, 32, "Enter to change, backspace to clear");
+		M_Print(18, 32, "Enter to change, backspace to clear");
 
 // search for known bindings
 	for (i=0 ; i<numcommands ; i++)
@@ -2046,7 +2082,7 @@ void M_Keys_Draw (void)
 			continue;
 		}
 		else
-			M_Print (16, y, bindnames[i][1]);
+			M_Print(16, y, bindnames[i][1]);
 
 		M_FindKeysForCommand (bindnames[i][0], keys);
 
@@ -2066,7 +2102,7 @@ void M_Keys_Draw (void)
 				}
 			}
 		}
-		M_Print (150, y, keystring);
+		M_Print(150, y, keystring);
 	}
 
 	if (bind_grab)
@@ -2204,11 +2240,11 @@ void M_Video_Draw (void)
 	// Resolution
 	M_Print(16, video_cursor_table[0], "            Resolution");
 	string = va("%dx%d", video_resolutions[video_resolution][0], video_resolutions[video_resolution][1]);
-	M_Print (220, video_cursor_table[0], string);
+	M_Print(220, video_cursor_table[0], string);
 
 	// Bits per pixel
 	M_Print(16, video_cursor_table[1], "        Bits per pixel");
-	M_Print (220, video_cursor_table[1], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+	M_Print(220, video_cursor_table[1], (vid_bitsperpixel.integer == 32) ? "32" : "16");
 
 	// Fullscreen
 	M_Print(16, video_cursor_table[2], "            Fullscreen");
@@ -2545,24 +2581,24 @@ void M_LanConfig_Draw (void)
 	else
 		startJoin = "Join Game";
 	protocol = "TCP/IP";
-	M_Print (basex, 32, va ("%s - %s", startJoin, protocol));
+	M_Print(basex, 32, va ("%s - %s", startJoin, protocol));
 	basex += 8;
 
-	M_Print (basex, lanConfig_cursor_table[0], "Port");
+	M_Print(basex, lanConfig_cursor_table[0], "Port");
 	M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, 6, 1);
-	M_Print (basex+9*8, lanConfig_cursor_table[0], lanConfig_portname);
+	M_Print(basex+9*8, lanConfig_cursor_table[0], lanConfig_portname);
 
 	if (JoiningGame)
 	{
-		M_Print (basex, lanConfig_cursor_table[1], "Search for games...");
-		M_Print (basex, lanConfig_cursor_table[2]-16, "Join game at:");
+		M_Print(basex, lanConfig_cursor_table[1], "Search for games...");
+		M_Print(basex, lanConfig_cursor_table[2]-16, "Join game at:");
 		M_DrawTextBox (basex+8, lanConfig_cursor_table[2]-8, 22, 1);
-		M_Print (basex+16, lanConfig_cursor_table[2], lanConfig_joinname);
+		M_Print(basex+16, lanConfig_cursor_table[2], lanConfig_joinname);
 	}
 	else
 	{
 		M_DrawTextBox (basex, lanConfig_cursor_table[1]-8, 2, 1);
-		M_Print (basex+8, lanConfig_cursor_table[1], "OK");
+		M_Print(basex+8, lanConfig_cursor_table[1], "OK");
 	}
 
 	M_DrawCharacter (basex-8, lanConfig_cursor_table [lanConfig_cursor], 12+((int)(realtime*4)&1));
@@ -2574,7 +2610,7 @@ void M_LanConfig_Draw (void)
 		M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1));
 
 	if (*m_return_reason)
-		M_Print (basex, 168, m_return_reason);
+		M_Print(basex, 168, m_return_reason);
 }
 
 
@@ -3045,43 +3081,43 @@ void M_GameOptions_Draw (void)
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
 
 	M_DrawTextBox (152, 32, 10, 1);
-	M_Print (160, 40, "begin game");
+	M_Print(160, 40, "begin game");
 
-	M_Print (0, 56, "      Max players");
-	M_Print (160, 56, va("%i", maxplayers) );
+	M_Print(0, 56, "      Max players");
+	M_Print(160, 56, va("%i", maxplayers) );
 
 	if (gamemode != GAME_GOODVSBAD2)
 	{
-		M_Print (0, 64, "        Game Type");
+		M_Print(0, 64, "        Game Type");
 		if (gamemode == GAME_TRANSFUSION)
 		{
 			if (!deathmatch.integer)
 				Cvar_SetValue("deathmatch", 1);
 			if (deathmatch.integer == 2)
-				M_Print (160, 64, "Capture the Flag");
+				M_Print(160, 64, "Capture the Flag");
 			else
-				M_Print (160, 64, "Blood Bath");
+				M_Print(160, 64, "Blood Bath");
 		}
 		else if (gamemode == GAME_BATTLEMECH)
 		{
 			if (!deathmatch.integer)
 				Cvar_SetValue("deathmatch", 1);
 			if (deathmatch.integer == 2)
-				M_Print (160, 64, "Rambo Match");
+				M_Print(160, 64, "Rambo Match");
 			else
-				M_Print (160, 64, "Deathmatch");
+				M_Print(160, 64, "Deathmatch");
 		}
 		else
 		{
 			if (!coop.integer && !deathmatch.integer)
 				Cvar_SetValue("deathmatch", 1);
 			if (coop.integer)
-				M_Print (160, 64, "Cooperative");
+				M_Print(160, 64, "Cooperative");
 			else
-				M_Print (160, 64, "Deathmatch");
+				M_Print(160, 64, "Deathmatch");
 		}
 
-		M_Print (0, 72, "        Teamplay");
+		M_Print(0, 72, "        Teamplay");
 		if (gamemode == GAME_ROGUE)
 		{
 			char *msg;
@@ -3096,7 +3132,7 @@ void M_GameOptions_Draw (void)
 				case 6: msg = "Three Team CTF"; break;
 				default: msg = "Off"; break;
 			}
-			M_Print (160, 72, msg);
+			M_Print(160, 72, msg);
 		}
 		else
 		{
@@ -3108,50 +3144,50 @@ void M_GameOptions_Draw (void)
 				case 2: msg = "Friendly Fire"; break;
 				default: msg = "No Friendly Fire"; break;
 			}
-			M_Print (160, 72, msg);
+			M_Print(160, 72, msg);
 		}
 
-		M_Print (0, 80, "            Skill");
+		M_Print(0, 80, "            Skill");
 		if (skill.integer == 0)
-			M_Print (160, 80, "Easy difficulty");
+			M_Print(160, 80, "Easy difficulty");
 		else if (skill.integer == 1)
-			M_Print (160, 80, "Normal difficulty");
+			M_Print(160, 80, "Normal difficulty");
 		else if (skill.integer == 2)
-			M_Print (160, 80, "Hard difficulty");
+			M_Print(160, 80, "Hard difficulty");
 		else
-			M_Print (160, 80, "Nightmare difficulty");
+			M_Print(160, 80, "Nightmare difficulty");
 
-		M_Print (0, 88, "       Frag Limit");
+		M_Print(0, 88, "       Frag Limit");
 		if (fraglimit.integer == 0)
-			M_Print (160, 88, "none");
+			M_Print(160, 88, "none");
 		else
-			M_Print (160, 88, va("%i frags", fraglimit.integer));
+			M_Print(160, 88, va("%i frags", fraglimit.integer));
 
-		M_Print (0, 96, "       Time Limit");
+		M_Print(0, 96, "       Time Limit");
 		if (timelimit.integer == 0)
-			M_Print (160, 96, "none");
+			M_Print(160, 96, "none");
 		else
-			M_Print (160, 96, va("%i minutes", timelimit.integer));
+			M_Print(160, 96, va("%i minutes", timelimit.integer));
 	}
 
-	M_Print (0, 104, "    Public server");
-	M_Print (160, 104, (sv_public.integer == 0) ? "no" : "yes");
+	M_Print(0, 104, "    Public server");
+	M_Print(160, 104, (sv_public.integer == 0) ? "no" : "yes");
 
-	M_Print (0, 120, "      Server name");
+	M_Print(0, 120, "      Server name");
 	M_DrawTextBox (0, 124, 38, 1);
-	M_Print (8, 132, hostname.string);
+	M_Print(8, 132, hostname.string);
 
 	g = lookupgameinfo();
 
 	if (gamemode != GAME_GOODVSBAD2)
 	{
-		M_Print (0, 152, "         Episode");
-		M_Print (160, 152, g->episodes[startepisode].description);
+		M_Print(0, 152, "         Episode");
+		M_Print(160, 152, g->episodes[startepisode].description);
 	}
 
-	M_Print (0, 160, "           Level");
-	M_Print (160, 160, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
-	M_Print (160, 168, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
+	M_Print(0, 160, "           Level");
+	M_Print(160, 160, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
+	M_Print(160, 168, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
 
 // line cursor
 	if (gameoptions_cursor == 8)
@@ -3166,10 +3202,10 @@ void M_GameOptions_Draw (void)
 			x = (320-26*8)/2;
 			M_DrawTextBox (x, 138, 24, 4);
 			x += 8;
-			M_Print (x, 146, " More than 64 players?? ");
-			M_Print (x, 154, "  First, question your  ");
-			M_Print (x, 162, "   sanity, then email   ");
-			M_Print (x, 170, " havoc@telefragged.com  ");
+			M_Print(x, 146, " More than 64 players?? ");
+			M_Print(x, 154, "  First, question your  ");
+			M_Print(x, 162, "   sanity, then email   ");
+			M_Print(x, 170, " havoc@telefragged.com  ");
 		}
 		else
 			m_serverInfoMessage = false;
@@ -3552,12 +3588,12 @@ void M_Init (void)
 		{
 			if (FS_FileExists("hearing.dem"))
 			{
-				Con_Printf("Nehahra movie and game detected.\n");
+				Con_Print("Nehahra movie and game detected.\n");
 				NehGameType = TYPE_BOTH;
 			}
 			else
 			{
-				Con_Printf("Nehahra game detected.\n");
+				Con_Print("Nehahra game detected.\n");
 				NehGameType = TYPE_GAME;
 			}
 		}
@@ -3565,12 +3601,12 @@ void M_Init (void)
 		{
 			if (FS_FileExists("hearing.dem"))
 			{
-				Con_Printf("Nehahra movie detected.\n");
+				Con_Print("Nehahra movie detected.\n");
 				NehGameType = TYPE_DEMO;
 			}
 			else
 			{
-				Con_Printf("Nehahra not found.\n");
+				Con_Print("Nehahra not found.\n");
 				NehGameType = TYPE_GAME; // could just complain, but...
 			}
 		}
@@ -3785,7 +3821,7 @@ void MP_Error(void)
 	// fall back to the normal menu
 
 	// say it
-	Con_Printf("Falling back to normal menu\n");
+	Con_Print("Falling back to normal menu\n");
 
 	key_dest = key_game;