aboutsummaryrefslogtreecommitdiffstats
path: root/code/q3_ui
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-09-23 17:39:14 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-09-23 17:39:14 +0000
commit4bfc084c4974ecff94e273a7608ebc38f1c046ab (patch)
treec22cc0f88365f625da447e3609cc1951fb7590eb /code/q3_ui
parent4b080c5906fdb1f7ee4e7fe5fdf2375dfcdf5ff4 (diff)
downloadioquake3-aero-4bfc084c4974ecff94e273a7608ebc38f1c046ab.tar.gz
ioquake3-aero-4bfc084c4974ecff94e273a7608ebc38f1c046ab.zip
* Applied ajax's cleanup patch
git-svn-id: svn://svn.icculus.org/quake3/trunk@101 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/q3_ui')
-rw-r--r--code/q3_ui/ui_addbots.c6
-rw-r--r--code/q3_ui/ui_network.c2
-rw-r--r--code/q3_ui/ui_playersettings.c2
-rw-r--r--code/q3_ui/ui_preferences.c2
-rw-r--r--code/q3_ui/ui_qmenu.c2
-rw-r--r--code/q3_ui/ui_servers2.c8
-rw-r--r--code/q3_ui/ui_sound.c2
-rw-r--r--code/q3_ui/ui_startserver.c10
-rw-r--r--code/q3_ui/ui_video.c20
9 files changed, 27 insertions, 27 deletions
diff --git a/code/q3_ui/ui_addbots.c b/code/q3_ui/ui_addbots.c
index c01bc58..e80b443 100644
--- a/code/q3_ui/ui_addbots.c
+++ b/code/q3_ui/ui_addbots.c
@@ -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 ) {
diff --git a/code/q3_ui/ui_network.c b/code/q3_ui/ui_network.c
index ef047a3..90b5a1e 100644
--- a/code/q3_ui/ui_network.c
+++ b/code/q3_ui/ui_network.c
@@ -50,7 +50,7 @@ static const char *rate_items[] = {
"56K",
"ISDN",
"LAN/Cable/xDSL",
- 0
+ NULL
};
typedef struct {
diff --git a/code/q3_ui/ui_playersettings.c b/code/q3_ui/ui_playersettings.c
index 99fafd0..7a24e08 100644
--- a/code/q3_ui/ui_playersettings.c
+++ b/code/q3_ui/ui_playersettings.c
@@ -95,7 +95,7 @@ static const char *handicap_items[] = {
"15",
"10",
"5",
- 0
+ NULL
};
diff --git a/code/q3_ui/ui_preferences.c b/code/q3_ui/ui_preferences.c
index 4b62f5c..744a1e1 100644
--- a/code/q3_ui/ui_preferences.c
+++ b/code/q3_ui/ui_preferences.c
@@ -86,7 +86,7 @@ static const char *teamoverlay_names[] =
"upper right",
"lower right",
"lower left",
- 0
+ NULL
};
static void Preferences_SetMenuItems( void ) {
diff --git a/code/q3_ui/ui_qmenu.c b/code/q3_ui/ui_qmenu.c
index a6ec29e..d26eaeb 100644
--- a/code/q3_ui/ui_qmenu.c
+++ b/code/q3_ui/ui_qmenu.c
@@ -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];
}
diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index 0804b5a..2067354 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -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[] = {
diff --git a/code/q3_ui/ui_sound.c b/code/q3_ui/ui_sound.c
index e09e463..43a057e 100644
--- a/code/q3_ui/ui_sound.c
+++ b/code/q3_ui/ui_sound.c
@@ -48,7 +48,7 @@ SOUND OPTIONS MENU
static const char *quality_items[] = {
- "Low", "High", 0
+ "Low", "High", NULL
};
typedef struct {
diff --git a/code/q3_ui/ui_startserver.c b/code/q3_ui/ui_startserver.c
index 401f687..9a193ed 100644
--- a/code/q3_ui/ui_startserver.c
+++ b/code/q3_ui/ui_startserver.c
@@ -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
};
diff --git a/code/q3_ui/ui_video.c b/code/q3_ui/ui_video.c
index a7f16f4..f7ecafd 100644
--- a/code/q3_ui/ui_video.c
+++ b/code/q3_ui/ui_video.c
@@ -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;