CHANGED: #1471 CInterfaceParser no longer depends on CLuaIHMRyzom.
This commit is contained in:
parent
7142b94449
commit
e1bbfb74fa
4 changed files with 17 additions and 6 deletions
|
@ -585,6 +585,19 @@ void CInterfaceManager::destroy ()
|
|||
_Instance = NULL;
|
||||
}
|
||||
|
||||
void CInterfaceManager::initLUA()
|
||||
{
|
||||
if( _LuaState != NULL )
|
||||
return;
|
||||
|
||||
CInterfaceParser::initLUA();
|
||||
|
||||
if( _LuaState == NULL )
|
||||
return;
|
||||
|
||||
CLuaIHMRyzom::RegisterRyzomFunctions( *_LuaState );
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
void CInterfaceManager::initLogin()
|
||||
{
|
||||
|
|
|
@ -146,6 +146,8 @@ public:
|
|||
void setInGame( bool i );
|
||||
bool isInGame() const { return _InGame; }
|
||||
|
||||
void initLUA();
|
||||
|
||||
/// initialize the whole login interface
|
||||
void initLogin();
|
||||
|
||||
|
|
|
@ -34,9 +34,6 @@
|
|||
#include "nel/gui/lua_ihm.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
|
||||
#ifdef LUA_NEVRAX_VERSION
|
||||
#include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger
|
||||
#endif
|
||||
|
@ -2856,7 +2853,6 @@ void CInterfaceParser::initLUA()
|
|||
|
||||
// register LUA methods
|
||||
CLuaIHM::registerAll(*_LuaState);
|
||||
CLuaIHMRyzom::RegisterRyzomFunctions( *_LuaState );
|
||||
}
|
||||
|
||||
// ***************************************************************************
|
||||
|
|
|
@ -344,8 +344,8 @@ protected:
|
|||
// ----------------------------------------------------------------------------------
|
||||
// LUA Interface State. NB: The LUA environnement is not shared between Login/OutGame/InGame
|
||||
NLMISC::CSmartPtr<CLuaState> _LuaState;
|
||||
void initLUA();
|
||||
void uninitLUA();
|
||||
virtual void initLUA();
|
||||
void uninitLUA();
|
||||
// List of script loaded (for reloadLua command)
|
||||
std::set<std::string> _LuaFileScripts;
|
||||
// Load A .lua. false if parse error. string 'error' contains the eventual error desc (but warning still displayed)
|
||||
|
|
Loading…
Reference in a new issue