- merged finale branch back into trunk.

SVN r2911 (trunk)
This commit is contained in:
Christoph Oelckers 2010-10-06 10:44:03 +00:00
commit d9970ab9b6
30 changed files with 6132 additions and 5157 deletions

View file

@ -453,7 +453,6 @@ void STAT_ChangeLevel(const char *newl)
level_info_t *l = FindLevelInfo (newl);
nextinfo = l->CheckLevelRedirect ();
if (nextinfo == NULL) nextinfo = l;
}
if (savestatistics == 1)
@ -602,8 +601,7 @@ CCMD(printstats)
CCMD(finishgame)
{
// This CCMD simulates an end-of-game action and exists to end mods that never exit their last level.
G_SetForEndGame (level.nextmap);
G_ExitLevel (0, false);
G_ChangeLevel(NULL, 0, 0);
}
ADD_STAT(statistics)