Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

We might as well load the input config when we initialize the input handler.

Browse source 
--HG--
branch : gui-refactoring
This commit is contained in:
dfighter1985 2012-02-12 02:18:00 +01:00
parent 364c8c493e
commit 546799874e
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/init.cpp
View file

@ -1071,6 +1071,10 @@ void prelogInit()
CInputHandlerManager *InputHandlerManager = CInputHandlerManager::getInstance(); CInputHandlerManager *InputHandlerManager = CInputHandlerManager::getInstance();
InputHandlerManager->addToServer (&Driver->EventServer); InputHandlerManager->addToServer (&Driver->EventServer);
std::string filename = CPath::lookup( ClientCfg.XMLInputFile, false );
if( !filename.empty() )
InputHandlerManager->readInputConfigFile( filename );
// Create a text context. We need to put the full path because we not already add search path // Create a text context. We need to put the full path because we not already add search path
// resetTextContext ("bremenb.ttf", false); // resetTextContext ("bremenb.ttf", false);
resetTextContext ("ryzom.ttf", false); resetTextContext ("ryzom.ttf", false);

7
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -297,13 +297,6 @@ _ViewRenderer( driver, textcontext )
// Global initialization // Global initialization
// ********************* // *********************
//init the input handler through the parsing of a config file
CInputHandlerManager *InputHandlerManager = CInputHandlerManager::getInstance();
string filename = CPath::lookup(ClientCfg.XMLInputFile, false);
if (!filename.empty())
InputHandlerManager->readInputConfigFile(filename);
// Interface Manager init // Interface Manager init
_ViewRenderer.checkNewScreenSize(); _ViewRenderer.checkNewScreenSize();
_ViewRenderer.init(); _ViewRenderer.init();