Fix level loading

This commit is contained in:
nukeykt 2019-08-31 19:58:30 +09:00 committed by Christoph Oelckers
parent 708483ca78
commit c458223f9d
2 changed files with 8 additions and 2 deletions

View file

@ -1815,7 +1815,7 @@ int app_main(int argc, char const* const* argv)
Bsprintf(tempbuf, "Exhumed %s", s_buildRev);
OSD_SetVersion(tempbuf, 10,0);
OSD_SetParameters(0, 0, 0, 12, 2, 12, OSD_ERROR, OSDTEXT_RED, gamefunctions[gamefunc_Show_Console][0] == '\0' ? OSD_PROTECTED : 0);
OSD_SetParameters(0, 0, 0, 0, 0, 0, OSD_ERROR, OSDTEXT_RED, gamefunctions[gamefunc_Show_Console][0] == '\0' ? OSD_PROTECTED : 0);
registerosdcommands();
if (nNetPlayerCount == -1)

View file

@ -360,11 +360,17 @@ uint8_t LoadLevel(int nMap)
// loadboard has finished
#endif
vec3_t startPos;
engineLoadBoard(fileName_1, 0, &startPos, &inita, &initsect);
int status = engineLoadBoard(fileName_1, 0, &startPos, &inita, &initsect);
if (status == -2)
status = engineLoadBoardV5V6(fileName_1, 0, &startPos, &inita, &initsect);
initx = startPos.x;
inity = startPos.y;
initz = startPos.z;
#ifdef YAX_ENABLE
yax_update(1);
#endif
int i;
for (i = 0; i < kMaxPlayers; i++)