fixup for zCFont

Author: Try

zenload/zCFont.cpp

@@ -10,16 +10,8 @@
 
 using namespace ZenLoad;
 
-zCFont::zCFont(const std::string& fileName, const VDFS::FileIndex& fileIndex)
+zCFont::zCFont(const char *fileName, const VDFS::FileIndex& fileIndex)
 {
-    std::string fntFile = fileName;
-    std::transform(fntFile.begin(), fntFile.end(), fntFile.begin(), ::tolower);
-
-    if (fntFile.find(".tga") != std::string::npos)
-        fntFile = fntFile.substr(0, fntFile.size() - 4) + ".FNT";
-    else if (fntFile.find(".fnt") == std::string::npos)
-        fntFile += ".FNT";
-
     std::vector<uint8_t> data;
     fileIndex.getFileData(fileName, data);
 

zenload/zCFont.h

@@ -27,31 +27,25 @@ namespace ZenLoad
          */
         struct FontInfo
         {
-            FontInfo()
-            {
-                fontHeight = 0;
-                memset(glyphWidth, 0, sizeof(glyphWidth));
-            }
-
-            std::string fontName;                         // Name of the font-file?
-            uint32_t fontHeight;                          // Height of the glyphs
-            uint8_t glyphWidth[FONT_NUM_MAX_LETTERS];     // Widths of the single glyphs
-            ZMath::float2 fontUV1[FONT_NUM_MAX_LETTERS];  // Top-left corner
-            ZMath::float2 fontUV2[FONT_NUM_MAX_LETTERS];  // Bottom-right corner
+            std::string   fontName;                            // Name of the font-file?
+            uint32_t      fontHeight=0;                        // Height of the glyphs
+            uint8_t       glyphWidth[FONT_NUM_MAX_LETTERS]={}; // Widths of the single glyphs
+            ZMath::float2 fontUV1[FONT_NUM_MAX_LETTERS]={};    // Top-left corner
+            ZMath::float2 fontUV2[FONT_NUM_MAX_LETTERS]={};    // Bottom-right corner
         };
 
-        zCFont(const std::string& fileName, const VDFS::FileIndex& fileIndex);
+        zCFont(const char* fileName, const VDFS::FileIndex& fileIndex);
         virtual ~zCFont();
 
         /**
          * @return Whether this font was correctly loaded
          */
-        bool isValid() { return m_Info.fontHeight != 0; }
+        bool isValid() const { return m_Info.fontHeight != 0; }
 
         /**
          * @return Information loaded from the font-file
          */
-        const FontInfo& getFontInfo() { return m_Info; }
+        const FontInfo& getFontInfo() const { return m_Info; }
 
     protected:
         /**