TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use zip for nm_messagebox_str

Browse source
This commit is contained in:
Kp 2020-09-11 03:08:02 +00:00
parent 7de81a7293
commit e31d030caf
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/include/varutil.h
View file

@ -24,6 +24,10 @@ public:
}
unsigned count() const { return m_count; }
const char *string(std::size_t i) const { return p[i]; }
typename array_t::const_iterator begin() const
{
return p.begin();
}
private:
array_t p;
unsigned m_count;

13
similar/main/newmenu.cpp
View file

@ -66,7 +66,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "rbaudio.h"
#include "args.h"
#if defined(DXX_BUILD_DESCENT_II)
#include "args.h"
#include "gamepal.h"
#endif
@ -75,6 +74,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif
#include "compiler-range_for.h"
#include "d_zip.h"
#include "partial_range.h"
#define MAXDISPLAYABLEITEMS 14
@ -1694,12 +1694,11 @@ int (vnm_messagebox_aN)(const char *title, const nm_messagebox_tie &tie, const c
int nm_messagebox_str(const char *title, const nm_messagebox_tie &tie, const char *str)
{
newmenu_item items[nm_messagebox_tie::maximum_arity];
for (unsigned i=0; i < tie.count(); ++i) {
const char *s = tie.string(i);
nm_set_item_menu(items[i], s);
}
return newmenu_do( title, str, tie.count(), items, unused_newmenu_subfunction, unused_newmenu_userdata );
std::array<newmenu_item, nm_messagebox_tie::maximum_arity> items;
auto &&item_range = partial_range(items, tie.count());
for (auto &&[i, s] : zip(item_range, tie))
nm_set_item_menu(i, s);
return newmenu_do(title, str, tie.count(), items.data(), unused_newmenu_subfunction, unused_newmenu_userdata);
}
// Example listbox callback function...