newlines fixed

git-svn-id: svn://svn.icculus.org/quake3/trunk@6 edf5b092-35ff-0310-97b2-ce42778d08ea

1 files changed, 272 insertions, 272 deletions

diff --git a/code/q3_ui/ui_serverinfo.c b/code/q3_ui/ui_serverinfo.c
index 61f4ad8..7f36ae6 100755
--- a/code/q3_ui/ui_serverinfo.c
+++ b/code/q3_ui/ui_serverinfo.c
@@ -1,272 +1,272 @@
-/*

-===========================================================================

-Copyright (C) 1999-2005 Id Software, Inc.

-

-This file is part of Quake III Arena source code.

-

-Quake III Arena source code is free software; you can redistribute it

-and/or modify it under the terms of the GNU General Public License as

-published by the Free Software Foundation; either version 2 of the License,

-or (at your option) any later version.

-

-Quake III Arena source code is distributed in the hope that it will be

-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with Foobar; if not, write to the Free Software

-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

-===========================================================================

-*/

-//

-#include "ui_local.h"

-

-#define SERVERINFO_FRAMEL	"menu/art/frame2_l"

-#define SERVERINFO_FRAMER	"menu/art/frame1_r"

-#define SERVERINFO_BACK0	"menu/art/back_0"

-#define SERVERINFO_BACK1	"menu/art/back_1"

-

-static char* serverinfo_artlist[] =

-{

-	SERVERINFO_FRAMEL,	

-	SERVERINFO_FRAMER,

-	SERVERINFO_BACK0,

-	SERVERINFO_BACK1,

-	NULL

-};

-

-#define ID_ADD	 100

-#define ID_BACK	 101

-

-typedef struct

-{

-	menuframework_s	menu;

-	menutext_s		banner;

-	menubitmap_s	framel;

-	menubitmap_s	framer;

-	menubitmap_s	back;

-	menutext_s		add;

-	char			info[MAX_INFO_STRING];

-	int				numlines;

-} serverinfo_t;

-

-static serverinfo_t	s_serverinfo;

-

-

-/*

-=================

-Favorites_Add

-

-Add current server to favorites

-=================

-*/

-void Favorites_Add( void )

-{

-	char	adrstr[128];

-	char	serverbuff[128];

-	int		i;

-	int		best;

-

-	trap_Cvar_VariableStringBuffer( "cl_currentServerAddress", serverbuff, sizeof(serverbuff) );

-	if (!serverbuff[0])

-		return;

-

-	best = 0;

-	for (i=0; i<MAX_FAVORITESERVERS; i++)

-	{

-		trap_Cvar_VariableStringBuffer( va("server%d",i+1), adrstr, sizeof(adrstr) );

-		if (!Q_stricmp(serverbuff,adrstr))

-		{

-			// already in list

-			return;

-		}

-		

-		// use first empty or non-numeric available slot

-		if ((adrstr[0]  < '0' || adrstr[0] > '9' ) && !best)

-			best = i+1;

-	}

-

-	if (best)

-		trap_Cvar_Set( va("server%d",best), serverbuff);

-}

-

-

-/*

-=================

-ServerInfo_Event

-=================

-*/

-static void ServerInfo_Event( void* ptr, int event )

-{

-	switch (((menucommon_s*)ptr)->id)

-	{

-		case ID_ADD:

-			if (event != QM_ACTIVATED)

-				break;

-		

-			Favorites_Add();

-			UI_PopMenu();

-			break;

-

-		case ID_BACK:

-			if (event != QM_ACTIVATED)

-				break;

-

-			UI_PopMenu();

-			break;

-	}

-}

-

-/*

-=================

-ServerInfo_MenuDraw

-=================

-*/

-static void ServerInfo_MenuDraw( void )

-{

-	const char		*s;

-	char			key[MAX_INFO_KEY];

-	char			value[MAX_INFO_VALUE];

-	int				y;

-

-	y = SCREEN_HEIGHT/2 - s_serverinfo.numlines*(SMALLCHAR_HEIGHT)/2 - 20;

-	s = s_serverinfo.info;

-	while ( s ) {

-		Info_NextPair( &s, key, value );

-		if ( !key[0] ) {

-			break;

-		}

-

-		Q_strcat( key, MAX_INFO_KEY, ":" ); 

-

-		UI_DrawString(SCREEN_WIDTH*0.50 - 8,y,key,UI_RIGHT|UI_SMALLFONT,color_red);

-		UI_DrawString(SCREEN_WIDTH*0.50 + 8,y,value,UI_LEFT|UI_SMALLFONT,text_color_normal);

-

-		y += SMALLCHAR_HEIGHT;

-	}

-

-	Menu_Draw( &s_serverinfo.menu );

-}

-

-/*

-=================

-ServerInfo_MenuKey

-=================

-*/

-static sfxHandle_t ServerInfo_MenuKey( int key )

-{

-	return ( Menu_DefaultKey( &s_serverinfo.menu, key ) );

-}

-

-/*

-=================

-ServerInfo_Cache

-=================

-*/

-void ServerInfo_Cache( void )

-{

-	int	i;

-

-	// touch all our pics

-	for (i=0; ;i++)

-	{

-		if (!serverinfo_artlist[i])

-			break;

-		trap_R_RegisterShaderNoMip(serverinfo_artlist[i]);

-	}

-}

-

-/*

-=================

-UI_ServerInfoMenu

-=================

-*/

-void UI_ServerInfoMenu( void )

-{

-	const char		*s;

-	char			key[MAX_INFO_KEY];

-	char			value[MAX_INFO_VALUE];

-

-	// zero set all our globals

-	memset( &s_serverinfo, 0 ,sizeof(serverinfo_t) );

-

-	ServerInfo_Cache();

-

-	s_serverinfo.menu.draw       = ServerInfo_MenuDraw;

-	s_serverinfo.menu.key        = ServerInfo_MenuKey;

-	s_serverinfo.menu.wrapAround = qtrue;

-	s_serverinfo.menu.fullscreen = qtrue;

-

-	s_serverinfo.banner.generic.type  = MTYPE_BTEXT;

-	s_serverinfo.banner.generic.x	  = 320;

-	s_serverinfo.banner.generic.y	  = 16;

-	s_serverinfo.banner.string		  = "SERVER INFO";

-	s_serverinfo.banner.color	      = color_white;

-	s_serverinfo.banner.style	      = UI_CENTER;

-

-	s_serverinfo.framel.generic.type  = MTYPE_BITMAP;

-	s_serverinfo.framel.generic.name  = SERVERINFO_FRAMEL;

-	s_serverinfo.framel.generic.flags = QMF_INACTIVE;

-	s_serverinfo.framel.generic.x	  = 0;  

-	s_serverinfo.framel.generic.y	  = 78;

-	s_serverinfo.framel.width  	      = 256;

-	s_serverinfo.framel.height  	  = 329;

-

-	s_serverinfo.framer.generic.type  = MTYPE_BITMAP;

-	s_serverinfo.framer.generic.name  = SERVERINFO_FRAMER;

-	s_serverinfo.framer.generic.flags = QMF_INACTIVE;

-	s_serverinfo.framer.generic.x	  = 376;

-	s_serverinfo.framer.generic.y	  = 76;

-	s_serverinfo.framer.width  	      = 256;

-	s_serverinfo.framer.height  	  = 334;

-

-	s_serverinfo.add.generic.type	  = MTYPE_PTEXT;

-	s_serverinfo.add.generic.flags    = QMF_CENTER_JUSTIFY|QMF_PULSEIFFOCUS;

-	s_serverinfo.add.generic.callback = ServerInfo_Event;

-	s_serverinfo.add.generic.id	      = ID_ADD;

-	s_serverinfo.add.generic.x		  = 320;

-	s_serverinfo.add.generic.y		  = 371;

-	s_serverinfo.add.string  		  = "ADD TO FAVORITES";

-	s_serverinfo.add.style  		  = UI_CENTER|UI_SMALLFONT;

-	s_serverinfo.add.color			  =	color_red;

-	if( trap_Cvar_VariableValue( "sv_running" ) ) {

-		s_serverinfo.add.generic.flags |= QMF_GRAYED;

-	}

-

-	s_serverinfo.back.generic.type	   = MTYPE_BITMAP;

-	s_serverinfo.back.generic.name     = SERVERINFO_BACK0;

-	s_serverinfo.back.generic.flags    = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;

-	s_serverinfo.back.generic.callback = ServerInfo_Event;

-	s_serverinfo.back.generic.id	   = ID_BACK;

-	s_serverinfo.back.generic.x		   = 0;

-	s_serverinfo.back.generic.y		   = 480-64;

-	s_serverinfo.back.width  		   = 128;

-	s_serverinfo.back.height  		   = 64;

-	s_serverinfo.back.focuspic         = SERVERINFO_BACK1;

-

-	trap_GetConfigString( CS_SERVERINFO, s_serverinfo.info, MAX_INFO_STRING );

-

-	s_serverinfo.numlines = 0;

-	s = s_serverinfo.info;

-	while ( s ) {

-		Info_NextPair( &s, key, value );

-		if ( !key[0] ) {

-			break;

-		}

-		s_serverinfo.numlines++;

-	}

-

-	if (s_serverinfo.numlines > 16)

-		s_serverinfo.numlines = 16;

-

-	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.banner );

-	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.framel );

-	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.framer );

-	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.add );

-	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.back );

-

-	UI_PushMenu( &s_serverinfo.menu );

-}

-

-

+/*
+===========================================================================
+Copyright (C) 1999-2005 Id Software, Inc.
+
+This file is part of Quake III Arena source code.
+
+Quake III Arena source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+Quake III Arena source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+//
+#include "ui_local.h"
+
+#define SERVERINFO_FRAMEL	"menu/art/frame2_l"
+#define SERVERINFO_FRAMER	"menu/art/frame1_r"
+#define SERVERINFO_BACK0	"menu/art/back_0"
+#define SERVERINFO_BACK1	"menu/art/back_1"
+
+static char* serverinfo_artlist[] =
+{
+	SERVERINFO_FRAMEL,	
+	SERVERINFO_FRAMER,
+	SERVERINFO_BACK0,
+	SERVERINFO_BACK1,
+	NULL
+};
+
+#define ID_ADD	 100
+#define ID_BACK	 101
+
+typedef struct
+{
+	menuframework_s	menu;
+	menutext_s		banner;
+	menubitmap_s	framel;
+	menubitmap_s	framer;
+	menubitmap_s	back;
+	menutext_s		add;
+	char			info[MAX_INFO_STRING];
+	int				numlines;
+} serverinfo_t;
+
+static serverinfo_t	s_serverinfo;
+
+
+/*
+=================
+Favorites_Add
+
+Add current server to favorites
+=================
+*/
+void Favorites_Add( void )
+{
+	char	adrstr[128];
+	char	serverbuff[128];
+	int		i;
+	int		best;
+
+	trap_Cvar_VariableStringBuffer( "cl_currentServerAddress", serverbuff, sizeof(serverbuff) );
+	if (!serverbuff[0])
+		return;
+
+	best = 0;
+	for (i=0; i<MAX_FAVORITESERVERS; i++)
+	{
+		trap_Cvar_VariableStringBuffer( va("server%d",i+1), adrstr, sizeof(adrstr) );
+		if (!Q_stricmp(serverbuff,adrstr))
+		{
+			// already in list
+			return;
+		}
+		
+		// use first empty or non-numeric available slot
+		if ((adrstr[0]  < '0' || adrstr[0] > '9' ) && !best)
+			best = i+1;
+	}
+
+	if (best)
+		trap_Cvar_Set( va("server%d",best), serverbuff);
+}
+
+
+/*
+=================
+ServerInfo_Event
+=================
+*/
+static void ServerInfo_Event( void* ptr, int event )
+{
+	switch (((menucommon_s*)ptr)->id)
+	{
+		case ID_ADD:
+			if (event != QM_ACTIVATED)
+				break;
+		
+			Favorites_Add();
+			UI_PopMenu();
+			break;
+
+		case ID_BACK:
+			if (event != QM_ACTIVATED)
+				break;
+
+			UI_PopMenu();
+			break;
+	}
+}
+
+/*
+=================
+ServerInfo_MenuDraw
+=================
+*/
+static void ServerInfo_MenuDraw( void )
+{
+	const char		*s;
+	char			key[MAX_INFO_KEY];
+	char			value[MAX_INFO_VALUE];
+	int				y;
+
+	y = SCREEN_HEIGHT/2 - s_serverinfo.numlines*(SMALLCHAR_HEIGHT)/2 - 20;
+	s = s_serverinfo.info;
+	while ( s ) {
+		Info_NextPair( &s, key, value );
+		if ( !key[0] ) {
+			break;
+		}
+
+		Q_strcat( key, MAX_INFO_KEY, ":" ); 
+
+		UI_DrawString(SCREEN_WIDTH*0.50 - 8,y,key,UI_RIGHT|UI_SMALLFONT,color_red);
+		UI_DrawString(SCREEN_WIDTH*0.50 + 8,y,value,UI_LEFT|UI_SMALLFONT,text_color_normal);
+
+		y += SMALLCHAR_HEIGHT;
+	}
+
+	Menu_Draw( &s_serverinfo.menu );
+}
+
+/*
+=================
+ServerInfo_MenuKey
+=================
+*/
+static sfxHandle_t ServerInfo_MenuKey( int key )
+{
+	return ( Menu_DefaultKey( &s_serverinfo.menu, key ) );
+}
+
+/*
+=================
+ServerInfo_Cache
+=================
+*/
+void ServerInfo_Cache( void )
+{
+	int	i;
+
+	// touch all our pics
+	for (i=0; ;i++)
+	{
+		if (!serverinfo_artlist[i])
+			break;
+		trap_R_RegisterShaderNoMip(serverinfo_artlist[i]);
+	}
+}
+
+/*
+=================
+UI_ServerInfoMenu
+=================
+*/
+void UI_ServerInfoMenu( void )
+{
+	const char		*s;
+	char			key[MAX_INFO_KEY];
+	char			value[MAX_INFO_VALUE];
+
+	// zero set all our globals
+	memset( &s_serverinfo, 0 ,sizeof(serverinfo_t) );
+
+	ServerInfo_Cache();
+
+	s_serverinfo.menu.draw       = ServerInfo_MenuDraw;
+	s_serverinfo.menu.key        = ServerInfo_MenuKey;
+	s_serverinfo.menu.wrapAround = qtrue;
+	s_serverinfo.menu.fullscreen = qtrue;
+
+	s_serverinfo.banner.generic.type  = MTYPE_BTEXT;
+	s_serverinfo.banner.generic.x	  = 320;
+	s_serverinfo.banner.generic.y	  = 16;
+	s_serverinfo.banner.string		  = "SERVER INFO";
+	s_serverinfo.banner.color	      = color_white;
+	s_serverinfo.banner.style	      = UI_CENTER;
+
+	s_serverinfo.framel.generic.type  = MTYPE_BITMAP;
+	s_serverinfo.framel.generic.name  = SERVERINFO_FRAMEL;
+	s_serverinfo.framel.generic.flags = QMF_INACTIVE;
+	s_serverinfo.framel.generic.x	  = 0;  
+	s_serverinfo.framel.generic.y	  = 78;
+	s_serverinfo.framel.width  	      = 256;
+	s_serverinfo.framel.height  	  = 329;
+
+	s_serverinfo.framer.generic.type  = MTYPE_BITMAP;
+	s_serverinfo.framer.generic.name  = SERVERINFO_FRAMER;
+	s_serverinfo.framer.generic.flags = QMF_INACTIVE;
+	s_serverinfo.framer.generic.x	  = 376;
+	s_serverinfo.framer.generic.y	  = 76;
+	s_serverinfo.framer.width  	      = 256;
+	s_serverinfo.framer.height  	  = 334;
+
+	s_serverinfo.add.generic.type	  = MTYPE_PTEXT;
+	s_serverinfo.add.generic.flags    = QMF_CENTER_JUSTIFY|QMF_PULSEIFFOCUS;
+	s_serverinfo.add.generic.callback = ServerInfo_Event;
+	s_serverinfo.add.generic.id	      = ID_ADD;
+	s_serverinfo.add.generic.x		  = 320;
+	s_serverinfo.add.generic.y		  = 371;
+	s_serverinfo.add.string  		  = "ADD TO FAVORITES";
+	s_serverinfo.add.style  		  = UI_CENTER|UI_SMALLFONT;
+	s_serverinfo.add.color			  =	color_red;
+	if( trap_Cvar_VariableValue( "sv_running" ) ) {
+		s_serverinfo.add.generic.flags |= QMF_GRAYED;
+	}
+
+	s_serverinfo.back.generic.type	   = MTYPE_BITMAP;
+	s_serverinfo.back.generic.name     = SERVERINFO_BACK0;
+	s_serverinfo.back.generic.flags    = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
+	s_serverinfo.back.generic.callback = ServerInfo_Event;
+	s_serverinfo.back.generic.id	   = ID_BACK;
+	s_serverinfo.back.generic.x		   = 0;
+	s_serverinfo.back.generic.y		   = 480-64;
+	s_serverinfo.back.width  		   = 128;
+	s_serverinfo.back.height  		   = 64;
+	s_serverinfo.back.focuspic         = SERVERINFO_BACK1;
+
+	trap_GetConfigString( CS_SERVERINFO, s_serverinfo.info, MAX_INFO_STRING );
+
+	s_serverinfo.numlines = 0;
+	s = s_serverinfo.info;
+	while ( s ) {
+		Info_NextPair( &s, key, value );
+		if ( !key[0] ) {
+			break;
+		}
+		s_serverinfo.numlines++;
+	}
+
+	if (s_serverinfo.numlines > 16)
+		s_serverinfo.numlines = 16;
+
+	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.banner );
+	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.framel );
+	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.framer );
+	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.add );
+	Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.back );
+
+	UI_PushMenu( &s_serverinfo.menu );
+}
+
+