From e7564e9f9d187472950ee65b9b88833ea80030ef Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Thu, 23 Apr 2020 17:09:30 +0200 Subject: [PATCH] Fix single-player menu initializer Without a designator the first member of the union is initialized, which makes clang warn about conversion between enums. --- src/avp/win95/frontend/avp_menudata.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/avp/win95/frontend/avp_menudata.c b/src/avp/win95/frontend/avp_menudata.c index 06630ed..992f409 100644 --- a/src/avp/win95/frontend/avp_menudata.c +++ b/src/avp/win95/frontend/avp_menudata.c @@ -158,9 +158,9 @@ static AVPMENU_ELEMENT AvPMenu_ExitGame[] = static AVPMENU_ELEMENT AvPMenu_SinglePlayer[] = { - {AVPMENU_ELEMENT_GOTOMENU_GFX, {AVPMENUGFX_ALIEN_LOGO}, {AVPMENU_ALIENLEVELS},{0},{0}, TEXTSTRING_MAINMENU_SINGLEPLAYER_ALIEN}, - {AVPMENU_ELEMENT_GOTOMENU_GFX, {AVPMENUGFX_MARINE_LOGO}, {AVPMENU_MARINELEVELS},{0},{0}, TEXTSTRING_MAINMENU_SINGLEPLAYER_MARINE}, - {AVPMENU_ELEMENT_GOTOMENU_GFX, {AVPMENUGFX_PREDATOR_LOGO}, {AVPMENU_PREDATORLEVELS},{0},{0}, TEXTSTRING_MAINMENU_SINGLEPLAYER_PREDATOR}, + {AVPMENU_ELEMENT_GOTOMENU_GFX, {.GfxID=AVPMENUGFX_ALIEN_LOGO}, {AVPMENU_ALIENLEVELS},{0},{0}, TEXTSTRING_MAINMENU_SINGLEPLAYER_ALIEN}, + {AVPMENU_ELEMENT_GOTOMENU_GFX, {.GfxID=AVPMENUGFX_MARINE_LOGO}, {AVPMENU_MARINELEVELS},{0},{0}, TEXTSTRING_MAINMENU_SINGLEPLAYER_MARINE}, + {AVPMENU_ELEMENT_GOTOMENU_GFX, {.GfxID=AVPMENUGFX_PREDATOR_LOGO}, {AVPMENU_PREDATORLEVELS},{0},{0}, TEXTSTRING_MAINMENU_SINGLEPLAYER_PREDATOR}, // {AVPMENU_ELEMENT_GOTOMENU, {TEXTSTRING_MAINMENU_TITLE}, {AVPMENU_MAIN}}, {AVPMENU_ELEMENT_ENDOFMENU} };