Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Clean up + remove Com_Errors

Browse Source
This commit is contained in:
BrentVL-1952840 2023-04-13 20:17:56 +02:00
parent 2fb7b42be8
commit 81fe6bc7e1
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/client/component/workshop.cpp
View File

@ -65,26 +65,15 @@ namespace workshop
std::string get_mod_name(const std::string& mod_id) std::string get_mod_name(const std::string& mod_id)
{ {
if (mod_id == "usermaps") if (mod_id == "usermaps" || !game::is_server())
{ {
return mod_id; return mod_id;
} }
const utils::nt::library host{}; const utils::nt::library host{};
std::string path; const auto base_path = host.get_folder().generic_string();
const auto path = utils::string::va("%s/mods/%s/zone/workshop.json", base_path.data(), mod_id.data());
if (game::is_server()) const auto json_str = utils::io::read_file(path);
{
const auto base_path = host.get_folder().generic_string();
path = utils::string::va("%s/mods/%s/zone/workshop.json", base_path.data(), mod_id.data());
}
else
{
return mod_id;
}
std::string json_str;
utils::io::read_file(path, &json_str);
if (json_str.empty()) if (json_str.empty())
{ {
@ -112,11 +101,9 @@ namespace workshop
return title; return title;
} }
else
{ printf("[ Workshop ] workshop.json has no \"Title\" member.\n");
printf("[ Workshop ] workshop.json has no \"Title\" member.\n"); return mod_id;
return mod_id;
}
} }
std::string get_usermap_publisher_id(const std::string& mapname) std::string get_usermap_publisher_id(const std::string& mapname)
@ -139,7 +126,8 @@ namespace workshop
{ {
if (!game::DB_FileExists(mapname.data(), 0) && pub_id.empty()) if (!game::DB_FileExists(mapname.data(), 0) && pub_id.empty())
{ {
game::Com_Error(0, "Can't find usermap: %s!\nMake sure you're subscribed to the workshop item.", mapname.data()); game::UI_OpenErrorPopupWithMessage(0, 0x100,
utils::string::va("Can't find usermap: %s!\nMake sure you're subscribed to the workshop item.", mapname.data()));
return false; return false;
} }
@ -155,7 +143,8 @@ namespace workshop
if (!has_mod(mod)) if (!has_mod(mod))
{ {
game::Com_Error(0, "Can't find mod with publisher id: %s!\nMake sure you're subscribed to the workshop item.", mod.data()); game::UI_OpenErrorPopupWithMessage(0, 0x100,
utils::string::va("Can't find mod with publisher id: %s!\nMake sure you're subscribed to the workshop item.", mod.data()));
return false; return false;
} }

1
src/client/game/symbols.hpp
View File

@ -142,6 +142,7 @@ namespace game
}; };
// UI // UI
WEAK symbol<void(int localClientNumber, int errorcode, const char* errorMessage)> UI_OpenErrorPopupWithMessage{0x14228DEE0};
WEAK symbol<void(bool frontend)> UI_CoD_Init{0x141F29010, 0x1404A0A50}; WEAK symbol<void(bool frontend)> UI_CoD_Init{0x141F29010, 0x1404A0A50};
WEAK symbol<void()> UI_CoD_LobbyUI_Init{0x141F2BD80, 0x1404A1F50}; WEAK symbol<void()> UI_CoD_LobbyUI_Init{0x141F2BD80, 0x1404A1F50};
WEAK symbol<void()> UI_CoD_Shutdown{0x141F32E10, 0x0}; WEAK symbol<void()> UI_CoD_Shutdown{0x141F32E10, 0x0};