backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-17 13:22:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make consoles_app use pathhelper :)
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details

Browse source
This commit is contained in:
JuiceyDev 2026-03-27 20:57:46 +01:00
parent 21fc2166ff
commit 6be5f627ef
1 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Minecraft.Client/Platform/Common/Consoles_App.cpp
View file

@ -4585,7 +4585,6 @@ int CMinecraftApp::BannedLevelDialogReturned(
return 0;
}
void CMinecraftApp::loadMediaArchive() {
std::wstring mediapath = L"";
@ -4604,31 +4603,12 @@ void CMinecraftApp::loadMediaArchive() {
#endif
if (!mediapath.empty()) {
// (check file.cpp)
// try to load the archive relative to the executable
// directory first.
// If that fails, fall back to the current working
// directory (original behavior)
// if everything fails, may god help you
// boom headshot
#if defined(__linux__)
// THIS CAN USE PATHHELPER.h
char exePathBuf[PATH_MAX];
ssize_t exeLen =
readlink("/proc/self/exe", exePathBuf, sizeof(exePathBuf) - 1);
if (exeLen != -1) {
exePathBuf[exeLen] = '\0';
std::string exePathStr(exePathBuf);
size_t pos = exePathStr.find_last_of('/');
std::string exeDir = (pos == std::string::npos)
? std::string(".")
: exePathStr.substr(0, pos);
std::wstring exeDirW = convStringToWstring(exeDir.c_str());
std::wstring candidate = exeDirW + File::pathSeparator + mediapath;
if (File(candidate).exists()) {
m_mediaArchive = new ArchiveFile(File(candidate));
} else {
m_mediaArchive = new ArchiveFile(File(mediapath));
}
std::wstring exeDirW = PathHelper::GetExecutableDirW();
std::wstring candidate = exeDirW + File::pathSeparator + mediapath;
if (File(candidate).exists()) {
m_mediaArchive = new ArchiveFile(File(candidate));
} else {
m_mediaArchive = new ArchiveFile(File(mediapath));
}
@ -4636,6 +4616,7 @@ void CMinecraftApp::loadMediaArchive() {
m_mediaArchive = new ArchiveFile(File(mediapath));
#endif
}
}
#if 0
std::string path = "Common\\media.arc";
HANDLE hFile = CreateFile( path.c_str(),