Merge branch 'development' into issue_2115

This commit is contained in:
Bloodknight 2018-02-05 15:59:33 +00:00 committed by GitHub
commit c8e9b85ed3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
520 changed files with 30537 additions and 151323 deletions

View file

@ -45,6 +45,7 @@
#include "console/debugOutputConsumer.h"
#include "console/consoleTypes.h"
#include "console/engineAPI.h"
#include "console/codeInterpreter.h"
#include "gfx/bitmap/gBitmap.h"
#include "gfx/gFont.h"
@ -227,6 +228,9 @@ void StandardMainLoop::init()
ManagedSingleton< ThreadManager >::createSingleton();
FrameAllocator::init(TORQUE_FRAME_SIZE); // See comments in torqueConfig.h
// Initialize the TorqueScript interpreter.
CodeInterpreter::init();
// Yell if we can't initialize the network.
if(!Net::init())
{