warning-free build without -Wno-missing-field-initializers
Also removes a GCC_WARN usage and the need for #pragma GCC diagnostic ignored "-Wmissing-braces" for src/decl.c when using gcc.
This commit is contained in:
@@ -585,9 +585,9 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
|
||||
int flags; // 1 desktop, 2 handheld, 3 either/both
|
||||
int (*funct)(void);
|
||||
} item[] = {
|
||||
{ game, 0, 3},
|
||||
{ game, 0, 3, (int (*)(void)) 0},
|
||||
{ game, "Extended-commands", 3, doextcmd },
|
||||
{ game, 0, 3},
|
||||
{ game, 0, 3, (int (*)(void)) 0},
|
||||
{ game, "Version", 3, doversion},
|
||||
{ game, "Compilation", 3, doextversion},
|
||||
{ game, "History", 3, dohistory},
|
||||
@@ -602,7 +602,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
|
||||
#endif
|
||||
"Options", 3, doset},
|
||||
{ game, "Explore mode", 3, enter_explore_mode},
|
||||
{ game, 0, 3},
|
||||
{ game, 0, 3, (int (*)(void)) 0},
|
||||
{ game, "Save-and-exit", 3, dosave},
|
||||
{ game,
|
||||
#ifdef MACOS
|
||||
@@ -615,15 +615,15 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
|
||||
|
||||
{ apparel, "Apparel off", 2, doddoremarm},
|
||||
{ apparel, "Remove many", 1, doddoremarm},
|
||||
{ apparel, 0, 3},
|
||||
{ apparel, 0, 3, (int (*)(void)) 0},
|
||||
{ apparel, "Wield weapon", 3, dowield},
|
||||
{ apparel, "Exchange weapons", 3, doswapweapon},
|
||||
{ apparel, "Two weapon combat", 3, dotwoweapon},
|
||||
{ apparel, "Load quiver", 3, dowieldquiver},
|
||||
{ apparel, 0, 3},
|
||||
{ apparel, 0, 3, (int (*)(void)) 0},
|
||||
{ apparel, "Wear armor", 3, dowear},
|
||||
{ apparel, "Take off armor", 3, dotakeoff},
|
||||
{ apparel, 0, 3},
|
||||
{ apparel, 0, 3, (int (*)(void)) 0},
|
||||
{ apparel, "Put on accessories", 3, doputon},
|
||||
{ apparel, "Remove accessories", 3, doremring},
|
||||
|
||||
@@ -663,20 +663,20 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
|
||||
{ magic, "Dip", 3, dodip},
|
||||
{ magic, "Rub", 3, dorub},
|
||||
{ magic, "Invoke", 3, doinvoke},
|
||||
{ magic, 0, 3},
|
||||
{ magic, 0, 3, (int (*)(void)) 0},
|
||||
{ magic, "Offer", 3, dosacrifice},
|
||||
{ magic, "Pray", 3, dopray},
|
||||
{ magic, 0, 3},
|
||||
{ magic, 0, 3, (int (*)(void)) 0},
|
||||
{ magic, "Teleport", 3, dotelecmd},
|
||||
{ magic, "Monster action", 3, domonability},
|
||||
{ magic, "Turn undead", 3, doturn},
|
||||
|
||||
{ help, "Help", 3, dohelp},
|
||||
{ help, 0, 3},
|
||||
{ help, 0, 3, (int (*)(void)) 0},
|
||||
{ help, "What is here", 3, dolook},
|
||||
{ help, "What is there", 3, doquickwhatis},
|
||||
{ help, "What is...", 2, dowhatis},
|
||||
{ help, 0, 1},
|
||||
{ help, 0, 1, (int (*)(void)) 0},
|
||||
|
||||
{ info, "Inventory", 3, ddoinv},
|
||||
{ info, "Attributes (extended status)", 3, doattributes },
|
||||
@@ -685,13 +685,13 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
|
||||
{ info, "Discoveries", 3, dodiscovered},
|
||||
{ info, "List/reorder spells", 3, dovspell},
|
||||
{ info, "Adjust inventory letters", 3, doorganize },
|
||||
{ info, 0, 3},
|
||||
{ info, 0, 3, (int (*)(void)) 0},
|
||||
{ info, "Name object or creature", 3, docallcmd},
|
||||
{ info, "Annotate level", 3, donamelevel },
|
||||
{ info, 0, 3},
|
||||
{ info, 0, 3, (int (*)(void)) 0},
|
||||
{ info, "Skills", 3, enhance_weapon_skill},
|
||||
|
||||
{ 0, 0, 0 }
|
||||
{ 0, 0, 0, (int (*)(void)) 0 }
|
||||
};
|
||||
|
||||
QAction *actn;
|
||||
|
||||
Reference in New Issue
Block a user