std::string in vertmodel tag

project-imprimis · Aug 1, 2024 · c138323 · c138323
1 parent 9a5985a
commit c138323
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/engine/model/vertmodel.cpp b/src/engine/model/vertmodel.cpp
@@ -210,7 +210,7 @@ int vertmodel::vertmeshgroup::findtag(std::string_view name)
 {
     for(int i = 0; i < numtags; ++i)
     {
-        if(!std::strcmp(tags[i].name, name.data()))
+        if(tags[i].name == name.data())
         {
             return i;
         }
@@ -246,7 +246,7 @@ bool vertmodel::vertmeshgroup::addtag(std::string_view name, const matrix4x3 &ma
                 {
                     std::swap(dst[j].name, src[j].name);
                 }
-                dst[numtags].name = newstring(name.data());
+                dst[numtags].name = name.data();
             }
             for(int j = 0; j < numtags; ++j)
             {

diff --git a/src/engine/model/vertmodel.h b/src/engine/model/vertmodel.h
@@ -161,14 +161,10 @@ class vertmodel : public animmodel
 
         struct tag final
         {
-            char *name;
+            std::string name;
             matrix4x3 matrix;
 
             tag() : name(nullptr) {}
-            ~tag()
-            {
-                delete[] name;
-            }
         };
 
         struct vertmeshgroup : meshgroup