Merge branch 'master' into hl1mdlOrient

2021-05-12 08:21:40 +02:00
parent 4798ff3882 f197e93035
commit 8013c5011c
101 changed files with 1760 additions and 881 deletions
@@ -254,7 +254,7 @@ void MDLImporter::InternReadFile(const std::string &pFile,
        } else {
            // print the magic word to the log file
            throw DeadlyImportError("Unknown MDL subformat ", pFile,
-                                    ". Magic word (", std::string((char *)&iMagicWord, 4), ") is not known");
+                                    ". Magic word (", ai_str_toprintable((const char *)&iMagicWord, sizeof(iMagicWord)), ") is not known");
        }

        if (is_half_life){