summaryrefslogtreecommitdiff
path: root/src/m_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/m_menu.c')
-rw-r--r--src/m_menu.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/m_menu.c b/src/m_menu.c
index 76efffa1..73f8ce21 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: m_menu.c 455 2006-03-30 19:08:37Z fraggle $
+// $Id: m_menu.c 641 2006-09-21 11:13:28Z rtc_marine $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -78,7 +78,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: m_menu.c 455 2006-03-30 19:08:37Z fraggle $";
+rcsid[] = "$Id: m_menu.c 641 2006-09-21 11:13:28Z rtc_marine $";
#include <stdlib.h>
#include <ctype.h>
@@ -408,9 +408,9 @@ menuitem_t OptionsMenu[]=
{1,"M_MESSG", M_ChangeMessages,'m'},
{1,"M_DETAIL", M_ChangeDetail,'g'},
{2,"M_SCRNSZ", M_SizeDisplay,'s'},
- {-1,"",0},
+ {-1,"",0,'\0'},
{2,"M_MSENS", M_ChangeSensitivity,'m'},
- {-1,"",0},
+ {-1,"",0,'\0'},
{1,"M_SVOL", M_Sound,'s'}
};
@@ -484,9 +484,9 @@ enum
menuitem_t SoundMenu[]=
{
{2,"M_SFXVOL",M_SfxVol,'s'},
- {-1,"",0},
+ {-1,"",0,'\0'},
{2,"M_MUSVOL",M_MusicVol,'m'},
- {-1,"",0}
+ {-1,"",0,'\0'}
};
menu_t SoundDef =
@@ -1356,7 +1356,7 @@ void M_StopMessage(void)
//
int M_StringWidth(char* string)
{
- int i;
+ size_t i;
int w = 0;
int c;
@@ -1379,7 +1379,7 @@ int M_StringWidth(char* string)
//
int M_StringHeight(char* string)
{
- int i;
+ size_t i;
int h;
int height = SHORT(hu_font[0]->height);