ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct code duplication (and FIXMEs) in challenges manager

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7232 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-01-03 18:55:01 +00:00
parent 7e04cb4f75
commit 27d75d2414
2 changed files with 50 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/challenges/unlock_manager.cpp
View File

@ -60,74 +60,15 @@ UnlockManager::UnlockManager()
// Read challenges from .../data/tracks/*
// --------------------------------------
const std::vector<std::string> *all_track_dirs = track_manager->getAllTrackDirs();
for(std::vector<std::string>::const_iterator dir=all_track_dirs->begin();
dir!=all_track_dirs->end(); dir++)
{
std::set<std::string> all_files;
file_manager->listFiles(all_files, *dir, /*is_full_path*/ true);
for(std::set<std::string>::iterator file=all_files.begin();
file!=all_files.end(); file++)
{
if(!StringUtils::hasSuffix(*file,".challenge")) continue;
std::string filename=*dir+"/"+*file;
FILE *f=fopen(filename.c_str(), "r");
if(f)
{
fclose(f);
ChallengeData* newChallenge = NULL;
try
{
newChallenge = new ChallengeData(filename);
}
catch (std::runtime_error& ex)
{
std::cerr << "\n/!\\ An error occurred while loading challenge file '" << filename << "' : "
<< ex.what() << " : challenge will be ignored.\n\n";
continue;
}
addChallenge(newChallenge);
} // if file
} // for file in files
} // for dir in all_track_dirs
// Load challenges from .../data/karts (FIXME: the code below is just copied and pasted from above xD)
// -----------------------------------
const std::vector<std::string> *all_kart_dirs =
kart_properties_manager->getAllKartDirs();
// Find out which characters are available and load them
for(std::vector<std::string>::const_iterator dir = all_kart_dirs->begin();
dir != all_kart_dirs->end(); dir++)
{
std::set<std::string> all_files;
file_manager->listFiles(all_files, *dir, /*is_full_path*/ true);
for(std::set<std::string>::iterator file=all_files.begin();
file!=all_files.end(); file++)
{
if(!StringUtils::hasSuffix(*file,".challenge")) continue;
std::string filename=*dir+"/"+*file;
FILE *f=fopen(filename.c_str(), "r");
if(f)
{
fclose(f);
ChallengeData* newChallenge = NULL;
try
{
newChallenge = new ChallengeData(filename);
}
catch (std::runtime_error& ex)
{
std::cerr << "\n/!\\ An error occurred while loading challenge file '" << filename << "' : "
<< ex.what() << " : challenge will be ignored.\n\n";
continue;
}
addChallenge(newChallenge);
} // if file
} // for file in files
} // for dir in all_karts_dirs
readAllChallengesInDirs(all_track_dirs);
// Read challenges from .../data/karts/*
// --------------------------------------
const std::vector<std::string> *all_kart_dirs = kart_properties_manager->getAllKartDirs();
readAllChallengesInDirs(all_kart_dirs);
// Challenges from .../data/grandprix
// ----------------------------------
file_manager->listFiles(result, "data/grandprix");
@ -140,7 +81,6 @@ UnlockManager::UnlockManager()
// Hard coded challenges can be added here.
computeActive(); //FIXME: 'load' calls 'computeActive', not sure this call here is needed
load();
} // UnlockManager
@ -156,6 +96,45 @@ UnlockManager::~UnlockManager()
// sfx_manager->deleteSFX(m_locked_sound);
} // ~UnlockManager
//-----------------------------------------------------------------------------
void UnlockManager::readAllChallengesInDirs(const std::vector<std::string>* all_dirs)
{
for(std::vector<std::string>::const_iterator dir = all_dirs->begin();
dir != all_dirs->end(); dir++)
{
std::set<std::string> all_files;
file_manager->listFiles(all_files, *dir, /*is_full_path*/ true);
for(std::set<std::string>::iterator file = all_files.begin();
file != all_files.end(); file++)
{
if (!StringUtils::hasSuffix(*file,".challenge")) continue;
std::string filename = *dir + "/" + *file;
FILE* f = fopen(filename.c_str(), "r");
if (f)
{
fclose(f);
ChallengeData* newChallenge = NULL;
try
{
newChallenge = new ChallengeData(filename);
}
catch (std::runtime_error& ex)
{
std::cerr << "\n/!\\ An error occurred while loading challenge file '" << filename << "' : "
<< ex.what() << " : challenge will be ignored.\n\n";
continue;
}
addChallenge(newChallenge);
} // if file
} // for file in files
} // for dir in all_track_dirs
}
//-----------------------------------------------------------------------------
void UnlockManager::addChallenge(Challenge *c)
{

3
src/challenges/unlock_manager.hpp
View File

@ -46,7 +46,8 @@ private:
void load ();
void unlockFeature (Challenge* c, bool do_save=true);
void readAllChallengesInDirs(const std::vector<std::string>* all_dirs);
public:
UnlockManager ();
~UnlockManager ();