mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-23 10:50:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix usage of WriteStringToFile

Browse source 
file name comes first now
This commit is contained in:
Nikhil Narayana 2023-08-14 09:14:57 -07:00
commit 133520b2ac
No known key found for this signature in database
GPG key ID: 1B34839FA8D6245E
2 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
View file

@ -187,9 +187,8 @@ CEXISlippi::CEXISlippi(Core::System& system, const std::string current_file_name
std::vector<u8> orig(origStr.begin(), origStr.end()); std::vector<u8> orig(origStr.begin(), origStr.end());
std::vector<u8> modified(modifiedStr.begin(), modifiedStr.end()); std::vector<u8> modified(modifiedStr.begin(), modifiedStr.end());
auto diff = processDiff(orig, modified); auto diff = processDiff(orig, modified);
File::WriteStringToFile( File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll.usd.diff", diff);
diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll.usd.diff"); File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnMaAll.usd.diff", diff);
File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnMaAll.usd.diff");
// MnExtAll.usd // MnExtAll.usd
File::ReadFileToString("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.usd", File::ReadFileToString("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.usd",
@ -199,9 +198,8 @@ CEXISlippi::CEXISlippi(Core::System& system, const std::string current_file_name
orig = std::vector<u8>(origStr.begin(), origStr.end()); orig = std::vector<u8>(origStr.begin(), origStr.end());
modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end()); modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end());
diff = processDiff(orig, modified); diff = processDiff(orig, modified);
File::WriteStringToFile( File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.usd.diff", diff);
diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.usd.diff"); File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnExtAll.usd.diff", diff);
File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnExtAll.usd.diff");
// SdMenu.usd // SdMenu.usd
File::ReadFileToString("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.usd", File::ReadFileToString("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.usd",
@ -211,9 +209,8 @@ CEXISlippi::CEXISlippi(Core::System& system, const std::string current_file_name
orig = std::vector<u8>(origStr.begin(), origStr.end()); orig = std::vector<u8>(origStr.begin(), origStr.end());
modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end()); modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end());
diff = processDiff(orig, modified); diff = processDiff(orig, modified);
File::WriteStringToFile( File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.usd.diff", diff);
diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.usd.diff"); File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\SdMenu.usd.diff", diff);
File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\SdMenu.usd.diff");
// Japanese Files // Japanese Files
// MnMaAll.dat // MnMaAll.dat
@ -224,9 +221,8 @@ CEXISlippi::CEXISlippi(Core::System& system, const std::string current_file_name
orig = std::vector<u8>(origStr.begin(), origStr.end()); orig = std::vector<u8>(origStr.begin(), origStr.end());
modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end()); modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end());
diff = processDiff(orig, modified); diff = processDiff(orig, modified);
File::WriteStringToFile( File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll.dat.diff", diff);
diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll.dat.diff"); File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnMaAll.dat.diff", diff);
File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnMaAll.dat.diff");
// MnExtAll.dat // MnExtAll.dat
File::ReadFileToString("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.dat", File::ReadFileToString("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.dat",
@ -236,9 +232,8 @@ CEXISlippi::CEXISlippi(Core::System& system, const std::string current_file_name
orig = std::vector<u8>(origStr.begin(), origStr.end()); orig = std::vector<u8>(origStr.begin(), origStr.end());
modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end()); modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end());
diff = processDiff(orig, modified); diff = processDiff(orig, modified);
File::WriteStringToFile( File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.dat.diff", diff);
diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.dat.diff"); File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnExtAll.dat.diff", diff);
File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnExtAll.dat.diff");
// SdMenu.dat // SdMenu.dat
File::ReadFileToString("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.dat", File::ReadFileToString("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.dat",
@ -248,15 +243,13 @@ CEXISlippi::CEXISlippi(Core::System& system, const std::string current_file_name
orig = std::vector<u8>(origStr.begin(), origStr.end()); orig = std::vector<u8>(origStr.begin(), origStr.end());
modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end()); modified = std::vector<u8>(modifiedStr.begin(), modifiedStr.end());
diff = processDiff(orig, modified); diff = processDiff(orig, modified);
File::WriteStringToFile( File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.dat.diff", diff);
diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.dat.diff"); File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\SdMenu.dat.diff", diff);
File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\SdMenu.dat.diff");
// TEMP - Restore orig // TEMP - Restore orig
// std::string stateString; // std::string stateString;
// decoder.Decode((char *)orig.data(), orig.size(), diff, &stateString); // decoder.Decode((char *)orig.data(), orig.size(), diff, &stateString);
// File::WriteStringToFile(stateString, // File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll-restored.usd", stateString);
// "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll-restored.usd");
#endif #endif
} }

4
Source/Core/Core/Slippi/SlippiReplayComm.cpp
View file

@ -124,8 +124,8 @@ std::unique_ptr<Slippi::SlippiGame> SlippiReplayComm::loadGame()
if (commFileSettings.outputOverlayFiles) if (commFileSettings.outputOverlayFiles)
{ {
std::string dirpath = File::GetExeDirectory(); std::string dirpath = File::GetExeDirectory();
File::WriteStringToFile(ws.gameStation, dirpath + DIR_SEP + "Slippi/out-station.txt"); File::WriteStringToFile(dirpath + DIR_SEP + "Slippi/out-station.txt", ws.gameStation);
File::WriteStringToFile(ws.gameStartAt, dirpath + DIR_SEP + "Slippi/out-time.txt"); File::WriteStringToFile(dirpath + DIR_SEP + "Slippi/out-time.txt", ws.gameStartAt);
} }
current = ws; current = ws;