Merge pull request #56 from AllegianceZone/FixStringCompare

Fixes a crash in MdlEdit
AllegianceZone · Aug 14, 2017 · b707b8f · b707b8f
2 parents 6b230ab + 800dd9f
commit b707b8f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/engine/modeler.cpp b/src/engine/modeler.cpp
@@ -2190,7 +2190,7 @@ class ModelerImpl : public Modeler {
 		HANDLE hFind;
 		WIN32_FIND_DATAA findFileData;
 
-		m_vStyleHudName.PushEnd("Default");
+		m_vStyleHudName.PushEnd(ZString("Default"));
 
 		ZString hudpath = GetArtPath() + "/Mods/*";
 

diff --git a/src/mdledit/mdledit.cpp b/src/mdledit/mdledit.cpp
@@ -550,7 +550,7 @@ class MDLEditWindow :
 
 		//imago 10/14 - turkey's change to modeler breaks when no hud index is set (go figure)
 		GetModeler()->BuildHudList();
-		GetModeler()->SetStyleHud("SoftwareHUD");
+		GetModeler()->SetStyleHud("Software"); // "SoftwareHUD does not exist
 
 		// load the fonts
 		TrekResources::Initialize(GetModeler());

diff --git a/src/zlib/tlist.h b/src/zlib/tlist.h
@@ -143,9 +143,9 @@ class TList : public TListImpl {
         ListNode* pfind = GetFirst();
 
         while (pfind) {
-            if (m_fnEquals(((const TValue&)pfind->m_value), value)) {
-                return pfind;
-            }
+			if (m_fnEquals(((const TValue&)pfind->m_value), value)) {
+				return pfind;		 
+			}
             pfind = pfind->GetNext();
         }
 

diff --git a/src/zlib/tvector.h b/src/zlib/tvector.h
@@ -11,7 +11,7 @@
 
 template<
     class TValue,
-    class EqualsFunctionType  = DefaultNoEquals,
+    class EqualsFunctionType  = DefaultEquals,
     class CompareFunctionType = DefaultNoCompare
 >
 class TVector {
@@ -349,7 +349,7 @@ class TVector {
     int Find(const TValue& value)
     {
         for (int index = 0; index < m_count; index++) {
-            if (m_fnEquals(((const TValue&)m_pvalue[index]), value)) {
+			if (m_fnEquals(((const TValue&)m_pvalue[index]), value)) {
                 return index;
             }
         }