snax's server list patches. Credit given in AUTHORS

AUTHORS

@@ -118,6 +118,10 @@ N: Theo van Klaveren
 E: havoc@phoenix.student.utwente.nl
 D: CD-ROM support/optimizations
 
+N: Brain Koropoff
+E: brian.hk@home.com
+D: Server List 
+
 N: Sam Lantinga
 E: slouken@devolution.com
 D: SDL support

common/cl_main.c

@@ -71,7 +71,9 @@
 #include <sbar.h>
 #include <cdaudio.h>
 #include <input.h>
-
+#ifdef QUAKEWORLD
+#include <cl_slist.h>
+#endif
 #ifdef __sun
 /* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
 #define model_t sunmodel_t
@@ -139,6 +141,10 @@ cvar_t	*localid;
 #ifdef QUAKEWORLD
 static qboolean allowremotecmd = true;
 #endif
+// Need this defined here for server list loading
+#ifdef QUAKEWORLD
+cvar_t *fs_basepath;
+#endif
 
 //
 // info mirrors
@@ -370,6 +376,9 @@ CL_Connect_f
 void CL_Connect_f (void)
 {
 	char	*server;
+#ifdef QUAKEWORLD
+	int snum;
+#endif
 
 	if (Cmd_Argc() != 2) {
 		Con_Printf ("usage: connect <server>\n");
@@ -377,7 +386,16 @@ void CL_Connect_f (void)
 	}
 
 	server = Cmd_Argv (1);
-
+#ifdef QUAKEWORLD
+	if (server[0] == '#') {
+		snum = Q_atoi(server + 1);
+		if (snum >= MAX_SERVER_LIST || !(slist[snum].server)) {
+			Con_Printf("Server not found.\n");
+			return;
+		}
+		server = slist[snum].server;
+	}
+#endif
 	CL_Disconnect ();
 
 	strncpy (cls.servername, server, sizeof(cls.servername)-1);
@@ -1631,7 +1649,25 @@ void SetPal (int i)
 	}
 #endif
 }
-
+/*
+=================
+CL_Slist_f
+Lists servers in
+the server list.
+QW only.
+=================
+*/
+#ifdef QUAKEWORLD
+void CL_Slist_f() {
+	int i;
+	for (i=0;i < MAX_SERVER_LIST;i++) {
+		if (slist[i].server)
+			Con_Printf("[%i] %s - %s\n",i+1,
+			slist[i].description,
+			slist[i].server);
+	}
+}
+#endif
 /*
 =================
 CL_Init
@@ -1639,6 +1675,9 @@ CL_Init
 */
 void CL_Init (void)
 {
+#ifdef QUAKEWORLD
+	QFile *serlist;
+#endif
 #ifdef UQUAKE
 	SZ_Alloc (&cls.netchan.message, 1024);
 #endif
@@ -1719,6 +1758,19 @@ void CL_Init (void)
 #ifdef _WIN32
 	Cmd_AddCommand ("windows", CL_Windows_f);
 #endif
+
+// New -- Load server list
+#ifdef QUAKEWORLD
+	Cmd_AddCommand ("slist", CL_Slist_f);
+	
+	Server_List_Init();
+	printf("CL_Init: Server list initialized.\n");
+	if ((serlist = Qopen(va("%s/servers.txt",fs_basepath->string),"r")) != NULL) {
+		printf("CL_Init: Found servers.txt...\n");
+		Server_List_Load(serlist);
+		Qclose(serlist);
+	}
+#endif
 }
 
 void CL_InitCvars()

common/client.h

@@ -439,6 +439,7 @@ void CL_Signon4 (void);
 
 void CL_Disconnect (void);
 void CL_Disconnect_f (void);
+void CL_Slist_f (void);
 void CL_NextDemo (void);
 qboolean CL_DemoBehind(void);
 void CL_BeginServerConnect(void);

common/host.c

@@ -53,7 +53,9 @@
 #include <sbar.h>
 #include <mathlib.h>
 #include <menu.h>
-
+#ifdef QUAKEWORLD
+#include <cl_slist.h>
+#endif
 
 extern int host_hunklevel;
 
@@ -692,6 +694,10 @@ Host_Shutdown( void )
 		VID_Shutdown();
 	}
 	Cvar_Shutdown ();
+	// New -- Shutdown server list
+#ifdef QUAKEWORLD
+	Server_List_Shutdown();
+#endif
 }
 
 /*

qw_client/Makefile.in

@@ -100,7 +100,7 @@ QW_NET_SRC     = @NET_SOURCE@ net_com.c mdfour.c
 
 MISC_SRC       = common.c crc.c cvar.c cmd.c mathlib.c register_check.c \
                  wad.c zone.c cvars.c qendian.c lib_replace.c quakefs.c \
-		 quakeio.c qargs.c plugin.c
+		 quakeio.c qargs.c plugin.c cl_slist.c
 ifeq ($(GENERATIONS),yes)
 MISC_SRC += unzip.c
 endif

qw_client/menu.c

@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <menu.h>
 #include <view.h>
 #include <sound.h>
-
+#include <cl_slist.h>
 
 enum {
 	m_none, m_main, m_singleplayer, m_load, m_save, m_multiplayer,
@@ -280,6 +280,8 @@ void M_ToggleMenu_f (void)
 	if (key_dest == key_console)
 	{
 		Con_ToggleConsole_f ();
+		if (cls.state != ca_connected)
+			M_Menu_Main_f ();
 	}
 	else
 	{
@@ -1050,33 +1052,126 @@ void M_SinglePlayer_Key (key) {
 	if (key == K_ESCAPE || key==K_ENTER || key == KP_ENTER)
 		m_state = m_main;
 }
+#define MENU_X 50
+#define MENU_Y 30
+#define STAT_X 50
+#define STAT_Y 122
+
+int m_multip_cursor;
+int m_multip_mins;
+int m_multip_maxs;
+int m_multip_horiz;
 
 void M_Menu_MultiPlayer_f (void) {
+	key_dest = key_menu;
+	m_entersound = true;
 	m_state = m_multiplayer;
+	m_multip_cursor = 0;
+	m_multip_mins = 0;
+	m_multip_maxs = 10;
+	m_multip_horiz = 0;
 }
 
 void M_MultiPlayer_Draw (void) {
-	qpic_t	*p;
+	int serv;
+	int line = 1;
+	qpic_t *p;
+	int f;
 
-	M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
-//	M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
-	p = Draw_CachePic ("gfx/p_multi.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, p);
-//	M_DrawTransPic (72, 32, Draw_CachePic ("gfx/sp_menu.lmp") );
-
-	M_DrawTextBox (46, 8*8, 27, 9);
-	M_PrintWhite (72, 10*8, "If you want to find QW  ");
-	M_PrintWhite (72, 11*8, "games, head on over to: ");
-	     M_Print (72, 12*8, "   www.quakeworld.net   ");
-	M_PrintWhite (72, 13*8, "          or            ");
-	     M_Print (72, 14*8, "   www.quakespy.com     ");
-	M_PrintWhite (72, 15*8, "For pointers on getting ");
-	M_PrintWhite (72, 16*8, "        started!        ");
+	M_DrawTransPic(16,4,Draw_CachePic("gfx/qplaque.lmp"));
+	p = Draw_CachePic("gfx/p_multi.lmp");
+	M_DrawPic((320-p->width)/2,4,p);
+	
+	if (!(slist[0].server)) {
+		M_DrawTextBox(60,80,23,4);
+		M_PrintWhite(110,12*8,"No server list");
+		M_PrintWhite(140,13*8,"found.");
+		return;
+	}
+	M_DrawTextBox(STAT_X,STAT_Y,23,4);
+	M_DrawTextBox(STAT_X+96,STAT_Y+38,12,3);
+	M_DrawTextBox(MENU_X,MENU_Y,23,(m_multip_maxs - m_multip_mins)+1);
+	for (serv = m_multip_mins; serv <= m_multip_maxs; serv++) {
+		if (slist[serv].server) {
+			M_Print(MENU_X+18,line*8+MENU_Y,
+				va("%1.21s",
+				strlen(slist[serv].description) <= m_multip_horiz ? "" : slist[serv].description+m_multip_horiz));
+			line++;
+		}
+	}
+	M_PrintWhite(STAT_X+18,STAT_Y+16,"IP/Hostname:");
+	M_Print(STAT_X+18,STAT_Y+24,slist[m_multip_cursor].server);
+	M_DrawCharacter(MENU_X+8,(m_multip_cursor - m_multip_mins + 1) * 8+MENU_Y,
+		12+((int)(realtime*4)&1));
+	f = (int)(realtime * 10) % 6;
+	M_PrintWhite(STAT_X+118,STAT_Y+58,"uakeforge!");
+	M_DrawTransPic(STAT_X+105,STAT_Y+48,Draw_CachePic(va("gfx/menudot%i.lmp",f+1)));
 }
 
 void M_MultiPlayer_Key (key) {
-	if (key == K_ESCAPE || key==K_ENTER || key==KP_ENTER)
+//	server_entry_t *pt;
+	if (!(slist[0].server) && key != K_ESCAPE)
+		return;
+	switch(key) {
+	case K_ESCAPE:
+		M_Menu_Main_f();
+		break;
+	case KP_DOWNARROW:
+	case K_DOWNARROW:
+		S_LocalSound("misc/menu1.wav");
+		if (m_multip_cursor < (MAX_SERVER_LIST-1) && slist[m_multip_cursor+1].server) {
+			m_multip_cursor++;
+		}
+		break;
+	case KP_UPARROW:
+	case K_UPARROW:
+		S_LocalSound("misc/menu1.wav");
+		if (m_multip_cursor > 0) {
+			m_multip_cursor--;
+		}
+		break;
+	case K_PGUP:
+		S_LocalSound("misc/menu1.wav");
+		m_multip_cursor -= (m_multip_maxs - m_multip_mins);
+		if (m_multip_cursor < 0)
+			m_multip_cursor = 0;
+		break;
+	case K_PGDN:
+		S_LocalSound("misc/menu1.wav");
+		m_multip_cursor += (m_multip_maxs - m_multip_mins);
+		if (m_multip_cursor >= MAX_SERVER_LIST)
+			m_multip_cursor = MAX_SERVER_LIST - 1;
+		while (!(slist[m_multip_cursor].server))
+			m_multip_cursor--;
+		break;
+	case K_RIGHTARROW:
+		S_LocalSound("misc/menu1.wav");
+		if (m_multip_horiz < 256)
+			m_multip_horiz++;
+		break;
+	case K_LEFTARROW:
+		S_LocalSound("misc/menu1.wav");
+		if (m_multip_horiz > 0 )
+			m_multip_horiz--;
+		break;
+	case K_ENTER:
 		m_state = m_main;
+		M_ToggleMenu_f();
+		CL_Disconnect();
+		strncpy(cls.servername,slist[m_multip_cursor].server,sizeof(cls.servername)-1);
+		CL_BeginServerConnect();
+		break;
+	default:
+		break;
+	}
+	if (m_multip_cursor < m_multip_mins) {
+		m_multip_maxs -= (m_multip_mins - m_multip_cursor);
+		m_multip_mins = m_multip_cursor;
+	}
+	if (m_multip_cursor > m_multip_maxs) {
+		m_multip_mins += (m_multip_cursor - m_multip_maxs);
+		m_multip_maxs = m_multip_cursor;
+	}
 }
 
 void M_Quit_Draw (void)