From 11588468c78d60be5fa54f78b9aceec315aaef97 Mon Sep 17 00:00:00 2001 From: Molgrum Date: Mon, 20 Aug 2007 02:13:51 +0000 Subject: [PATCH] Fixed warnings related to passing (char **) when (const char **) is excpected, just casting. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2596 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/m_items.c | 6 +++--- engine/client/m_script.c | 4 ++-- engine/client/m_single.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/client/m_items.c b/engine/client/m_items.c index c519e47e3..577f8079e 100644 --- a/engine/client/m_items.c +++ b/engine/client/m_items.c @@ -804,7 +804,7 @@ menucombo_t *MC_AddCombo(menu_t *menu, int x, int y, const char *caption, const n->common.height = 8; n->common.width = strlen(caption)*8 + maxoptlen*8; n->caption = caption; - n->options = newops; + n->options = (const char **)newops; n->common.next = menu->options; menu->options = (menuoption_t *)n; @@ -870,8 +870,8 @@ menucombo_t *MC_AddCvarCombo(menu_t *menu, int x, int y, const char *caption, cv n->caption = optbuf; optbuf += strlen(optbuf)+1; - n->options = newops; - n->values = newvalues; + n->options = (const char **)newops; + n->values = (const char **)newvalues; n->cvar = cvar; // if (!(cvar->flags & CVAR_ARCHIVE)) diff --git a/engine/client/m_script.c b/engine/client/m_script.c index 25ffc6229..b81234d3d 100644 --- a/engine/client/m_script.c +++ b/engine/client/m_script.c @@ -274,7 +274,7 @@ void M_MenuS_Comboi_f (void) } opts[opt] = NULL; - MC_AddCvarCombo(menu_script, x, y, caption, var, opts, values); + MC_AddCvarCombo(menu_script, x, y, caption, var, (const char **)opts, (const char **)values); } char *Hunk_TempString(char *s) @@ -348,7 +348,7 @@ void M_MenuS_Combos_f (void) } opts[opt] = NULL; - MC_AddCvarCombo(menu_script, x, y, caption, var, opts, values); + MC_AddCvarCombo(menu_script, x, y, caption, var, (const char **)opts, (const char **)values); } /* diff --git a/engine/client/m_single.c b/engine/client/m_single.c index 393c049ec..2ccaabbe7 100644 --- a/engine/client/m_single.c +++ b/engine/client/m_single.c @@ -185,7 +185,7 @@ void M_Menu_SinglePlayer_f (void) pc = Cvar_Get("cl_playerclass", "1", CVAR_USERINFO|CVAR_ARCHIVE, "Hexen2"); if (pc) - MC_AddCvarCombo (menu, 64, 104+16, "Player class", pc, classlist, classvalues); + MC_AddCvarCombo (menu, 64, 104+16, "Player class", pc, (const char **)classlist, (const char **)classvalues); return; }