move buildnum.c to util and make nq and qw init more similar

libs/util/Makefile.am

@@ -26,8 +26,8 @@ libQFutil_la_LDFLAGS=		-version-info 1:0:0
 libQFutil_la_LIBADD=		libasm.la $(Z_LIBS) $(DL_LIBS)
 libQFutil_la_DEPENDENCIES=	libasm.la
 libQFutil_la_SOURCES= \
-	checksum.c cmd.c crc.c cvar.c fendian.c getopt.c getopt1.c hash.c \
+	buildnum.c checksum.c cmd.c crc.c cvar.c fendian.c getopt.c getopt1.c \
-	info.c link.c mathlib.c mdfour.c msg.c pcx.c plugin.c qargs.c \
+	hash.c info.c link.c mathlib.c mdfour.c msg.c pcx.c plugin.c qargs.c \
 	qendian.c qfplist.c quakefs.c quakeio.c sizebuf.c string.c sys.c \
 	tga.c va.c ver_check.c wad.c zone.c dstring.c exp.c ops.c $(fnmatch)
 

libs/video/targets/keys.c

@@ -705,9 +705,22 @@ Key_WriteBindings (VFile *f)
 
 	for (j = 0; j < IMT_LAST; j++)
 		for (i = 0; i < QFK_LAST; i++)
-			if ((bind = Key_GetBinding(j, i)))
+			if ((bind = Key_GetBinding(j, i))) {
-				Qprintf (f, "in_bind %s %s \"%s\"\n", Key_IMTnumToString (j),
+				if (f)
-						 Key_KeynumToString (i), bind);
+					Qprintf (f, "in_bind %s %s \"%s\"\n",
+							 Key_IMTnumToString (j),
+							 Key_KeynumToString (i), bind);
+				else
+					Sys_Printf ("in_bind %s %s \"%s\"\n",
+							 Key_IMTnumToString (j),
+							 Key_KeynumToString (i), bind);
+			}
+}
+
+void
+Key_Bindlist_f (void)
+{
+	Key_WriteBindings (0);
 }
 
 /*
@@ -782,6 +795,7 @@ Key_Init (void)
 	Cmd_AddCommand ("unbind", Key_Unbind_f,
 					"wrapper for in_unbind that uses in_bind_imt for the imt "
 					"parameter");
+	Cmd_AddCommand ("bindlist", Key_Bindlist_f, "list all of the key bindings");
 }
 
 void

nq/source/host.c

@@ -48,6 +48,7 @@ static const char rcsid[] =
 #include "QF/va.h"
 #include "QF/vid.h"
 
+#include "buildnum.h"
 #include "chase.h"
 #include "compat.h"
 #include "host.h"
@@ -912,9 +913,6 @@ Host_Init (void)
 	Host_Skin_Init_Cvars ();
 	V_Init_Cvars ();
 
-	Cmd_StuffCmds_f ();
-	Cbuf_Execute_Sets ();
-
 	PR_Init ();
 	BI_Init ();
 
@@ -941,12 +939,10 @@ Host_Init (void)
 	W_LoadWadFile ("gfx.wad");
 	Key_Init ();
 	Mod_Init ();
-	// FIXME: MENUCODE
+
-//	M_Init ();
 	SV_Progs_Init ();
 	SV_Init ();
 
-//	Con_Printf ("Exe: " __TIME__ " " __DATE__ "\n");
 	Con_Printf ("%4.1f megabyte heap\n", host_mem_size->value);
 
 	if (cls.state != ca_dedicated) {
@@ -986,7 +982,10 @@ Host_Init (void)
 
 	host_initialized = true;
 
-	Con_Printf ("\x80\x81\x81\x81\x81\x81\x81%s Initialized\x81\x81\x81\x81\x81\x81\x81\x82\n", PROGRAM);
+	Con_Printf ("\nVersion %s (build %04d)\n\n", VERSION,
+				build_number ());
+
+	Con_Printf ("\x80\x81\x81\x82 %s Initialized\x80\x81\x81\x82\n", PROGRAM);
 	Con_NewMap ();
 
 	CL_UpdateScreen (cl.time);

qw/source/Makefile.am

@@ -51,8 +51,7 @@ libasm_la_SOURCES= $(asm_src)
 
 noinst_LTLIBRARIES= libqfnet.la $(asm)
 
-common_sources= buildnum.c com.c game.c msg_ucmd.c pmove.c pmovetst.c \
+common_sources= com.c game.c msg_ucmd.c pmove.c pmovetst.c net_packetlog.c
-		net_packetlog.c
 
 common_ldflags= -export-dynamic
 

qw/source/cl_main.c

@@ -1666,13 +1666,13 @@ Host_Init (void)
 
 	CL_Init_Memory ();
 
+	pr_gametype = "quakeworld";
+
 	cls.userinfo = Info_ParseString ("", MAX_INFO_STRING);
 	cl.serverinfo = Info_ParseString ("", MAX_INFO_STRING);
 
 	PI_Init ();
 
-	pr_gametype = "quakeworld";
-
 	CL_Cam_Init_Cvars ();
 	CL_Input_Init_Cvars ();
 	CL_Skin_Init_Cvars ();
@@ -1730,7 +1730,6 @@ Host_Init (void)
 
 	CL_TimeFrames_Init();
 
-//	Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
 	Con_Printf ("%4.1f megabyte heap.\n", cl_mem_size->value);
 
 	vid_basepal = (byte *) COM_LoadHunkFile ("gfx/palette.lmp");
@@ -1764,24 +1763,22 @@ Host_Init (void)
 	if (!cl_quakerc->int_val || check_quakerc ())
 		Cmd_StuffCmds_f ();
 
-	Cbuf_AddText ("echo Type connect <internet address> or use a server "
-				  "browser to connect to a game.\n");
-	Cbuf_AddText ("cmd_warncmd 1\n");
-
 	Hunk_AllocName (0, "-HOST_HUNKLEVEL-");
 	host_hunklevel = Hunk_LowMark ();
 
 	host_initialized = true;
 
-
 	Con_Printf ("\nClient version %s (build %04d)\n\n", VERSION,
 				build_number ());
 
 	Con_Printf ("\x80\x81\x81\x82 %s initialized \x80\x81\x81\x82\n", PROGRAM);
-
 	Con_NewMap ();			// force the menus to be loaded
 
 	CL_UpdateScreen (realtime);
+
+	Cbuf_AddText ("echo Type connect <internet address> or use a server "
+				  "browser to connect to a game.\n");
+	Cbuf_AddText ("cmd_warncmd 1\n");
 }
 
 void