mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-30 14:18:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove some leftover code

Browse source
This commit is contained in:
Nikhil Narayana 2022-05-30 13:49:34 -07:00
commit cf04e7d6af
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/Common/FileUtil.cpp
View file

@ -931,7 +931,6 @@ static void RebuildUserDirectories(unsigned int dir_index)
s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM; s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM;
s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + DIR_SEP WII_SDCARD; s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + DIR_SEP WII_SDCARD;
s_user_paths[F_USERJSON_IDX] = s_user_paths[D_USER_IDX] + "user.json"; s_user_paths[F_USERJSON_IDX] = s_user_paths[D_USER_IDX] + "user.json";
s_user_paths[F_DIRECTCODESJSON_IDX] = s_user_paths[D_USER_IDX] + "directcodes.json";
s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP; s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP;
s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] = s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] =

1
Source/Core/Common/FileUtil.h
View file

@ -73,7 +73,6 @@ enum
F_MEMORYWATCHERSOCKET_IDX, F_MEMORYWATCHERSOCKET_IDX,
F_WIISDCARD_IDX, F_WIISDCARD_IDX,
F_USERJSON_IDX, F_USERJSON_IDX,
F_DIRECTCODESJSON_IDX,
F_DUALSHOCKUDPCLIENTCONFIG_IDX, F_DUALSHOCKUDPCLIENTCONFIG_IDX,
NUM_PATH_INDICES NUM_PATH_INDICES
}; };

11
Source/Core/Core/Slippi/SlippiDirectCodes.cpp
View file

@ -6,6 +6,7 @@
#endif #endif
#include "Common/CommonPaths.h" #include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
@ -42,7 +43,7 @@ void SlippiDirectCodes::ReadFile()
{ {
std::string directCodesFilePath = getCodesFilePath(); std::string directCodesFilePath = getCodesFilePath();
INFO_LOG(SLIPPI_ONLINE, "Looking for direct codes file at %s", directCodesFilePath.c_str()); INFO_LOG_FMT(SLIPPI_ONLINE, "Looking for direct codes file at {}", directCodesFilePath.c_str());
if (!File::Exists(directCodesFilePath)) if (!File::Exists(directCodesFilePath))
{ {
@ -53,7 +54,7 @@ void SlippiDirectCodes::ReadFile()
} }
else else
{ {
WARN_LOG(SLIPPI_ONLINE, "Was unable to create %s", directCodesFilePath.c_str()); WARN_LOG_FMT(SLIPPI_ONLINE, "Was unable to create {}", directCodesFilePath.c_str());
} }
} }
@ -65,7 +66,7 @@ void SlippiDirectCodes::ReadFile()
void SlippiDirectCodes::AddOrUpdateCode(std::string code) void SlippiDirectCodes::AddOrUpdateCode(std::string code)
{ {
WARN_LOG(SLIPPI_ONLINE, "Attempting to add or update direct code: %s", code.c_str()); WARN_LOG_FMT(SLIPPI_ONLINE, "Attempting to add or update direct code: {}", code.c_str());
time_t curTime; time_t curTime;
time(&curTime); time(&curTime);
@ -139,7 +140,7 @@ std::string SlippiDirectCodes::get(int index)
return directCodeInfos.at(index).connectCode; return directCodeInfos.at(index).connectCode;
} }
INFO_LOG(SLIPPI_ONLINE, "Out of bounds name entry index %d", index); INFO_LOG_FMT(SLIPPI_ONLINE, "Out of bounds name entry index {}", index);
return (index >= directCodeInfos.size()) ? "1" : ""; return (index >= directCodeInfos.size()) ? "1" : "";
} }
@ -174,8 +175,6 @@ void SlippiDirectCodes::WriteFile()
std::string SlippiDirectCodes::getCodesFilePath() std::string SlippiDirectCodes::getCodesFilePath()
{ {
std::string fileName = m_fileName + ".json";
// TODO: Move to User dir // TODO: Move to User dir
#if defined(__APPLE__) #if defined(__APPLE__)
std::string directCodesPath = std::string directCodesPath =