Merge ScoreboardSortType with main Scoreboard command
parent
1ed3f4b215
commit
85772376fa
|
@ -3603,16 +3603,11 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
|
||||||
{
|
{
|
||||||
// Create the scoreboard
|
// Create the scoreboard
|
||||||
m_scoreboard = MakeUnique<CScoreboard>();
|
m_scoreboard = MakeUnique<CScoreboard>();
|
||||||
|
m_scoreboard->SetSortType(line->GetParam("sort")->AsSortType(CScoreboard::SortType::SORT_ID));
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (line->GetCommand() == "ScoreboardSortType" && !resetObject)
|
|
||||||
{
|
|
||||||
m_scoreboard->SetSortType(line->GetParam("sort")->AsSortType());
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (line->GetCommand() == "ScoreboardKillRule" && !resetObject)
|
if (line->GetCommand() == "ScoreboardKillRule" && !resetObject)
|
||||||
{
|
{
|
||||||
if (!m_scoreboard)
|
if (!m_scoreboard)
|
||||||
|
|
Loading…
Reference in New Issue