Rim/h1-mod
Rim/h1-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
fed 2023-12-22 22:42:09 +01:00
commit 3ef6162f04
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/component/ui_scripting.cpp
View File

@ -393,7 +393,11 @@ namespace ui_scripting
download_table["abort"] = download::stop_download; download_table["abort"] = download::stop_download;
download_table["userdownloadresponse"] = party::user_download_response; download_table["userdownloadresponse"] = party::user_download_response;
download_table["getwwwurl"] = party::get_server_connection_state().base_url; download_table["getwwwurl"] = []
{
const auto state = party::get_server_connection_state();
return state.base_url;
};
auto discord_table = table(); auto discord_table = table();
lua["discord"] = discord_table; lua["discord"] = discord_table;

15
src/client/steam/steam.cpp
View File

@ -5,6 +5,7 @@
#include <utils/nt.hpp> #include <utils/nt.hpp>
#include <utils/string.hpp> #include <utils/string.hpp>
#include <utils/io.hpp>
#define GENERIC_RETURN_IF_FAIL(condition) \ #define GENERIC_RETURN_IF_FAIL(condition) \
if (condition != S_OK) \ if (condition != S_OK) \
@ -220,6 +221,13 @@ namespace steam
char path[MAX_PATH] = {0}; char path[MAX_PATH] = {0};
DWORD length = sizeof(path); DWORD length = sizeof(path);
std::string path_str;
if (::utils::io::read_file("steam_path.txt", &path_str))
{
install_path = path_str;
return install_path.data();
}
HKEY reg_key; HKEY reg_key;
// check if Steam contains information in registry for the install path // check if Steam contains information in registry for the install path
@ -252,12 +260,9 @@ namespace steam
return ""; return "";
} }
// create a pointer to our path variable to use in our open_folder function auto directory_ptr = path;
char* directory_ptr = path;
// open a file explorer prompt to find the Steam directory (user input)
open_folder_prompt(directory_ptr); open_folder_prompt(directory_ptr);
while (!strcmp(directory_ptr, "")) // if this while statement goes, this means that the operation was cancelled while (!strcmp(directory_ptr, ""))
{ {
MSG_BOX_ERROR("You must select a valid Steam directory before you can continue."); MSG_BOX_ERROR("You must select a valid Steam directory before you can continue.");
open_folder_prompt(directory_ptr); open_folder_prompt(directory_ptr);