xrEngine/LightAnimLibrary: use xr_string instead of shared_str

OpenXRay · Mar 4, 2018 · 2b3140e · 2b3140e
1 parent 4fa498a
commit 2b3140e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/editors/LevelEditor/EditLightAnim.cpp b/src/editors/LevelEditor/EditLightAnim.cpp
@@ -5,7 +5,7 @@
 
 #include "EditLightAnim.h"
 #include "Scene.h"
-#include "LightAnimLibrary.h"
+#include "xrEngine/LightAnimLibrary.h"
 #include "editors/ECore/Editor/ColorPicker.h"
 #include "editors/ECore/Editor/ui_main.h"
 //---------------------------------------------------------------------------
@@ -162,7 +162,7 @@ void TfrmEditLightAnim::InitItems()
 {
     ListItemsVec items;
     for (LAItemIt it = LALib.Items.begin(); it != LALib.Items.end(); it++)
-        LHelper().CreateItem(items, *(*it)->cName, 0, 0, 0);
+        LHelper().CreateItem(items, (*it)->cName.c_str(), 0, 0, 0);
     m_Items->AssignItems(items, false, true);
 }
 
@@ -255,7 +255,7 @@ void __fastcall TfrmEditLightAnim::ebAddAnimClick(TObject* Sender)
         pref.c_str(), 2, fastdelegate::bind<TFindObjectByName>(this, &TfrmEditLightAnim::FindItemByName), false, true);
     CLAItem* I = LALib.AppendItem(name.c_str(), 0);
     InitItems();
-    m_Items->SelectItem(*I->cName, true, false, true);
+    m_Items->SelectItem(I->cName.c_str(), true, false, true);
     OnModified();
 }
 
@@ -271,7 +271,7 @@ void __fastcall TfrmEditLightAnim::ebCloneClick(TObject* Sender)
             fastdelegate::bind<TFindObjectByName>(this, &TfrmEditLightAnim::FindItemByName), false, true);
         CLAItem* I = LALib.AppendItem(name.c_str(), m_CurrentItem);
         InitItems();
-        m_Items->SelectItem(*I->cName, true, false, true);
+        m_Items->SelectItem(I->cName.c_str(), true, false, true);
         OnModified();
     }
     else

diff --git a/src/xrEngine/LightAnimLibrary.cpp b/src/xrEngine/LightAnimLibrary.cpp
@@ -269,7 +269,7 @@ LAItemIt ELightAnimLibrary::FindItemI(LPCSTR name)
 {
     if (name && name[0])
         for (LAItemIt it = Items.begin(); it != Items.end(); it++)
-            if (0 == xr_strcmp((*it)->cName, name))
+            if (0 == xr_strcmp((*it)->cName.c_str(), name))
                 return it;
     return Items.end();
 }

diff --git a/src/xrEngine/LightAnimLibrary.h b/src/xrEngine/LightAnimLibrary.h
@@ -10,7 +10,7 @@
 class ENGINE_API CLAItem
 {
 public:
-    shared_str cName;
+    xr_string cName;
     float fFPS;
     using KeyMap = xr_map<int, u32>;
     KeyMap Keys;