Merge branch 'master' into TemporaryHackishBranch

This commit is contained in:
LunaMoo committed 2017-12-01 12:10:04 +01:00
commit c98ce8338a
6 files changed
+16 -10

No files matched your search

+2 -2
View File
@@ -221,7 +221,7 @@ void CwCheatScreen::ParseCheatDB(std::string line, std::vector<std::string> titl
continue;
}
loop:;
} while (fs.good() && line[0] != '_' && line[1] != 'S');
} while (fs.good() && line[0] == '_' && line[1] != 'S');
finished = true;
}
if (finished == true)
@@ -236,7 +236,7 @@ void CwCheatScreen::ParseCheatDB(std::string line, std::vector<std::string> titl
File::OpenCPPFile(fs, activeCheatFile, std::ios::out | std::ios::app);
auto it = title.begin();
if (title2[0] != '_' && title2[1] != 'S' && it != title.end() && (++it) != title.end()) {
if (title2[0] == '_' && title2[1] != 'S' && it != title.end() && (++it) != title.end()) {
fs << title[0] << "\n" << title[1];
}