Use uint8_t for allow_abort_flag
It is only ever 0 or 1.
This commit is contained in:
parent
295619e633
commit
09531047b9
|
@ -339,16 +339,16 @@ constexpr listbox_subfunction_t<const unused_listbox_userdata_t> *unused_listbox
|
||||||
constexpr const unused_listbox_userdata_t *unused_listbox_userdata = nullptr;
|
constexpr const unused_listbox_userdata_t *unused_listbox_userdata = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
listbox *newmenu_listbox1(const char * title, uint_fast32_t nitems, const char *items[], int allow_abort_flag, int default_item, listbox_subfunction_t<void> listbox_callback, void *userdata);
|
listbox *newmenu_listbox1(const char * title, uint_fast32_t nitems, const char *items[], uint8_t allow_abort_flag, int default_item, listbox_subfunction_t<void> listbox_callback, void *userdata);
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
listbox *newmenu_listbox1(const char *const title, const uint_fast32_t nitems, const char *items[], const int allow_abort_flag, const int default_item, const listbox_subfunction_t<T> listbox_callback, T *const userdata)
|
listbox *newmenu_listbox1(const char *const title, const uint_fast32_t nitems, const char *items[], const uint8_t allow_abort_flag, const int default_item, const listbox_subfunction_t<T> listbox_callback, T *const userdata)
|
||||||
{
|
{
|
||||||
return newmenu_listbox1(title, nitems, items, allow_abort_flag, default_item, reinterpret_cast<listbox_subfunction_t<void>>(listbox_callback), static_cast<void *>(userdata));
|
return newmenu_listbox1(title, nitems, items, allow_abort_flag, default_item, reinterpret_cast<listbox_subfunction_t<void>>(listbox_callback), static_cast<void *>(userdata));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
listbox *newmenu_listbox1(const char *const title, const uint_fast32_t nitems, const char *items[], const int allow_abort_flag, const int default_item, const listbox_subfunction_t<T> listbox_callback, std::unique_ptr<T> userdata)
|
listbox *newmenu_listbox1(const char *const title, const uint_fast32_t nitems, const char *items[], const uint8_t allow_abort_flag, const int default_item, const listbox_subfunction_t<T> listbox_callback, std::unique_ptr<T> userdata)
|
||||||
{
|
{
|
||||||
auto r = newmenu_listbox1(title, nitems, items, allow_abort_flag, default_item, reinterpret_cast<listbox_subfunction_t<void>>(listbox_callback), static_cast<void *>(userdata.get()));
|
auto r = newmenu_listbox1(title, nitems, items, allow_abort_flag, default_item, reinterpret_cast<listbox_subfunction_t<void>>(listbox_callback), static_cast<void *>(userdata.get()));
|
||||||
userdata.release();
|
userdata.release();
|
||||||
|
@ -356,7 +356,7 @@ listbox *newmenu_listbox1(const char *const title, const uint_fast32_t nitems, c
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
listbox *newmenu_listbox(const char *const title, const uint_fast32_t nitems, const char *items[], const int allow_abort_flag, const listbox_subfunction_t<T> listbox_callback, T *const userdata)
|
listbox *newmenu_listbox(const char *const title, const uint_fast32_t nitems, const char *items[], const uint8_t allow_abort_flag, const listbox_subfunction_t<T> listbox_callback, T *const userdata)
|
||||||
{
|
{
|
||||||
return newmenu_listbox1(title, nitems, items, allow_abort_flag, 0, reinterpret_cast<listbox_subfunction_t<void>>(listbox_callback), static_cast<void *>(userdata));
|
return newmenu_listbox1(title, nitems, items, allow_abort_flag, 0, reinterpret_cast<listbox_subfunction_t<void>>(listbox_callback), static_cast<void *>(userdata));
|
||||||
}
|
}
|
||||||
|
|
|
@ -452,7 +452,7 @@ static void RegisterPlayer()
|
||||||
static const std::array<file_extension_t, 1> types{{"plr"}};
|
static const std::array<file_extension_t, 1> types{{"plr"}};
|
||||||
int i = 0, NumItems;
|
int i = 0, NumItems;
|
||||||
int citem = 0;
|
int citem = 0;
|
||||||
int allow_abort_flag = 1;
|
uint8_t allow_abort_flag = 1;
|
||||||
|
|
||||||
auto &callsign = InterfaceUniqueState.PilotName;
|
auto &callsign = InterfaceUniqueState.PilotName;
|
||||||
if (!callsign[0u])
|
if (!callsign[0u])
|
||||||
|
|
|
@ -1772,7 +1772,7 @@ struct listbox : embed_window_pointer_t
|
||||||
};
|
};
|
||||||
const char *title;
|
const char *title;
|
||||||
const char **item;
|
const char **item;
|
||||||
int allow_abort_flag;
|
uint8_t allow_abort_flag;
|
||||||
listbox_subfunction_t<void> listbox_callback;
|
listbox_subfunction_t<void> listbox_callback;
|
||||||
unsigned nitems;
|
unsigned nitems;
|
||||||
unsigned items_on_screen;
|
unsigned items_on_screen;
|
||||||
|
@ -2249,7 +2249,7 @@ static window_event_result listbox_handler(window *wind,const d_event &event, li
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
listbox *newmenu_listbox1(const char *const title, const uint_fast32_t nitems, const char *items[], const int allow_abort_flag, const int default_item, const listbox_subfunction_t<void> listbox_callback, void *const userdata)
|
listbox *newmenu_listbox1(const char *const title, const uint_fast32_t nitems, const char *items[], const uint8_t allow_abort_flag, const int default_item, const listbox_subfunction_t<void> listbox_callback, void *const userdata)
|
||||||
{
|
{
|
||||||
window *wind;
|
window *wind;
|
||||||
newmenu_free_background();
|
newmenu_free_background();
|
||||||
|
|
Loading…
Reference in a new issue