diff --git a/source/common/gamecontrol.cpp b/source/common/gamecontrol.cpp index 988db9082..71f69d213 100644 --- a/source/common/gamecontrol.cpp +++ b/source/common/gamecontrol.cpp @@ -391,11 +391,11 @@ int CONFIG_Init() std::error_code err; if (std::filesystem::equivalent(gpath, fpath, err)) { + groupno = g; break; } g++; } - groupno = g; } if (groupno == -1 || userConfig.setupstate == 1) groupno = ShowStartupWindow(groups); @@ -408,7 +408,7 @@ int CONFIG_Init() usedgroups.Push(group); auto crc = group.FileInfo.dependencyCRC; - for (auto& dep : groups) + if (crc != 0) for (auto& dep : groups) { if (dep.FileInfo.CRC == crc) { diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index 94920bdd1..84a43db1a 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -6086,7 +6086,7 @@ void C_Compile(const char *fileName) if (!kFile.isOpen()) { - I_Error(tempbuf,"CON file `%s' missing.", fileName); + I_Error("CON file `%s' missing.", fileName); } int const kFileLen = kFile.GetLength();