Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Show messages when adding favourites.

Browse Source
This commit is contained in:
momo5502 2016-01-08 15:50:39 +01:00
parent dfc18268af
commit 9e13cbc0ac
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Components/Modules/ServerList.cpp
View File

@ -221,6 +221,7 @@ namespace Components
if (!object.is_array()) if (!object.is_array())
{ {
Logger::Print("Favourites storage file is invalid!\n"); Logger::Print("Favourites storage file is invalid!\n");
Game::MessageBox("Favourites storage file is invalid!", "Error");
return; return;
} }
@ -229,7 +230,11 @@ namespace Components
for (unsigned int i = 0; i < storedServers.size(); i++) for (unsigned int i = 0; i < storedServers.size(); i++)
{ {
if (!storedServers[i].is_string()) continue; if (!storedServers[i].is_string()) continue;
if (storedServers[i].string_value() == server) return; if (storedServers[i].string_value() == server)
{
Game::MessageBox("Server already marked as favourite.", "Error");
return;
}
servers.push_back(storedServers[i].string_value()); servers.push_back(storedServers[i].string_value());
} }
@ -239,6 +244,7 @@ namespace Components
json11::Json data = json11::Json(servers); json11::Json data = json11::Json(servers);
Utils::WriteFile("players/favourites.json", data.dump()); Utils::WriteFile("players/favourites.json", data.dump());
Game::MessageBox("Server added to favourites.", "Success");
} }
void ServerList::LoadFavourties() void ServerList::LoadFavourties()
@ -253,6 +259,7 @@ namespace Components
if (!object.is_array()) if (!object.is_array())
{ {
Logger::Print("Favourites storage file is invalid!\n"); Logger::Print("Favourites storage file is invalid!\n");
Game::MessageBox("Favourites storage file is invalid!", "Error");
return; return;
} }

7
src/Game/Functions.cpp
View File

@ -241,4 +241,11 @@ namespace Game
return ASSET_TYPE_INVALID; return ASSET_TYPE_INVALID;
} }
void MessageBox(std::string message, std::string title)
{
SetConsole("com_errorMessage", message.data());
SetConsole("com_errorTitle", title.data());
Cbuf_AddText(0, "openmenu error_popmenu_lobby");
}
} }

2
src/Game/Functions.hpp
View File

@ -281,4 +281,6 @@ namespace Game
const char *DB_GetXAssetName(XAsset *asset); const char *DB_GetXAssetName(XAsset *asset);
XAssetType DB_GetXAssetNameType(const char* name); XAssetType DB_GetXAssetNameType(const char* name);
void MessageBox(std::string message, std::string title);
} }