- 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

@ -895,8 +895,7 @@ FUNC(LS_Teleport_EndGame)
{
if (!backSide && CheckIfExitIsGood (it, NULL))
{
G_SetForEndGame (level.nextmap);
G_ExitLevel (0, false);
G_ChangeLevel(NULL, 0, 0);
return true;
}
return false;