mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-05 14:59:01 +00:00
CHANGED: #1471 Moved the previously refactored code to the NELGUI library.
This commit is contained in:
parent
4db9e47d13
commit
731d1ced46
64 changed files with 91 additions and 84 deletions
|
@ -26,6 +26,7 @@ namespace NLMISC
|
|||
{
|
||||
class CPolygon2D;
|
||||
class CVector2f;
|
||||
class CRGBA;
|
||||
}
|
||||
|
||||
class CReflectable;
|
|
@ -21,7 +21,7 @@
|
|||
#define CL_REFLECT_H
|
||||
|
||||
#include "nel/misc/rgba.h"
|
||||
#include "lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
//
|
||||
#include <string>
|
||||
|
|
@ -26,6 +26,10 @@ using namespace NLGUI;
|
|||
#undef assert
|
||||
#endif
|
||||
|
||||
#ifdef NL_OS_WINDOWS
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
|
||||
// Warning: cannot use namespace std, when using luabind
|
||||
#ifdef NL_OS_WINDOWS
|
||||
# ifndef NL_EXTENDED_FOR_SCOPE
|
||||
|
@ -59,15 +63,17 @@ using namespace NLGUI;
|
|||
#endif
|
||||
|
||||
|
||||
#include "lua_ihm.h"
|
||||
#include "reflect.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "nel/gui/reflect.h"
|
||||
#include "nel/misc/algo.h"
|
||||
#include "nel/misc/file.h"
|
||||
#include "nel/misc/i18n.h"
|
||||
#include "nel/misc/time_nl.h"
|
||||
#include "lua_object.h"
|
||||
#include "nel/misc/path.h"
|
||||
#include "nel/misc/sstring.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "nel/misc/polygon.h"
|
||||
#include "lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
|
||||
// ***************************************************************************
|
|
@ -15,7 +15,7 @@
|
|||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
#include "lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
#include "nel/gui/lua_helper.h"
|
||||
|
||||
bool CLuaManager::debugLua = false;
|
|
@ -15,8 +15,8 @@
|
|||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//#include "stdpch.h"
|
||||
#include "lua_object.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
//#include "lua_ihm_ryzom.h"
|
||||
#include "nel/gui/lua_helper.h"
|
||||
using namespace NLGUI;
|
|
@ -15,7 +15,7 @@
|
|||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
#include "reflect.h"
|
||||
#include "nel/gui/reflect.h"
|
||||
|
||||
// Yoyo: Act like a singleton, else registerClass may crash.
|
||||
CReflectSystem::TClassMap *CReflectSystem::_ClassMap= NULL;
|
||||
|
@ -129,7 +129,7 @@ const CReflectedProperty *CReflectable::getReflectedProperty(const std::string &
|
|||
}
|
||||
|
||||
|
||||
#include "lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
CReflectableRefPtrTarget::~CReflectableRefPtrTarget()
|
||||
{
|
|
@ -92,14 +92,14 @@
|
|||
#include "weather.h"
|
||||
#include "forage_source_cl.h"
|
||||
#include "connection.h"
|
||||
#include "interface_v3/lua_object.h"
|
||||
#include "interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "interface_v3/lua_ihm_ryzom.h"
|
||||
#include "init.h"
|
||||
#include "interface_v3/people_interraction.h"
|
||||
#include "far_tp.h"
|
||||
#include "zone_util.h"
|
||||
#include "interface_v3/lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
|
||||
//
|
||||
|
|
|
@ -45,7 +45,7 @@ using namespace NLGUI;
|
|||
#include "character_cl.h"
|
||||
#include "r2/editor.h"
|
||||
#include "r2/dmc/client_edition_module.h"
|
||||
#include "interface_v3/lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
///////////
|
||||
// USING //
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
//
|
||||
#include "decal_anim.h"
|
||||
#include "decal.h"
|
||||
#include "interface_v3/lua_ihm.h"
|
||||
#include "interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
//
|
||||
#include "nel/misc/vector_2f.h"
|
||||
#include "nel/misc/algo.h"
|
||||
|
|
|
@ -104,7 +104,7 @@
|
|||
|
||||
#include "landscape_poly_drawer.h"
|
||||
#include "session_browser_impl.h"
|
||||
#include "interface_v3/lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
|
||||
// ProgressBar steps in init main loop
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "nel/misc/xml_auto_ptr.h"
|
||||
#include "../time_client.h"
|
||||
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
|
||||
using namespace std;
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include "nel/misc/xml_auto_ptr.h"
|
||||
#include "group_menu.h"
|
||||
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
using namespace NLMISC;
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "view_text.h"
|
||||
#include "view_text_id.h"
|
||||
#include "group_container.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
|
||||
|
|
|
@ -44,13 +44,13 @@
|
|||
#include "sphrase_manager.h"
|
||||
#include "../client_sheets/sphrase_sheet.h"
|
||||
#include "nel/misc/xml_auto_ptr.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
#include "game_share/bot_chat_types.h"
|
||||
|
||||
#include "../r2/editor.h"
|
||||
|
||||
#include "lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
extern CSheetManager SheetMngr;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "nel/misc/types_nl.h"
|
||||
#include "nel/misc/smart_ptr.h"
|
||||
// client
|
||||
#include "reflect.h"
|
||||
#include "nel/gui/reflect.h"
|
||||
#include "ctrl_base.h"
|
||||
#include "interface_expr.h"
|
||||
#include "action_handler.h"
|
||||
|
|
|
@ -23,9 +23,9 @@
|
|||
#include "interface_manager.h"
|
||||
#include "ctrl_button.h"
|
||||
#include "action_handler.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace NLMISC;
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include "group_editbox.h"
|
||||
#include "view_text_formated.h"
|
||||
#include "view_text_id.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
#include "group_list.h"
|
||||
#include "ctrl_button.h"
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include "dbctrl_sheet.h"
|
||||
#include "group_container.h"
|
||||
#include "../time_client.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace NLMISC;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "interface_manager.h"
|
||||
#include "group_container.h"
|
||||
#include "group_header.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
|
||||
using namespace NLMISC;
|
||||
|
|
|
@ -43,7 +43,7 @@ extern "C"
|
|||
#include "view_bitmap.h"
|
||||
#include "../actions.h"
|
||||
#include "dbgroup_combo_box.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
#include "../time_client.h"
|
||||
#include "nel/misc/i18n.h"
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "view_bitmap.h"
|
||||
#include "view_text_id.h"
|
||||
#include "group_container.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
#include "nel/misc/xml_auto_ptr.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "nel/misc/xml_auto_ptr.h"
|
||||
#include "view_bitmap.h"
|
||||
#include "action_handler.h" // Just for getAllParams
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
#include "nel/misc/i18n.h"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "../time_client.h"
|
||||
#include "interface_manager.h"
|
||||
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "view_text.h"
|
||||
#include "group_container.h"
|
||||
#include "action_handler.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
#include "nel/misc/i_xml.h"
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "nel/misc/xml_auto_ptr.h"
|
||||
#include "action_handler.h"
|
||||
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
using namespace std;
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "../misc.h"
|
||||
#include "interface_link.h"
|
||||
#include "nel/misc/xml_auto_ptr.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
#include "nel/misc/mem_stream.h"
|
||||
//
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "nel/misc/string_mapper.h"
|
||||
#include "nel/misc/smart_ptr.h"
|
||||
#include "interface_property.h"
|
||||
#include "reflect.h"
|
||||
#include "nel/gui/reflect.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
class CInterfaceGroup;
|
||||
|
|
|
@ -24,12 +24,12 @@
|
|||
#include "group_container.h"
|
||||
#include "group_editbox.h"
|
||||
#include "group_scrolltext.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
|
||||
#include "nel/misc/stream.h"
|
||||
#include "lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace NL3D;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "interface_element.h"
|
||||
#include "interface_manager.h"
|
||||
#include "interface_expr_node.h"
|
||||
#include "reflect.h"
|
||||
#include "nel/gui/reflect.h"
|
||||
#include "nel/misc/cdb_branch.h"
|
||||
|
||||
using namespace std;
|
||||
|
|
|
@ -112,7 +112,7 @@ namespace NLGUI
|
|||
extern void luaDebuggerMainLoop();
|
||||
}
|
||||
using namespace NLGUI;
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
#include "add_on_manager.h"
|
||||
|
|
|
@ -107,10 +107,10 @@
|
|||
#include "../commands.h"
|
||||
#include "nel/gui/lua_helper.h"
|
||||
using namespace NLGUI;
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
#include "../r2/editor.h"
|
||||
#include "lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
#ifdef LUA_NEVRAX_VERSION
|
||||
#include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger
|
||||
|
|
|
@ -41,10 +41,10 @@
|
|||
#include "lua_ihm_ryzom.h"
|
||||
#include "interface_manager.h"
|
||||
#include "nel/gui/lua_helper.h"
|
||||
#include "lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
|
||||
#include "lua_ihm.h"
|
||||
#include "reflect.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "nel/gui/reflect.h"
|
||||
#include "action_handler.h"
|
||||
#include "action_handler_tools.h"
|
||||
#include "interface_manager.h"
|
||||
|
@ -67,7 +67,7 @@
|
|||
#include "guild_manager.h"
|
||||
#include "../client_cfg.h"
|
||||
#include "../sheet_manager.h"
|
||||
#include "lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "game_share/emote_list_parser.h"
|
||||
#include "game_share/pvp_clan.h"
|
||||
#include "../weather.h"
|
||||
|
@ -84,7 +84,7 @@
|
|||
#include "../net_manager.h" // for emotes
|
||||
#include "../client_chat_manager.h" // for emotes
|
||||
#include "../login.h"
|
||||
#include "lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "../actions.h"
|
||||
#include "../bg_downloader_access.h"
|
||||
#include "../connection.h"
|
||||
|
@ -100,7 +100,7 @@
|
|||
#include "game_share/bg_downloader_msg.h"
|
||||
#include "game_share/constants.h"
|
||||
#include "game_share/visual_slot_manager.h"
|
||||
#include "lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
#ifdef LUA_NEVRAX_VERSION
|
||||
#include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef LUA_IHM_RYZOM_H
|
||||
#define LUA_IHM_RYZOM_H
|
||||
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
class CLuaIHMRyzom
|
||||
{
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "dbgroup_list_sheet.h"
|
||||
#include "group_editbox.h"
|
||||
#include "group_tree.h"
|
||||
#include "reflect.h"
|
||||
#include "nel/gui/reflect.h"
|
||||
#include "dbview_bar.h"
|
||||
#include "dbview_bar3.h"
|
||||
#include "group_list.h"
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "macrocmd_manager.h"
|
||||
#include "game_share/rolemaster_flags.h"
|
||||
#include "game_share/people.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../time_client.h"
|
||||
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include "ctrl_tooltip.h"
|
||||
|
||||
#include "nel/misc/xml_auto_ptr.h"
|
||||
#include "lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
using namespace std;
|
||||
|
|
|
@ -111,7 +111,7 @@
|
|||
#include "camera_recorder.h"
|
||||
#include "connection.h"
|
||||
#include "landscape_poly_drawer.h"
|
||||
#include "interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "interface_v3/lua_ihm_ryzom.h"
|
||||
#include "far_tp.h"
|
||||
#include "session_browser_impl.h"
|
||||
|
@ -145,7 +145,7 @@
|
|||
#include "interface_v3/bot_chat_manager.h"
|
||||
#include "string_manager_client.h"
|
||||
|
||||
#include "interface_v3/lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
|
||||
///////////
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef R2_CONFIG_VAR_H
|
||||
#define R2_CONFIG_VAR_H
|
||||
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "editor.h"
|
||||
|
||||
namespace R2
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
//
|
||||
#include "game_share/object.h"
|
||||
//
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../interface_v3/interface_element.h"
|
||||
|
||||
namespace R2
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "stdpch.h"
|
||||
#include "displayer_lua.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../interface_v3/lua_ihm_ryzom.h"
|
||||
#include "editor.h"
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#define R2_DISPLAYER_LUA_H
|
||||
|
||||
#include "displayer_base.h"
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "lua_event_forwarder.h"
|
||||
|
||||
namespace R2
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "nel/misc/vector_2f.h"
|
||||
//
|
||||
#include "../time_client.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../global.h"
|
||||
//
|
||||
#include "../interface_v3/interface_manager.h"
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
#include "../interface_v3/interface_3d_scene.h"
|
||||
#include "../interface_v3/character_3d.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../pacs_client.h"
|
||||
#include "../time_client.h"
|
||||
//
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include "displayer_visual.h"
|
||||
#include "instance.h"
|
||||
#include "../decal.h"
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "instance_map_deco.h"
|
||||
|
||||
class CEntityCL;
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "property_accessor.h"
|
||||
#include "../object_factory_client.h"
|
||||
#include "../editor.h"
|
||||
#include "../../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
namespace R2
|
||||
{
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include "../object_factory_client.h"
|
||||
#include "../editor.h"
|
||||
#include "../../net_manager.h"
|
||||
#include "../../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../../interface_v3/lua_ihm_ryzom.h"
|
||||
|
||||
#include "game_share/object.h"
|
||||
|
@ -51,7 +51,7 @@
|
|||
|
||||
#include "nel/gui/lua_helper.h"
|
||||
using namespace NLGUI;
|
||||
#include "../../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
#include "../../entities.h"
|
||||
|
||||
|
|
|
@ -58,16 +58,16 @@ using namespace NLGUI;
|
|||
#include "nel/gui/event_descriptor.h"
|
||||
#include "../interface_v3/group_tree.h"
|
||||
#include "../client_cfg.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../interface_v3/lua_ihm_ryzom.h"
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "../global.h"
|
||||
#include "../connection.h"
|
||||
#include "../main_loop.h"
|
||||
#include "../interface_v3/people_interraction.h"
|
||||
#include "../time_client.h"
|
||||
#include "../pacs_client.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../actions.h"
|
||||
#include "../actions_client.h"
|
||||
#include "object_factory_client.h"
|
||||
|
@ -113,7 +113,7 @@ using namespace NLGUI;
|
|||
|
||||
#include "../session_browser_impl.h"
|
||||
#include "../far_tp.h"
|
||||
#include "../interface_v3/lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
|
||||
using namespace NLMISC;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef R2_EDITOR_H
|
||||
#define R2_EDITOR_H
|
||||
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "instance.h"
|
||||
#include "tool.h"
|
||||
#include "../decal.h"
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "stdpch.h"
|
||||
//
|
||||
#include "entity_custom_select_box.h"
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
//
|
||||
#include "nel/misc/vector.h"
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#define R2_ENTITY_CUSTOM_SELECT_BOX_H
|
||||
|
||||
#include "nel/misc/aabbox.h"
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include <map>
|
||||
|
||||
class CLuaObject;
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
//
|
||||
#include "../entities.h"
|
||||
#include "../interface_v3/interface_manager.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../interface_v3/lua_ihm_ryzom.h"
|
||||
//
|
||||
#include "displayer_visual_entity.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "nel/misc/smart_ptr.h"
|
||||
//
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
//
|
||||
#include "game_share/object.h"
|
||||
#include "displayer_base.h"
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "stdpch.h"
|
||||
#include "lua_event_forwarder.h"
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
|
||||
|
||||
namespace R2
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "object_factory_client.h"
|
||||
#include "editor.h"
|
||||
#include "instance.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "../interface_v3/lua_ihm_ryzom.h"
|
||||
|
||||
namespace R2
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "game_share/object.h"
|
||||
#include "editor.h"
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
|
||||
namespace R2
|
||||
{
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#if 0
|
||||
//#include "interface_user_data.h"
|
||||
#include "group_tree.h"
|
||||
#include "lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
//
|
||||
#include "nel/misc/smart_ptr.h"
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "../time_client.h"
|
||||
#include "displayer_visual.h"
|
||||
#include "../interface_v3/group_map.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
//
|
||||
#include "nel/pacs/u_global_position.h"
|
||||
#include "nel/pacs/u_global_retriever.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "tool_choose_pos.h"
|
||||
#include "nel/misc/vector.h"
|
||||
#include "../interface_v3/lua_object.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
|
||||
class CEntity;
|
||||
class CLuaObject;
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include "../entity_cl.h"
|
||||
#include "../player_r2_cl.h"
|
||||
#include "../sheet_manager.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "nel/misc/cdb_leaf.h"
|
||||
#include "../interface_v3/interface_manager.h"
|
||||
#include "dmc/palette.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "tool_pick.h"
|
||||
#include "instance.h"
|
||||
//
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
|
||||
|
||||
using namespace NLMISC;
|
||||
|
|
|
@ -90,7 +90,7 @@
|
|||
#include "faction_war_manager.h"
|
||||
#include "interface_v3/interface_ddx.h"
|
||||
#include "bg_downloader_access.h"
|
||||
#include "interface_v3/lua_manager.h"
|
||||
#include "nel/gui/lua_manager.h"
|
||||
|
||||
|
||||
///////////
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
#include "stdpch.h"
|
||||
#include "session_browser_impl.h"
|
||||
#include "interface_v3/lua_object.h"
|
||||
#include "interface_v3/lua_ihm.h"
|
||||
#include "nel/gui/lua_object.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "connection.h"
|
||||
#include "net_manager.h"
|
||||
#include "interface_v3/interface_manager.h"
|
||||
|
|
Loading…
Reference in a new issue