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

Reuse mle_path as Mission_path

Browse source
This commit is contained in:
Kp 2015-01-15 04:30:03 +00:00
parent b175c944ef
commit d443e28147
2 changed files with 40 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
common/main/mission.h
View file

@ -76,9 +76,45 @@ static const ubyte MAX_SECRET_LEVELS_PER_MISSION = 127; // KREATOR - increased f
//where the missions go
#define MISSION_DIR "missions/"
struct Mission {
std::string::const_iterator filename; // filename
/* Path and filename must be kept in sync. */
class Mission_path
{
public:
Mission_path() = default;
Mission_path(const Mission_path &m) :
path(m.path),
filename(std::next(path.cbegin(), std::distance(m.path.cbegin(), m.filename)))
{
}
Mission_path &operator=(const Mission_path &m)
{
path = m.path;
filename = std::next(path.begin(), std::distance(m.path.cbegin(), m.filename));
return *this;
}
/* Caller's offset is ignored; it is only here to provide a
* temporary to store the old path distance before old path is moved
* to new path.
*/
Mission_path(Mission_path &&m, std::size_t offset = 0) :
path((offset = std::distance(m.path.cbegin(), m.filename), std::move(m.path))),
filename(std::next(path.cbegin(), offset))
{
}
Mission_path &operator=(Mission_path &&rhs)
{
std::size_t offset = std::distance(rhs.path.cbegin(), rhs.filename);
path = std::move(rhs.path);
filename = std::next(path.begin(), offset);
return *this;
}
/* Must be in this order for move constructor to work properly */
std::string path; // relative file path
std::string::const_iterator filename; // filename without extension
};
struct Mission : Mission_path
{
std::unique_ptr<ubyte[]> secret_level_table; // originating level no for each secret level
// arrays of names of the level files
std::unique_ptr<d_fname[]> level_names;

33
similar/main/mission.cpp
View file

@ -64,36 +64,8 @@ enum mle_loc
ML_MISSIONDIR = 1
};
/* Path and filename must be kept in sync. Disallow copying. Allow
* moving, but only through a helper object that stores the distance so
* that the old string is not used after it is moved-from, and the new
* string is not used until it is moved-to.
*/
class mle_path
{
protected:
mle_path() = default;
mle_path(mle_path &&m, std::size_t offset = 0) :
path((offset = std::distance(m.path.cbegin(), m.filename), std::move(m.path))),
filename(std::next(path.cbegin(), offset))
{
}
mle_path &operator=(mle_path &&rhs)
{
std::size_t offset = std::distance(rhs.path.cbegin(), rhs.filename);
path = std::move(rhs.path);
filename = std::next(path.begin(), offset);
return *this;
}
public:
std::string path; // relative file path
std::string::const_iterator filename; // filename without extension
mle_path(const mle_path &) = delete;
mle_path &operator=(const mle_path &) = delete;
};
//mission list entry
struct mle : mle_path
struct mle : Mission_path
{
int builtin_hogsize; // if it's the built-in mission, used for determining the version
ntstring<MISSION_NAME_LEN> mission_name;
@ -747,8 +719,7 @@ static int load_mission(const mle *mission)
Current_mission->descent_version = mission->descent_version;
#endif
Current_mission->anarchy_only_flag = mission->anarchy_only_flag;
Current_mission->path = mission->path;
Current_mission->filename = next(begin(Current_mission->path), distance(begin(mission->path), mission->filename));
*static_cast<Mission_path *>(Current_mission.get()) = *mission;
Current_mission->n_secret_levels = 0;
#if defined(DXX_BUILD_DESCENT_II)
Current_mission->enhanced = 0;