- 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

@ -73,6 +73,7 @@
#include "m_argv.h"
#include "po_man.h"
#include "menu/menu.h"
#include "intermission/intermission.h"
// MACROS ------------------------------------------------------------------
@ -300,6 +301,7 @@ static void MarkRoot()
Mark(screen);
Mark(StatusBar);
Mark(DMenu::CurrentMenu);
Mark(DIntermissionController::CurrentIntermission);
DThinker::MarkRoots();
FCanvasTextureInfo::Mark();
Mark(DACSThinker::ActiveThinker);