Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
-3
View File
@@ -25,7 +25,6 @@
#include <ITimer.h>
#include <IRenderer.h>
#include <INetwork.h> // EvenBalance - M.Quinn
#include <ISystem.h>
#include <ILog.h>
#include <IProcess.h>
@@ -332,7 +331,6 @@ CXConsole::CXConsole()
m_pSysDeactivateConsole = 0;
m_pFont = NULL;
m_pRenderer = NULL;
m_pNetwork = NULL; // EvenBalance - M. Quinn
m_pImage = NULL;
m_nCursorPos = 0;
m_nScrollPos = 0;
@@ -490,7 +488,6 @@ void CXConsole::Init(ISystem* pSystem)
m_pFont = pSystem->GetICryFont()->GetFont("default");
}
m_pRenderer = pSystem->GetIRenderer();
m_pNetwork = gEnv->pNetwork; // EvenBalance - M. Quinn
m_pTimer = pSystem->GetITimer();
AzFramework::InputChannelEventListener::Connect();