mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-14 20:00:49 +00:00
- Duke: Added a file check for the map to be entered when ending a level.
World Tour contains a map definition for E5L9 but no map for it.
This commit is contained in:
parent
59eb923c11
commit
9ce8202eb1
2 changed files with 10 additions and 0 deletions
|
@ -399,11 +399,13 @@ static int get_floorspr_clipyou(vec2_t const v1, vec2_t const v2, vec2_t const v
|
||||||
|
|
||||||
static void clipupdatesector(vec2_t const pos, int16_t * const sectnum, int walldist)
|
static void clipupdatesector(vec2_t const pos, int16_t * const sectnum, int walldist)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
if (enginecompatibility_mode != ENGINECOMPATIBILITY_NONE)
|
if (enginecompatibility_mode != ENGINECOMPATIBILITY_NONE)
|
||||||
{
|
{
|
||||||
updatesector(pos.x, pos.y, sectnum);
|
updatesector(pos.x, pos.y, sectnum);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (inside_p(pos.x, pos.y, *sectnum))
|
if (inside_p(pos.x, pos.y, *sectnum))
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1046,8 +1046,16 @@ bool setnextmap(bool checksecretexit)
|
||||||
map = FindNextMap(currentLevel);
|
map = FindNextMap(currentLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Make sure these two are cleared in case the map check errors out.
|
||||||
|
ud.from_bonus = 0;
|
||||||
|
ud.secretlevel = 0;
|
||||||
if (map)
|
if (map)
|
||||||
{
|
{
|
||||||
|
// If the map doesn't exist, abort with a meaningful message instead of crashing.
|
||||||
|
if (fileSystem.FindFile(map->fileName) < 0)
|
||||||
|
{
|
||||||
|
I_Error("Trying to open non-existent %s", map->fileName.GetChars());
|
||||||
|
}
|
||||||
ud.from_bonus = from_bonus;
|
ud.from_bonus = from_bonus;
|
||||||
}
|
}
|
||||||
CompleteLevel(map);
|
CompleteLevel(map);
|
||||||
|
|
Loading…
Reference in a new issue