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

Allow trailing comments after num_levels and num_secrets

Browse source
This commit is contained in:
Kp 2016-07-30 21:56:31 +00:00
parent c97e9af14c
commit a230d24226
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/main/mission.h
View file

@ -37,7 +37,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "ntstring.h"
#define MAX_MISSIONS 5000 // ZICO - changed from 300 to get more levels in list
#define MAX_LEVELS_PER_MISSION 127 // KREATOR - increased from 30 (limited by Demo and Multiplayer code)
// KREATOR - increased from 30 (limited by Demo and Multiplayer code)
constexpr uint8_t MAX_LEVELS_PER_MISSION = 127;
constexpr uint8_t MAX_SECRET_LEVELS_PER_MISSION = 127; // KREATOR - increased from 6 (limited by Demo and Multiplayer code)
#define MISSION_NAME_LEN 25

29
similar/main/mission.cpp
View file

@ -861,9 +861,17 @@ static int load_mission(const mle *mission)
if ((v=get_value(buf))!=NULL) {
char *ip;
unsigned long n_levels = strtoul(v, &ip, 10);
const auto n_levels = strtoul(v, &ip, 10);
Assert(n_levels <= MAX_LEVELS_PER_MISSION);
n_levels = min(n_levels, *ip ? 0ul : MAX_LEVELS_PER_MISSION);
if (n_levels > MAX_LEVELS_PER_MISSION)
continue;
if (*ip)
{
while (isspace(static_cast<unsigned>(*ip)))
++ip;
if (*ip && *ip != ';')
continue;
}
Level_names = make_unique<d_fname[]>(n_levels);
range_for (auto &i, unchecked_partial_range(Level_names.get(), n_levels))
{
@ -884,11 +892,20 @@ static int load_mission(const mle *mission)
else if (istok(buf,"num_secrets")) {
if ((v=get_value(buf))!=NULL) {
char *ip;
unsigned long n_levels = strtoul(v, &ip, 10);
const auto n_levels = strtoul(v, &ip, 10);
Assert(n_levels <= MAX_SECRET_LEVELS_PER_MISSION);
N_secret_levels = min(n_levels, *ip ? 0ul : MAX_SECRET_LEVELS_PER_MISSION);
Secret_level_names = make_unique<d_fname[]>(N_secret_levels);
Secret_level_table = make_unique<ubyte[]>(N_secret_levels);
if (n_levels > MAX_SECRET_LEVELS_PER_MISSION)
continue;
if (*ip)
{
while (isspace(static_cast<unsigned>(*ip)))
++ip;
if (*ip && *ip != ';')
continue;
}
N_secret_levels = n_levels;
Secret_level_names = make_unique<d_fname[]>(n_levels);
Secret_level_table = make_unique<uint8_t[]>(n_levels);
for (int i=0;i<N_secret_levels;i++) {
if (!PHYSFSX_fgets(buf, mfile))
break;