newlines fixed

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

1 files changed, 291 insertions, 291 deletions

diff --git a/code/q3_ui/ui_demo2.c b/code/q3_ui/ui_demo2.c
index 57b5955..f6f6f66 100755
--- a/code/q3_ui/ui_demo2.c
+++ b/code/q3_ui/ui_demo2.c
@@ -1,291 +1,291 @@
-/*

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

-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

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

-*/

-//

-/*

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

-

-DEMOS MENU

-

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

-*/

-

-

-#include "ui_local.h"

-

-

-#define ART_BACK0			"menu/art/back_0"

-#define ART_BACK1			"menu/art/back_1"	

-#define ART_GO0				"menu/art/play_0"

-#define ART_GO1				"menu/art/play_1"

-#define ART_FRAMEL			"menu/art/frame2_l"

-#define ART_FRAMER			"menu/art/frame1_r"

-#define ART_ARROWS			"menu/art/arrows_horz_0"

-#define ART_ARROWLEFT		"menu/art/arrows_horz_left"

-#define ART_ARROWRIGHT		"menu/art/arrows_horz_right"

-

-#define MAX_DEMOS			128

-#define NAMEBUFSIZE			( MAX_DEMOS * 16 )

-

-#define ID_BACK				10

-#define ID_GO				11

-#define ID_LIST				12

-#define ID_RIGHT			13

-#define ID_LEFT				14

-

-#define ARROWS_WIDTH		128

-#define ARROWS_HEIGHT		48

-

-

-typedef struct {

-	menuframework_s	menu;

-

-	menutext_s		banner;

-	menubitmap_s	framel;

-	menubitmap_s	framer;

-

-	menulist_s		list;

-

-	menubitmap_s	arrows;

-	menubitmap_s	left;

-	menubitmap_s	right;

-	menubitmap_s	back;

-	menubitmap_s	go;

-

-	int				numDemos;

-	char			names[NAMEBUFSIZE];

-	char			*demolist[MAX_DEMOS];

-} demos_t;

-

-static demos_t	s_demos;

-

-

-/*

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

-Demos_MenuEvent

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

-*/

-static void Demos_MenuEvent( void *ptr, int event ) {

-	if( event != QM_ACTIVATED ) {

-		return;

-	}

-

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

-	case ID_GO:

-		UI_ForceMenuOff ();

-		trap_Cmd_ExecuteText( EXEC_APPEND, va( "demo %s\n",

-								s_demos.list.itemnames[s_demos.list.curvalue]) );

-		break;

-

-	case ID_BACK:

-		UI_PopMenu();

-		break;

-

-	case ID_LEFT:

-		ScrollList_Key( &s_demos.list, K_LEFTARROW );

-		break;

-

-	case ID_RIGHT:

-		ScrollList_Key( &s_demos.list, K_RIGHTARROW );

-		break;

-	}

-}

-

-

-/*

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

-UI_DemosMenu_Key

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

-*/

-static sfxHandle_t UI_DemosMenu_Key( int key ) {

-	menucommon_s	*item;

-

-	item = Menu_ItemAtCursor( &s_demos.menu );

-

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

-}

-

-

-/*

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

-Demos_MenuInit

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

-*/

-static void Demos_MenuInit( void ) {

-	int		i;

-	int		len;

-	char	*demoname, extension[32];

-

-	memset( &s_demos, 0 ,sizeof(demos_t) );

-	s_demos.menu.key = UI_DemosMenu_Key;

-

-	Demos_Cache();

-

-	s_demos.menu.fullscreen = qtrue;

-	s_demos.menu.wrapAround = qtrue;

-

-	s_demos.banner.generic.type		= MTYPE_BTEXT;

-	s_demos.banner.generic.x		= 320;

-	s_demos.banner.generic.y		= 16;

-	s_demos.banner.string			= "DEMOS";

-	s_demos.banner.color			= color_white;

-	s_demos.banner.style			= UI_CENTER;

-

-	s_demos.framel.generic.type		= MTYPE_BITMAP;

-	s_demos.framel.generic.name		= ART_FRAMEL;

-	s_demos.framel.generic.flags	= QMF_INACTIVE;

-	s_demos.framel.generic.x		= 0;  

-	s_demos.framel.generic.y		= 78;

-	s_demos.framel.width			= 256;

-	s_demos.framel.height			= 329;

-

-	s_demos.framer.generic.type		= MTYPE_BITMAP;

-	s_demos.framer.generic.name		= ART_FRAMER;

-	s_demos.framer.generic.flags	= QMF_INACTIVE;

-	s_demos.framer.generic.x		= 376;

-	s_demos.framer.generic.y		= 76;

-	s_demos.framer.width			= 256;

-	s_demos.framer.height			= 334;

-

-	s_demos.arrows.generic.type		= MTYPE_BITMAP;

-	s_demos.arrows.generic.name		= ART_ARROWS;

-	s_demos.arrows.generic.flags	= QMF_INACTIVE;

-	s_demos.arrows.generic.x		= 320-ARROWS_WIDTH/2;

-	s_demos.arrows.generic.y		= 400;

-	s_demos.arrows.width			= ARROWS_WIDTH;

-	s_demos.arrows.height			= ARROWS_HEIGHT;

-

-	s_demos.left.generic.type		= MTYPE_BITMAP;

-	s_demos.left.generic.flags		= QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS|QMF_MOUSEONLY;

-	s_demos.left.generic.x			= 320-ARROWS_WIDTH/2;

-	s_demos.left.generic.y			= 400;

-	s_demos.left.generic.id			= ID_LEFT;

-	s_demos.left.generic.callback	= Demos_MenuEvent;

-	s_demos.left.width				= ARROWS_WIDTH/2;

-	s_demos.left.height				= ARROWS_HEIGHT;

-	s_demos.left.focuspic			= ART_ARROWLEFT;

-

-	s_demos.right.generic.type		= MTYPE_BITMAP;

-	s_demos.right.generic.flags		= QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS|QMF_MOUSEONLY;

-	s_demos.right.generic.x			= 320;

-	s_demos.right.generic.y			= 400;

-	s_demos.right.generic.id		= ID_RIGHT;

-	s_demos.right.generic.callback	= Demos_MenuEvent;

-	s_demos.right.width				= ARROWS_WIDTH/2;

-	s_demos.right.height			= ARROWS_HEIGHT;

-	s_demos.right.focuspic			= ART_ARROWRIGHT;

-

-	s_demos.back.generic.type		= MTYPE_BITMAP;

-	s_demos.back.generic.name		= ART_BACK0;

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

-	s_demos.back.generic.id			= ID_BACK;

-	s_demos.back.generic.callback	= Demos_MenuEvent;

-	s_demos.back.generic.x			= 0;

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

-	s_demos.back.width				= 128;

-	s_demos.back.height				= 64;

-	s_demos.back.focuspic			= ART_BACK1;

-

-	s_demos.go.generic.type			= MTYPE_BITMAP;

-	s_demos.go.generic.name			= ART_GO0;

-	s_demos.go.generic.flags		= QMF_RIGHT_JUSTIFY|QMF_PULSEIFFOCUS;

-	s_demos.go.generic.id			= ID_GO;

-	s_demos.go.generic.callback		= Demos_MenuEvent;

-	s_demos.go.generic.x			= 640;

-	s_demos.go.generic.y			= 480-64;

-	s_demos.go.width				= 128;

-	s_demos.go.height				= 64;

-	s_demos.go.focuspic				= ART_GO1;

-

-	s_demos.list.generic.type		= MTYPE_SCROLLLIST;

-	s_demos.list.generic.flags		= QMF_PULSEIFFOCUS;

-	s_demos.list.generic.callback	= Demos_MenuEvent;

-	s_demos.list.generic.id			= ID_LIST;

-	s_demos.list.generic.x			= 118;

-	s_demos.list.generic.y			= 130;

-	s_demos.list.width				= 16;

-	s_demos.list.height				= 14;

-	Com_sprintf(extension, sizeof(extension), "dm_%d", (int)trap_Cvar_VariableValue( "protocol" ) );

-	s_demos.list.numitems			= trap_FS_GetFileList( "demos", extension, s_demos.names, NAMEBUFSIZE );

-	s_demos.list.itemnames			= (const char **)s_demos.demolist;

-	s_demos.list.columns			= 3;

-

-	if (!s_demos.list.numitems) {

-		strcpy( s_demos.names, "No Demos Found." );

-		s_demos.list.numitems = 1;

-

-		//degenerate case, not selectable

-		s_demos.go.generic.flags |= (QMF_INACTIVE|QMF_HIDDEN);

-	}

-	else if (s_demos.list.numitems > MAX_DEMOS)

-		s_demos.list.numitems = MAX_DEMOS;

-

-	demoname = s_demos.names;

-	for ( i = 0; i < s_demos.list.numitems; i++ ) {

-		s_demos.list.itemnames[i] = demoname;

-		

-		// strip extension

-		len = strlen( demoname );

-		if (!Q_stricmp(demoname +  len - 4,".dm3"))

-			demoname[len-4] = '\0';

-

-		Q_strupr(demoname);

-

-		demoname += len + 1;

-	}

-

-	Menu_AddItem( &s_demos.menu, &s_demos.banner );

-	Menu_AddItem( &s_demos.menu, &s_demos.framel );

-	Menu_AddItem( &s_demos.menu, &s_demos.framer );

-	Menu_AddItem( &s_demos.menu, &s_demos.list );

-	Menu_AddItem( &s_demos.menu, &s_demos.arrows );

-	Menu_AddItem( &s_demos.menu, &s_demos.left );

-	Menu_AddItem( &s_demos.menu, &s_demos.right );

-	Menu_AddItem( &s_demos.menu, &s_demos.back );

-	Menu_AddItem( &s_demos.menu, &s_demos.go );

-}

-

-/*

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

-Demos_Cache

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

-*/

-void Demos_Cache( void ) {

-	trap_R_RegisterShaderNoMip( ART_BACK0 );

-	trap_R_RegisterShaderNoMip( ART_BACK1 );

-	trap_R_RegisterShaderNoMip( ART_GO0 );

-	trap_R_RegisterShaderNoMip( ART_GO1 );

-	trap_R_RegisterShaderNoMip( ART_FRAMEL );

-	trap_R_RegisterShaderNoMip( ART_FRAMER );

-	trap_R_RegisterShaderNoMip( ART_ARROWS );

-	trap_R_RegisterShaderNoMip( ART_ARROWLEFT );

-	trap_R_RegisterShaderNoMip( ART_ARROWRIGHT );

-}

-

-/*

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

-UI_DemosMenu

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

-*/

-void UI_DemosMenu( void ) {

-	Demos_MenuInit();

-	UI_PushMenu( &s_demos.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
+===========================================================================
+*/
+//
+/*
+=======================================================================
+
+DEMOS MENU
+
+=======================================================================
+*/
+
+
+#include "ui_local.h"
+
+
+#define ART_BACK0			"menu/art/back_0"
+#define ART_BACK1			"menu/art/back_1"	
+#define ART_GO0				"menu/art/play_0"
+#define ART_GO1				"menu/art/play_1"
+#define ART_FRAMEL			"menu/art/frame2_l"
+#define ART_FRAMER			"menu/art/frame1_r"
+#define ART_ARROWS			"menu/art/arrows_horz_0"
+#define ART_ARROWLEFT		"menu/art/arrows_horz_left"
+#define ART_ARROWRIGHT		"menu/art/arrows_horz_right"
+
+#define MAX_DEMOS			128
+#define NAMEBUFSIZE			( MAX_DEMOS * 16 )
+
+#define ID_BACK				10
+#define ID_GO				11
+#define ID_LIST				12
+#define ID_RIGHT			13
+#define ID_LEFT				14
+
+#define ARROWS_WIDTH		128
+#define ARROWS_HEIGHT		48
+
+
+typedef struct {
+	menuframework_s	menu;
+
+	menutext_s		banner;
+	menubitmap_s	framel;
+	menubitmap_s	framer;
+
+	menulist_s		list;
+
+	menubitmap_s	arrows;
+	menubitmap_s	left;
+	menubitmap_s	right;
+	menubitmap_s	back;
+	menubitmap_s	go;
+
+	int				numDemos;
+	char			names[NAMEBUFSIZE];
+	char			*demolist[MAX_DEMOS];
+} demos_t;
+
+static demos_t	s_demos;
+
+
+/*
+===============
+Demos_MenuEvent
+===============
+*/
+static void Demos_MenuEvent( void *ptr, int event ) {
+	if( event != QM_ACTIVATED ) {
+		return;
+	}
+
+	switch( ((menucommon_s*)ptr)->id ) {
+	case ID_GO:
+		UI_ForceMenuOff ();
+		trap_Cmd_ExecuteText( EXEC_APPEND, va( "demo %s\n",
+								s_demos.list.itemnames[s_demos.list.curvalue]) );
+		break;
+
+	case ID_BACK:
+		UI_PopMenu();
+		break;
+
+	case ID_LEFT:
+		ScrollList_Key( &s_demos.list, K_LEFTARROW );
+		break;
+
+	case ID_RIGHT:
+		ScrollList_Key( &s_demos.list, K_RIGHTARROW );
+		break;
+	}
+}
+
+
+/*
+=================
+UI_DemosMenu_Key
+=================
+*/
+static sfxHandle_t UI_DemosMenu_Key( int key ) {
+	menucommon_s	*item;
+
+	item = Menu_ItemAtCursor( &s_demos.menu );
+
+	return Menu_DefaultKey( &s_demos.menu, key );
+}
+
+
+/*
+===============
+Demos_MenuInit
+===============
+*/
+static void Demos_MenuInit( void ) {
+	int		i;
+	int		len;
+	char	*demoname, extension[32];
+
+	memset( &s_demos, 0 ,sizeof(demos_t) );
+	s_demos.menu.key = UI_DemosMenu_Key;
+
+	Demos_Cache();
+
+	s_demos.menu.fullscreen = qtrue;
+	s_demos.menu.wrapAround = qtrue;
+
+	s_demos.banner.generic.type		= MTYPE_BTEXT;
+	s_demos.banner.generic.x		= 320;
+	s_demos.banner.generic.y		= 16;
+	s_demos.banner.string			= "DEMOS";
+	s_demos.banner.color			= color_white;
+	s_demos.banner.style			= UI_CENTER;
+
+	s_demos.framel.generic.type		= MTYPE_BITMAP;
+	s_demos.framel.generic.name		= ART_FRAMEL;
+	s_demos.framel.generic.flags	= QMF_INACTIVE;
+	s_demos.framel.generic.x		= 0;  
+	s_demos.framel.generic.y		= 78;
+	s_demos.framel.width			= 256;
+	s_demos.framel.height			= 329;
+
+	s_demos.framer.generic.type		= MTYPE_BITMAP;
+	s_demos.framer.generic.name		= ART_FRAMER;
+	s_demos.framer.generic.flags	= QMF_INACTIVE;
+	s_demos.framer.generic.x		= 376;
+	s_demos.framer.generic.y		= 76;
+	s_demos.framer.width			= 256;
+	s_demos.framer.height			= 334;
+
+	s_demos.arrows.generic.type		= MTYPE_BITMAP;
+	s_demos.arrows.generic.name		= ART_ARROWS;
+	s_demos.arrows.generic.flags	= QMF_INACTIVE;
+	s_demos.arrows.generic.x		= 320-ARROWS_WIDTH/2;
+	s_demos.arrows.generic.y		= 400;
+	s_demos.arrows.width			= ARROWS_WIDTH;
+	s_demos.arrows.height			= ARROWS_HEIGHT;
+
+	s_demos.left.generic.type		= MTYPE_BITMAP;
+	s_demos.left.generic.flags		= QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS|QMF_MOUSEONLY;
+	s_demos.left.generic.x			= 320-ARROWS_WIDTH/2;
+	s_demos.left.generic.y			= 400;
+	s_demos.left.generic.id			= ID_LEFT;
+	s_demos.left.generic.callback	= Demos_MenuEvent;
+	s_demos.left.width				= ARROWS_WIDTH/2;
+	s_demos.left.height				= ARROWS_HEIGHT;
+	s_demos.left.focuspic			= ART_ARROWLEFT;
+
+	s_demos.right.generic.type		= MTYPE_BITMAP;
+	s_demos.right.generic.flags		= QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS|QMF_MOUSEONLY;
+	s_demos.right.generic.x			= 320;
+	s_demos.right.generic.y			= 400;
+	s_demos.right.generic.id		= ID_RIGHT;
+	s_demos.right.generic.callback	= Demos_MenuEvent;
+	s_demos.right.width				= ARROWS_WIDTH/2;
+	s_demos.right.height			= ARROWS_HEIGHT;
+	s_demos.right.focuspic			= ART_ARROWRIGHT;
+
+	s_demos.back.generic.type		= MTYPE_BITMAP;
+	s_demos.back.generic.name		= ART_BACK0;
+	s_demos.back.generic.flags		= QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
+	s_demos.back.generic.id			= ID_BACK;
+	s_demos.back.generic.callback	= Demos_MenuEvent;
+	s_demos.back.generic.x			= 0;
+	s_demos.back.generic.y			= 480-64;
+	s_demos.back.width				= 128;
+	s_demos.back.height				= 64;
+	s_demos.back.focuspic			= ART_BACK1;
+
+	s_demos.go.generic.type			= MTYPE_BITMAP;
+	s_demos.go.generic.name			= ART_GO0;
+	s_demos.go.generic.flags		= QMF_RIGHT_JUSTIFY|QMF_PULSEIFFOCUS;
+	s_demos.go.generic.id			= ID_GO;
+	s_demos.go.generic.callback		= Demos_MenuEvent;
+	s_demos.go.generic.x			= 640;
+	s_demos.go.generic.y			= 480-64;
+	s_demos.go.width				= 128;
+	s_demos.go.height				= 64;
+	s_demos.go.focuspic				= ART_GO1;
+
+	s_demos.list.generic.type		= MTYPE_SCROLLLIST;
+	s_demos.list.generic.flags		= QMF_PULSEIFFOCUS;
+	s_demos.list.generic.callback	= Demos_MenuEvent;
+	s_demos.list.generic.id			= ID_LIST;
+	s_demos.list.generic.x			= 118;
+	s_demos.list.generic.y			= 130;
+	s_demos.list.width				= 16;
+	s_demos.list.height				= 14;
+	Com_sprintf(extension, sizeof(extension), "dm_%d", (int)trap_Cvar_VariableValue( "protocol" ) );
+	s_demos.list.numitems			= trap_FS_GetFileList( "demos", extension, s_demos.names, NAMEBUFSIZE );
+	s_demos.list.itemnames			= (const char **)s_demos.demolist;
+	s_demos.list.columns			= 3;
+
+	if (!s_demos.list.numitems) {
+		strcpy( s_demos.names, "No Demos Found." );
+		s_demos.list.numitems = 1;
+
+		//degenerate case, not selectable
+		s_demos.go.generic.flags |= (QMF_INACTIVE|QMF_HIDDEN);
+	}
+	else if (s_demos.list.numitems > MAX_DEMOS)
+		s_demos.list.numitems = MAX_DEMOS;
+
+	demoname = s_demos.names;
+	for ( i = 0; i < s_demos.list.numitems; i++ ) {
+		s_demos.list.itemnames[i] = demoname;
+		
+		// strip extension
+		len = strlen( demoname );
+		if (!Q_stricmp(demoname +  len - 4,".dm3"))
+			demoname[len-4] = '\0';
+
+		Q_strupr(demoname);
+
+		demoname += len + 1;
+	}
+
+	Menu_AddItem( &s_demos.menu, &s_demos.banner );
+	Menu_AddItem( &s_demos.menu, &s_demos.framel );
+	Menu_AddItem( &s_demos.menu, &s_demos.framer );
+	Menu_AddItem( &s_demos.menu, &s_demos.list );
+	Menu_AddItem( &s_demos.menu, &s_demos.arrows );
+	Menu_AddItem( &s_demos.menu, &s_demos.left );
+	Menu_AddItem( &s_demos.menu, &s_demos.right );
+	Menu_AddItem( &s_demos.menu, &s_demos.back );
+	Menu_AddItem( &s_demos.menu, &s_demos.go );
+}
+
+/*
+=================
+Demos_Cache
+=================
+*/
+void Demos_Cache( void ) {
+	trap_R_RegisterShaderNoMip( ART_BACK0 );
+	trap_R_RegisterShaderNoMip( ART_BACK1 );
+	trap_R_RegisterShaderNoMip( ART_GO0 );
+	trap_R_RegisterShaderNoMip( ART_GO1 );
+	trap_R_RegisterShaderNoMip( ART_FRAMEL );
+	trap_R_RegisterShaderNoMip( ART_FRAMER );
+	trap_R_RegisterShaderNoMip( ART_ARROWS );
+	trap_R_RegisterShaderNoMip( ART_ARROWLEFT );
+	trap_R_RegisterShaderNoMip( ART_ARROWRIGHT );
+}
+
+/*
+===============
+UI_DemosMenu
+===============
+*/
+void UI_DemosMenu( void ) {
+	Demos_MenuInit();
+	UI_PushMenu( &s_demos.menu );
+}