immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix code style

1008-fix
krzys-h 2018-05-08 19:44:24 +02:00
parent 5283865a5c
commit db72a36315
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CBot/CBotToken.cpp
View File

@ -26,7 +26,8 @@
namespace CBot namespace CBot
{ {
namespace { namespace
{
template <typename L, typename R> template <typename L, typename R>
boost::bimap<L, R> makeBimap(std::initializer_list<typename boost::bimap<L, R>::value_type> list) boost::bimap<L, R> makeBimap(std::initializer_list<typename boost::bimap<L, R>::value_type> list)
{ {
@ -449,10 +450,11 @@ std::unique_ptr<CBotToken> CBotToken::CompileTokens(const std::string& program)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CBotToken::GetKeyWord(const std::string& w) int CBotToken::GetKeyWord(const std::string& w)
{ {
auto it = KEYWORDS.right.find(w); auto it = KEYWORDS.right.find(w);
if (it != KEYWORDS.right.end()) { if (it != KEYWORDS.right.end())
return it->second; {
} return it->second;
}
return -1; return -1;
} }

4
src/level/parser/parserparam.cpp
View File

@ -957,9 +957,9 @@ int CLevelParserParam::AsResearchFlag(int def)
SortType CLevelParserParam::ToSortType(std::string value) SortType CLevelParserParam::ToSortType(std::string value)
{ {
if (value == "Points" ) return SortType::SORT_POINTS; if (value == "Points") return SortType::SORT_POINTS;
if (value == "Name" ) return SortType::SORT_ID; if (value == "Name" ) return SortType::SORT_ID;
return SortType::SORT_ID; return SortType::SORT_ID;
} }
SortType CLevelParserParam::AsSortType() SortType CLevelParserParam::AsSortType()

2
src/level/scoreboard.h
View File

@ -39,7 +39,7 @@ class CObject;
struct Score struct Score
{ {
int points = 0; //! Team score int points = 0; //! Team score
float time = 0; //! Time when points were scored float time = 0; //! Time when points were scored
}; };
enum class SortType enum class SortType