mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-14 13:16:20 +00:00
New Year's clean-up.
Throw a warning if a invalid (not present) AI is specified in a map. Replace the last occurences of jubot with qbot. Exclude the common siege templates from the Units Demo map. Fix an error with flying units. Replace CFG_GET_SYS_VAL with CFG_GET_USER_VAL and rename it to CFG_GET_VAL to reflect its behaviour better. Fix linker error with clang 3.2. Refs 1588. Remove some useless includes. This was SVN commit r13031.
This commit is contained in:
@@ -171,7 +171,7 @@ int GetPlayerID(void* UNUSED(cbdata))
|
||||
std::wstring GetDefaultPlayerName(void* UNUSED(cbdata))
|
||||
{
|
||||
CStr playername;
|
||||
CFG_GET_USER_VAL("playername", String, playername);
|
||||
CFG_GET_VAL("playername", String, playername);
|
||||
std::wstring name = playername.FromUTF8();
|
||||
if (!name.empty())
|
||||
return name;
|
||||
@@ -186,7 +186,7 @@ std::wstring GetDefaultPlayerName(void* UNUSED(cbdata))
|
||||
std::wstring GetDefaultMPServer(void* UNUSED(cbdata))
|
||||
{
|
||||
CStr server;
|
||||
CFG_GET_USER_VAL("multiplayerserver", String, server);
|
||||
CFG_GET_VAL("multiplayerserver", String, server);
|
||||
return server.FromUTF8();
|
||||
}
|
||||
|
||||
@@ -492,7 +492,7 @@ bool IsUserReportEnabled(void* UNUSED(cbdata))
|
||||
bool IsSplashScreenEnabled(void* UNUSED(cbdata))
|
||||
{
|
||||
bool splashScreenEnable = true;
|
||||
CFG_GET_USER_VAL("splashscreenenable", Bool, splashScreenEnable);
|
||||
CFG_GET_VAL("splashscreenenable", Bool, splashScreenEnable);
|
||||
return splashScreenEnable;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user