From ca538d5323bbd8b33d87ad8ee8954529e0cf7c61 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Fri, 18 Oct 2013 20:02:53 +0200 Subject: Adapted code style. --- source/MobFamilyCollecter.cpp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'source/MobFamilyCollecter.cpp') diff --git a/source/MobFamilyCollecter.cpp b/source/MobFamilyCollecter.cpp index 2aa46599a..086fa5f40 100644 --- a/source/MobFamilyCollecter.cpp +++ b/source/MobFamilyCollecter.cpp @@ -6,7 +6,7 @@ -cMobFamilyCollecter::tMobFamilyList cMobFamilyCollecter::initMobFamilyBeforeCx11() +cMobFamilyCollecter::tMobFamilyList cMobFamilyCollecter::InitMobFamilyBeforeCx11(void) { std::set toReturn; toReturn.insert(cMonster::mfHostile); @@ -15,19 +15,37 @@ cMobFamilyCollecter::tMobFamilyList cMobFamilyCollecter::initMobFamilyBeforeCx11 toReturn.insert(cMonster::mfWater); return toReturn; } -cMobFamilyCollecter::tMobFamilyList& cMobFamilyCollecter::m_AllFamilies() + + + + + +cMobFamilyCollecter::tMobFamilyList & cMobFamilyCollecter::m_AllFamilies(void) { - static tMobFamilyList* AllFamilies = new tMobFamilyList(initMobFamilyBeforeCx11()); + // TODO: This memory is leaked: + static tMobFamilyList * AllFamilies = new tMobFamilyList(InitMobFamilyBeforeCx11()); return *AllFamilies; } + + + + void cMobFamilyCollecter::CollectMob(cMonster& a_Monster) { cMonster::eFamily MobFamily = a_Monster.GetMobFamily(); m_Mobs[MobFamily].insert(&a_Monster); } -int cMobFamilyCollecter::getNumberOfCollectedMobs(cMonster::eFamily a_Family) + + + + +int cMobFamilyCollecter::GetNumberOfCollectedMobs(cMonster::eFamily a_Family) { return m_Mobs[a_Family].size(); } + + + + -- cgit v1.2.3