OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed all the warnings from GCC 4.2, including a handful that were

Browse source 
present in
  older GCCs.



SVN r430 (trunk)
This commit is contained in:
Randy Heit 2006-12-29 03:38:37 +00:00
commit 851bf89442
33 changed files with 106 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/m_options.cpp
View file

@ -133,7 +133,7 @@ value_t OnOff[2] = {
menu_t *CurrentMenu;
int CurrentItem;
static char *OldMessage;
static const char *OldMessage;
static itemtype OldType;
int flagsvar;
@ -149,7 +149,7 @@ enum
* Confirm Menu - Used by safemore
*
*=======================================*/
static void ActivateConfirm (char *text, void (*func)());
static void ActivateConfirm (const char *text, void (*func)());
static void ConfirmIsAGo ();
static menuitem_t ConfirmItems[] = {
@ -678,7 +678,7 @@ menu_t MapColorsMenu =
* Color Picker Sub-menu
*
*=======================================*/
static void StartColorPickerMenu (char *colorname, FColorCVar *cvar);
static void StartColorPickerMenu (const char *colorname, FColorCVar *cvar);
static void ColorPickerReset ();
static int CurrColorIndex;
static int SelColorIndex;
@ -1173,24 +1173,7 @@ static menu_t AdvSoundMenu =
AdvSoundItems,
};
void M_FreeValues (value_t **values, int num)
{
int i;
if (*values)
{
for (i = 0; i < num; i++)
{
if ((*values)[i].name)
free ((*values)[i].name);
}
free (*values);
*values = NULL;
}
}
static void ActivateConfirm (char *text, void (*func)())
static void ActivateConfirm (const char *text, void (*func)())
{
ConfirmItems[0].label = text;
ConfirmItems[0].e.mfunc = func;
@ -1688,7 +1671,7 @@ void M_OptDrawer ()
case bitflag:
{
value_t *value;
char *str;
const char *str;
if (item->b.min)
value = NoYes;
@ -2551,7 +2534,7 @@ static void ActivateColorChoice ()
ColorPickerItems[0].a.colorcvar->SetGenericRep (val, CVAR_Int);
}
static void StartColorPickerMenu (char *colorname, FColorCVar *cvar)
static void StartColorPickerMenu (const char *colorname, FColorCVar *cvar)
{
ColorPickerMenu.PreDraw = ColorPickerDrawer;
ColorPickerMenu.EscapeHandler = ActivateColorChoice;
@ -2778,8 +2761,9 @@ CCMD (menu_mididevice)
#endif
static void MakeSoundChanges (void)
{
AddCommandString ("snd_reset");
{
static char snd_reset[] = "snd_reset";
AddCommandString (snd_reset);
}
static void VideoOptions (void)
@ -2932,7 +2916,7 @@ static void SetModesMenu (int w, int h, int bits)
if (testingmode <= 1)
{
if (ModesItems[VM_ENTERLINE].label != VMEnterText)
free (ModesItems[VM_ENTERLINE].label);
free (const_cast<char *>(ModesItems[VM_ENTERLINE].label));
ModesItems[VM_ENTERLINE].label = VMEnterText;
ModesItems[VM_TESTLINE].label = VMTestText;
}