From 133520b2acfea372cb3fe2a9a466c55f2cd153c4 Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Mon, 14 Aug 2023 09:14:57 -0700 Subject: [PATCH] fix usage of WriteStringToFile file name comes first now --- Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp | 33 ++++++++------------ Source/Core/Core/Slippi/SlippiReplayComm.cpp | 4 +-- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp index 9a43f7be94..04ce8ac96d 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp @@ -187,9 +187,8 @@ CEXISlippi::CEXISlippi(Core::System& system, const std::string current_file_name std::vector orig(origStr.begin(), origStr.end()); std::vector modified(modifiedStr.begin(), modifiedStr.end()); auto diff = processDiff(orig, modified); - File::WriteStringToFile( - diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll.usd.diff"); - File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnMaAll.usd.diff"); + File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll.usd.diff", diff); + File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnMaAll.usd.diff", diff); // 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(origStr.begin(), origStr.end()); modified = std::vector(modifiedStr.begin(), modifiedStr.end()); diff = processDiff(orig, modified); - File::WriteStringToFile( - diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.usd.diff"); - File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnExtAll.usd.diff"); + File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.usd.diff", diff); + File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnExtAll.usd.diff", diff); // 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(origStr.begin(), origStr.end()); modified = std::vector(modifiedStr.begin(), modifiedStr.end()); diff = processDiff(orig, modified); - File::WriteStringToFile( - diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.usd.diff"); - File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\SdMenu.usd.diff"); + File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.usd.diff", diff); + File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\SdMenu.usd.diff", diff); // Japanese Files // MnMaAll.dat @@ -224,9 +221,8 @@ CEXISlippi::CEXISlippi(Core::System& system, const std::string current_file_name orig = std::vector(origStr.begin(), origStr.end()); modified = std::vector(modifiedStr.begin(), modifiedStr.end()); diff = processDiff(orig, modified); - File::WriteStringToFile( - diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll.dat.diff"); - File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnMaAll.dat.diff"); + File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll.dat.diff", diff); + File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnMaAll.dat.diff", diff); // 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(origStr.begin(), origStr.end()); modified = std::vector(modifiedStr.begin(), modifiedStr.end()); diff = processDiff(orig, modified); - File::WriteStringToFile( - diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.dat.diff"); - File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnExtAll.dat.diff"); + File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\CSS\\MnExtAll.dat.diff", diff); + File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\MnExtAll.dat.diff", diff); // 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(origStr.begin(), origStr.end()); modified = std::vector(modifiedStr.begin(), modifiedStr.end()); diff = processDiff(orig, modified); - File::WriteStringToFile( - diff, "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.dat.diff"); - File::WriteStringToFile(diff, "C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\SdMenu.dat.diff"); + File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\SdMenu.dat.diff", diff); + File::WriteStringToFile("C:\\Dolphin\\IshiiDev\\Sys\\GameFiles\\GALE01\\SdMenu.dat.diff", diff); // TEMP - Restore orig // std::string stateString; // decoder.Decode((char *)orig.data(), orig.size(), diff, &stateString); - // File::WriteStringToFile(stateString, - // "C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll-restored.usd"); + // File::WriteStringToFile("C:\\Users\\Jas\\Documents\\Melee\\Textures\\Slippi\\MainMenu\\MnMaAll-restored.usd", stateString); #endif } diff --git a/Source/Core/Core/Slippi/SlippiReplayComm.cpp b/Source/Core/Core/Slippi/SlippiReplayComm.cpp index 859d68f1f7..94124b4407 100644 --- a/Source/Core/Core/Slippi/SlippiReplayComm.cpp +++ b/Source/Core/Core/Slippi/SlippiReplayComm.cpp @@ -124,8 +124,8 @@ std::unique_ptr SlippiReplayComm::loadGame() if (commFileSettings.outputOverlayFiles) { std::string dirpath = File::GetExeDirectory(); - File::WriteStringToFile(ws.gameStation, dirpath + DIR_SEP + "Slippi/out-station.txt"); - File::WriteStringToFile(ws.gameStartAt, dirpath + DIR_SEP + "Slippi/out-time.txt"); + File::WriteStringToFile(dirpath + DIR_SEP + "Slippi/out-station.txt", ws.gameStation); + File::WriteStringToFile(dirpath + DIR_SEP + "Slippi/out-time.txt", ws.gameStartAt); } current = ws;