From 6efa117dac5da867fe3f6def1c7958863b9fd7ed Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Tue, 8 Aug 2017 16:26:01 +0500 Subject: [PATCH] xrSE_Factory: replace xr_new with new --- src/utils/xrSE_Factory/ai_space.cpp | 2 +- src/utils/xrSE_Factory/ai_space_inline.h | 2 +- src/utils/xrSE_Factory/properties_list_helper_script.cpp | 2 +- src/utils/xrSE_Factory/script_properties_list_helper.cpp | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/utils/xrSE_Factory/ai_space.cpp b/src/utils/xrSE_Factory/ai_space.cpp index f28e20fd12e..cfbf615e2ef 100644 --- a/src/utils/xrSE_Factory/ai_space.cpp +++ b/src/utils/xrSE_Factory/ai_space.cpp @@ -16,7 +16,7 @@ CAI_Space::CAI_Space() { m_script_engine = nullptr; } void CAI_Space::init() { VERIFY(!m_script_engine); - m_script_engine = xr_new(); + m_script_engine = new CScriptEngine(); m_script_engine->init(); #error additional initialization is required here: RegisterScriptClasses + object_factory().register_script() // RegisterScriptClasses(); diff --git a/src/utils/xrSE_Factory/ai_space_inline.h b/src/utils/xrSE_Factory/ai_space_inline.h index a054f1b7cec..640f8153b4d 100644 --- a/src/utils/xrSE_Factory/ai_space_inline.h +++ b/src/utils/xrSE_Factory/ai_space_inline.h @@ -18,7 +18,7 @@ IC CAI_Space& ai() { if (!g_ai_space) { - g_ai_space = xr_new(); + g_ai_space = new CAI_Space(); g_ai_space->init(); } return *g_ai_space; diff --git a/src/utils/xrSE_Factory/properties_list_helper_script.cpp b/src/utils/xrSE_Factory/properties_list_helper_script.cpp index 52f0b04dbba..53cd677c55b 100644 --- a/src/utils/xrSE_Factory/properties_list_helper_script.cpp +++ b/src/utils/xrSE_Factory/properties_list_helper_script.cpp @@ -42,7 +42,7 @@ void load_prop_helper() return; } - g_property_list_helper = xr_new(); + g_property_list_helper = new CScriptPropertiesListHelper(); } IPropHelper& PHelper() diff --git a/src/utils/xrSE_Factory/script_properties_list_helper.cpp b/src/utils/xrSE_Factory/script_properties_list_helper.cpp index 4b65c20f554..8551782ad52 100644 --- a/src/utils/xrSE_Factory/script_properties_list_helper.cpp +++ b/src/utils/xrSE_Factory/script_properties_list_helper.cpp @@ -29,7 +29,7 @@ struct CWrapHelper template static T* wrap_value(luabind::object object, LPCSTR name) { - CScriptValueWrapper* value = xr_new>(object, name); + CScriptValueWrapper* value = new CScriptValueWrapper(object, name); owner(object)->add(value); return (value->value()); } @@ -49,7 +49,7 @@ struct CWrapHelper template static BOOL* wrap_value(luabind::object object, LPCSTR name) { - CScriptValueWrapper* value = xr_new>(object, name); + CScriptValueWrapper* value = new CScriptValueWrapper(object, name); owner(object)->add(value); return (value->value()); } @@ -57,7 +57,7 @@ struct CWrapHelper template static BOOL* wrap_value(luabind::object object, luabind::object table, LPCSTR name) { - CScriptValueWrapper* value = xr_new>(table, name); + CScriptValueWrapper* value = new CScriptValueWrapper(table, name); owner(object)->add(value); return (value->value()); }