diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1191,12 +1191,12 @@ enum QueryWidgets { }; -typedef struct query_d { +struct query_d { void (*proc)(Window*, bool); ///< callback function executed on closing of popup. Window* points to parent, bool is true if 'yes' clicked, false otherwise StringID message; ///< message shown for query window uint32 params[20]; ///< local copy of _decode_parameters bool calledback; ///< has callback been executed already (internal usage for WE_DESTROY event) -} query_d; +}; assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(query_d)); @@ -1766,7 +1766,7 @@ template <> struct EnumPropsT ce_flags; -typedef struct CheatEntry { +struct CheatEntry { VarType type; ///< type of selector ce_flags flags; ///< selector flags StringID str; ///< string with descriptive text @@ -1774,7 +1774,7 @@ typedef struct CheatEntry { bool *been_used; ///< has this cheat been used before? CheckButtonClick *proc;///< procedure int16 min, max; ///< range for spinbox setting -} CheatEntry; +}; static const CheatEntry _cheats_ui[] = { {SLE_BOOL, {CE_CLICK}, STR_CHEAT_MONEY, &_cheats.money.value, &_cheats.money.been_used, &ClickMoneyCheat, 0, 0},