fix conflicts

This commit is contained in:
gymnast86
2026-07-13 16:55:08 -07:00
parent dce6b4c666
commit bb1c1447d0
6 changed files with 9 additions and 35 deletions
+2 -2
View File
@@ -2760,7 +2760,7 @@ void dFile_select_c::CommandExec() {
// Copy over the seed hash as well
auto& seedHashes = dusk::getSettings().randomizer.seedHashes;
seedHashes[mCpDataToNum].setValue(seedHashes[mCpDataNum]);
dusk::config::Save();
dusk::config::save();
#endif
break;
}
@@ -2823,7 +2823,7 @@ void dFile_select_c::ErasePaneMoveOk() {
#if TARGET_PC
// Clear the seed hash for this file when it gets erased
dusk::getSettings().randomizer.seedHashes.at(mSelectNum).setValue("");
dusk::config::Save();
dusk::config::save();
#endif
makeRecInfo(mSelectNum);
headerTxtSet(0x4b, 0, 0);