alterware/iw6-mod
1
0
Fork 4
Code Issues Pull Requests 13 Packages Projects Releases Wiki Activity

Added fallback logic for current path / working directory. #10

Open
anomaly wants to merge 8 commits from anomaly/iw6-mod:fallback_logic_working_directory into master
pull from: anomaly/iw6-mod:fallback_logic_working_directory
merge into: alterware:master
Conversation 0 Commits 8 Files Changed 26 +18 -2
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2516a48fc1 - Show all commits

20
src/client/main.cpp
View File

@ -4,6 +4,7 @@
#include "loader/component_loader.hpp"
#include "game/game.hpp"
#include "utils/command_line.hpp"
#include <utils/flags.hpp>
#include <utils/io.hpp>
#include <utils/string.hpp>
@ -167,8 +168,23 @@ FARPROC load_binary(const launcher::mode mode)
std::string data;
if (!utils::io::read_file(binary, &data))
{
throw std::runtime_error(
"Failed to read game binary! Please select the correct path in the launcher settings.");
// Check the first argument to see if the current directory needs to changed
// Required when the game is used to open a file (like a demo file)
const auto& args = utils::command_line::get_args();
if (!args.empty())
{
const auto& binary_dir = args.front();
if (binary_dir.filename().string().ends_with("iw6-mod.exe"))
{
std::filesystem::current_path(binary_dir.parent_path());
}
}
if (!utils::io::read_file(binary, &data))
{
throw std::runtime_error(
"Failed to read game binary! Please select the correct path in the launcher settings.");
}
}
#ifdef INJECT_HOST_AS_LIB