Merge branch 'develop'
This commit is contained in:
commit
dc2a41adca
2
deps/curl
vendored
2
deps/curl
vendored
@ -1 +1 @@
|
|||||||
Subproject commit af5999a6742ea90011e7fa08aade7eac9943b76a
|
Subproject commit 4ab601d93a07cee665ec2458a51fccd0767c03f1
|
@ -47,6 +47,11 @@ namespace filesystem
|
|||||||
filesystem::register_path(utils::properties::get_appdata_path() / CLIENT_DATA_FOLDER);
|
filesystem::register_path(utils::properties::get_appdata_path() / CLIENT_DATA_FOLDER);
|
||||||
filesystem::register_path(L".");
|
filesystem::register_path(L".");
|
||||||
filesystem::register_path(L"h1-mod");
|
filesystem::register_path(L"h1-mod");
|
||||||
|
filesystem::register_path(L"devraw");
|
||||||
|
filesystem::register_path(L"devraw_shared");
|
||||||
|
filesystem::register_path(L"raw_shared");
|
||||||
|
filesystem::register_path(L"raw");
|
||||||
|
filesystem::register_path(L"main");
|
||||||
|
|
||||||
fs_startup_hook.invoke<void>(name);
|
fs_startup_hook.invoke<void>(name);
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ namespace steam
|
|||||||
std::string content;
|
std::string content;
|
||||||
if (::utils::io::read_file(LANGUAGE_FILE, &content))
|
if (::utils::io::read_file(LANGUAGE_FILE, &content))
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#ifdef DEBUG
|
||||||
console::info("Language switched to \"%s\".\n", content.data());
|
console::info("Language switched to \"%s\".\n", content.data());
|
||||||
#endif
|
#endif
|
||||||
strcpy_s(language, sizeof(language), content.data());
|
strcpy_s(language, sizeof(language), content.data());
|
||||||
|
Loading…
Reference in New Issue
Block a user