miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: merge error (ninja build stopped)

Browse Source
This commit is contained in:
chucky-n-ice
2024-05-06 20:54:44 +02:00
parent b11f5a76a9
commit ab587a163a
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/citymania/cm_commands_gui.cpp
View File

@@ -37,9 +37,7 @@ static const int MAX_COMMUNITY_STRING_LEN = 128;
static constexpr std::string_view NICE_HTTP_LOGIN = "http://n-ice.org/openttd/gettoken_md5salt.php?user={}&password={}"; static constexpr std::string_view NICE_HTTP_LOGIN = "http://n-ice.org/openttd/gettoken_md5salt.php?user={}&password={}";
static constexpr std::string_view BTPRO_HTTP_LOGIN = "http://openttd.btpro.nl/gettoken-enc.php?user={}&password={}"; static constexpr std::string_view BTPRO_HTTP_LOGIN = "http://openttd.btpro.nl/gettoken-enc.php?user={}&password={}";
static const std::string CFG_FILE = "citymania.cfg";
static const std::string CFG_LOGIN_FILE = "citymania.cfg";
static const std::string CFG_LOGIN_KEY = "login"; static const std::string CFG_LOGIN_KEY = "login";
static const std::string CFG_SERVER_KEY = "server"; static const std::string CFG_SERVER_KEY = "server";
static const char * const NOVAPOLIS_LOGIN = "citymania_login"; static const char * const NOVAPOLIS_LOGIN = "citymania_login";