diff --git a/src/band3/meta_band/NameGenerator.cpp b/src/band3/meta_band/NameGenerator.cpp index 167f8e542..b295cc16a 100644 --- a/src/band3/meta_band/NameGenerator.cpp +++ b/src/band3/meta_band/NameGenerator.cpp @@ -7,7 +7,7 @@ NameGenerator *TheNameGenerator = NULL; -NameGenerator::NameGenerator(DataArray* x) { +NameGenerator::NameGenerator(DataArray *x) { MILO_ASSERT(!TheNameGenerator, 19); TheNameGenerator = this; SetName("name_generator", ObjectDir::Main()); @@ -19,17 +19,15 @@ NameGenerator::~NameGenerator() { Cleanup(); } -void NameGenerator::Cleanup() { - m_mapNameLists.clear(); -} +void NameGenerator::Cleanup() { m_mapNameLists.clear(); } -void NameGenerator::Init(DataArray* x) { ConfigureNameData(x); } +void NameGenerator::Init(DataArray *x) { ConfigureNameData(x); } -void NameGenerator::ConfigureNameData(DataArray* Root) { +void NameGenerator::ConfigureNameData(DataArray *Root) { MILO_ASSERT(m_mapNameLists.empty(), 48); for (int i = 1; i < Root->Size(); i++) { - DataArray* i_pNameArray = Root->Array(i); + DataArray *i_pNameArray = Root->Array(i); MILO_ASSERT(i_pNameArray, 55); Symbol ListName = i_pNameArray->Sym(0); @@ -53,7 +51,7 @@ DataArray *NameGenerator::GetNameList(Symbol sym) const { } Symbol NameGenerator::GetRandomNameFromList(Symbol x) { - DataArray* pNameArray = GetNameList(x); + DataArray *pNameArray = GetNameList(x); MILO_ASSERT(pNameArray, 92); int iNameCount = pNameArray->mSize - 1; diff --git a/src/band3/tour/TourGameRules.cpp b/src/band3/tour/TourGameRules.cpp index 20fe8ed1b..e394bb424 100644 --- a/src/band3/tour/TourGameRules.cpp +++ b/src/band3/tour/TourGameRules.cpp @@ -6,28 +6,37 @@ TourGameRules::TourGameRules() : mGameType(), mChallengeData(NULL) {} TourGameRules::~TourGameRules() {} -void TourGameRules::Init(const DataArray* i_pConfig) { +void TourGameRules::Init(const DataArray *i_pConfig) { MILO_ASSERT(i_pConfig, 28); - int x = 0 ; + int x = 0; i_pConfig->FindData(type, x, true); mGameType = (TourGameType)x; - DataArray* pTargetArray = i_pConfig->FindArray(target, true); + DataArray *pTargetArray = i_pConfig->FindArray(target, true); MILO_ASSERT(pTargetArray, 37); MILO_ASSERT(pTargetArray->Size() > 1, 40); for (int i = 1; i < pTargetArray->Size(); i++) { float f = pTargetArray->Node(i).Float(); - if (m_vTargets.size() < 2) m_vTargets.push_back(f); - else MILO_WARN("Too many targets specified for game type: %i", mGameType); + if (m_vTargets.size() < 2) + m_vTargets.push_back(f); + else + MILO_WARN("Too many targets specified for game type: %i", mGameType); } int i = m_vTargets.size(); - if (i < 2) {MILO_WARN("Not enough targets specified for game type: %i", mGameType); - for (i; i < 2; i++) { + if (i < 2) { + MILO_WARN("Not enough targets specified for game type: %i", mGameType); + for (i; i < 2; i++) { m_vTargets.push_back(0); - }} + } + } mChallengeData = i_pConfig->FindArray(challenge_specific_data, false); } TourGameType TourGameRules::GetGameType() const { return mGameType; } int TourGameRules::GetNumTargets() const { return m_vTargets.size(); } -float TourGameRules::GetTarget(int i_iIndex) const { MILO_ASSERT(i_iIndex < m_vTargets.size(), 90); return m_vTargets[i_iIndex]; } -const DataArray* TourGameRules::GetChallengeSpecificData() const { return mChallengeData; } +float TourGameRules::GetTarget(int i_iIndex) const { + MILO_ASSERT(i_iIndex < m_vTargets.size(), 90); + return m_vTargets[i_iIndex]; +} +const DataArray *TourGameRules::GetChallengeSpecificData() const { + return mChallengeData; +} diff --git a/src/network/Platform/RandomNumberGenerator.cpp b/src/network/Platform/RandomNumberGenerator.cpp index ae8f8f417..6e50c1e48 100644 --- a/src/network/Platform/RandomNumberGenerator.cpp +++ b/src/network/Platform/RandomNumberGenerator.cpp @@ -6,15 +6,15 @@ namespace Quazal { m_mag01[0] = 0; m_mag01[1] = 0x9908B0DF; m_mti = 0x271; - #ifdef VERSION_SZBE69 +#ifdef VERSION_SZBE69 SetRandomNumberSeed(1); - #else +#else m_mt[0] = 1; m_mti = 1; for (; m_mti < 0x270; m_mti++) { m_mt[m_mti] = m_mt[m_mti - 1] * 0x10DCD; } - #endif +#endif } RandomNumberGenerator::~RandomNumberGenerator() {}