* Applied ajax's cleanup patch

This commit is contained in:
Tim Angus 2005-09-23 17:39:14 +00:00
parent 4c6f59c541
commit fe14a45ad1
40 changed files with 166 additions and 166 deletions

View file

@ -241,18 +241,18 @@ static const char *skillNames[] = {
"Hurt Me Plenty",
"Hardcore",
"Nightmare!",
0
NULL
};
static const char *teamNames1[] = {
"Free",
0
NULL
};
static const char *teamNames2[] = {
"Red",
"Blue",
0
NULL
};
static void UI_AddBotsMenu_Init( void ) {

View file

@ -50,7 +50,7 @@ static const char *rate_items[] = {
"56K",
"ISDN",
"LAN/Cable/xDSL",
0
NULL
};
typedef struct {

View file

@ -95,7 +95,7 @@ static const char *handicap_items[] = {
"15",
"10",
"5",
0
NULL
};

View file

@ -86,7 +86,7 @@ static const char *teamoverlay_names[] =
"upper right",
"lower right",
"lower left",
0
NULL
};
static void Preferences_SetMenuItems( void ) {

View file

@ -1554,7 +1554,7 @@ Menu_ItemAtCursor
void *Menu_ItemAtCursor( menuframework_s *m )
{
if ( m->cursor < 0 || m->cursor >= m->nitems )
return 0;
return NULL;
return m->items[m->cursor];
}

View file

@ -101,7 +101,7 @@ static const char *master_items[] = {
"Local",
"Internet",
"Favorites",
0
NULL
};
static const char *servertype_items[] = {
@ -110,7 +110,7 @@ static const char *servertype_items[] = {
"Team Deathmatch",
"Tournament",
"Capture the Flag",
0
NULL
};
static const char *sortkey_items[] = {
@ -119,7 +119,7 @@ static const char *sortkey_items[] = {
"Open Player Spots",
"Game Type",
"Ping Time",
0
NULL
};
static char* gamenames[] = {
@ -136,7 +136,7 @@ static char* gamenames[] = {
"Urban Terror", // Urban Terror
"OSP", // Orange Smoothie Productions
"???", // unknown
0
NULL
};
static char* netnames[] = {

View file

@ -48,7 +48,7 @@ SOUND OPTIONS MENU
static const char *quality_items[] = {
"Low", "High", 0
"Low", "High", NULL
};
typedef struct {

View file

@ -98,7 +98,7 @@ static const char *gametype_items[] = {
"Team Deathmatch",
"Tournament",
"Capture the Flag",
0
NULL
};
static int gametype_remap[] = {GT_FFA, GT_TEAM, GT_TOURNAMENT, GT_CTF};
@ -665,20 +665,20 @@ static const char *dedicated_list[] = {
"No",
"LAN",
"Internet",
0
NULL
};
static const char *playerType_list[] = {
"Open",
"Bot",
"----",
0
NULL
};
static const char *playerTeam_list[] = {
"Blue",
"Red",
0
NULL
};
static const char *botSkill_list[] = {
@ -687,7 +687,7 @@ static const char *botSkill_list[] = {
"Hurt Me Plenty",
"Hardcore",
"Nightmare!",
0
NULL
};

View file

@ -242,7 +242,7 @@ static const char *s_drivers[] =
{
OPENGL_DRIVER_NAME,
_3DFX_DRIVER_NAME,
0
NULL
};
#define ID_BACK2 101
@ -723,7 +723,7 @@ void GraphicsOptions_MenuInit( void )
{
"Default",
"Voodoo",
0
NULL
};
static const char *tq_names[] =
@ -731,7 +731,7 @@ void GraphicsOptions_MenuInit( void )
"Default",
"16 bit",
"32 bit",
0
NULL
};
static const char *s_graphics_options_names[] =
@ -741,14 +741,14 @@ void GraphicsOptions_MenuInit( void )
"Fast",
"Fastest",
"Custom",
0
NULL
};
static const char *lighting_names[] =
{
"Lightmap",
"Vertex",
0
NULL
};
static const char *colordepth_names[] =
@ -756,7 +756,7 @@ void GraphicsOptions_MenuInit( void )
"Default",
"16 bit",
"32 bit",
0
NULL
};
static const char *resolutions[] =
@ -773,26 +773,26 @@ void GraphicsOptions_MenuInit( void )
"1600x1200",
"2048x1536",
"856x480 wide screen",
0
NULL
};
static const char *filter_names[] =
{
"Bilinear",
"Trilinear",
0
NULL
};
static const char *quality_names[] =
{
"Low",
"Medium",
"High",
0
NULL
};
static const char *enabled_names[] =
{
"Off",
"On",
0
NULL
};
int y;