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

Use range_for for PHYSFS archive types

Browse source
This commit is contained in:
Kp 2015-07-18 21:01:55 +00:00
parent 095e64fd5a
commit 4c200342dd
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
common/include/null_sentinel_iterator.h
View file

@ -47,3 +47,28 @@ public:
}
};
template <typename I>
class null_sentinel_array
{
typedef null_sentinel_iterator<I> iterator;
I *b;
public:
null_sentinel_array(I *i) :
b(i)
{
}
iterator begin() const
{
return b;
}
iterator end() const
{
return {};
}
};
template <typename I>
static inline null_sentinel_array<I> make_null_sentinel_array(I *i)
{
return i;
}

10
similar/misc/physfsx.cpp
View file

@ -299,20 +299,20 @@ void PHYSFSX_listSearchPathContent()
// checks which archives are supported by PhysFS. Return 0 if some essential (HOG) is not supported
int PHYSFSX_checkSupportedArchiveTypes()
{
const PHYSFS_ArchiveInfo **i;
int hog_sup = 0;
#ifdef DXX_BUILD_DESCENT_II
int mvl_sup = 0;
#endif
con_printf(CON_DEBUG, "PHYSFS: Checking supported archive types.");
for (i = PHYSFS_supportedArchiveTypes(); *i != NULL; i++)
range_for (const auto i, make_null_sentinel_array(PHYSFS_supportedArchiveTypes()))
{
con_printf(CON_DEBUG, "PHYSFS: Supported archive: [%s], which is [%s].", (*i)->extension, (*i)->description);
if (!d_stricmp((*i)->extension, "HOG"))
const auto iextension = i->extension;
con_printf(CON_DEBUG, "PHYSFS: Supported archive: [%s], which is [%s].", iextension, i->description);
if (!d_stricmp(iextension, "HOG"))
hog_sup = 1;
#ifdef DXX_BUILD_DESCENT_II
if (!d_stricmp((*i)->extension, "MVL"))
else if (!d_stricmp(iextension, "MVL"))
mvl_sup = 1;
#endif
}