1
0
forked from 0ad/0ad

Don't use the ternary operator as some people find that unreadable.

This was SVN commit r18035.
This commit is contained in:
elexis 2016-04-15 06:11:38 +00:00
parent 15e44a89ff
commit f905ee2c7e

View File

@ -205,7 +205,10 @@ std::wstring SetCursor(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std
bool IsVisualReplay(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
{
return g_Game ? g_Game->IsVisualReplay() : false;
if (!g_Game)
return false;
return g_Game->IsVisualReplay();
}
std::wstring GetCurrentReplayDirectory(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
@ -213,9 +216,10 @@ std::wstring GetCurrentReplayDirectory(ScriptInterface::CxPrivate* UNUSED(pCxPri
if (!g_Game)
return std::wstring();
return g_Game->IsVisualReplay() ?
OsPath(g_Game->GetReplayPath()).Parent().Filename().string() :
g_Game->GetReplayLogger().GetDirectory().Filename().string();
if (g_Game->IsVisualReplay())
return OsPath(g_Game->GetReplayPath()).Parent().Filename().string();
return g_Game->GetReplayLogger().GetDirectory().Filename().string();
}
int GetPlayerID(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))