Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

loading progress a bit more detailed

Browse Source
This commit is contained in:
Titus Tscharntke 2011-01-09 12:41:08 +00:00
parent b5a139033a
commit 6d94548b4f
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/facilities/logger.cpp
View File

@ -157,7 +157,7 @@ void Logger::renderLoadingScreen() {
metrics.getVirtualW()/4,
59*metrics.getVirtualH()/100,
coreData.getDisplayFontSmall(),
350,"loading progress ");
350,""); // no string here, because it has to be language specific and does not give much information
renderer.swapBuffers();

4
source/glest_game/facilities/logger.h
View File

@ -58,12 +58,14 @@ public:
void setState(const string &state) {this->state= state;}
void setSubtitle(const string &subtitle) {this->subtitle= subtitle;}
void setProgress(int value) { this->progress = value; }
int getProgress() const {return progress;}
void add(const string &str, bool renderScreen= false);
void loadLoadingScreen(string filepath);
void renderLoadingScreen();
void clear();
void clear();
};
}}//end namespace

3
source/glest_game/main/program.cpp
View File

@ -380,6 +380,9 @@ void Program::setState(ProgramState *programState, bool cleanupOldState)
int Y = 0;
SDL_GetMouseState(&X,&Y);
programState->setStartXY(X,Y);
Logger::getInstance().setProgress(0);
Logger::getInstance().setState("");
SDL_PumpEvents();

4
source/glest_game/types/faction_type.cpp
View File

@ -77,10 +77,12 @@ void FactionType::load(const string &dir, const TechTree *techTree, Checksum* ch
// b1) load units
try{
Logger &logger= Logger::getInstance();
int progressBaseValue=logger.getProgress();
for(int i = 0; i < unitTypes.size(); ++i) {
string str= dir + "/units/" + unitTypes[i].getName();
unitTypes[i].load(i, str, techTree, this, checksum,techtreeChecksum);
logger.setProgress(progressBaseValue+(int)((((double)i + 1.0) / (double)unitTypes.size()) * 100.0/techTree->getTypeCount()));
SDL_PumpEvents();
}
}

2
source/glest_game/types/tech_tree.cpp
View File

@ -148,7 +148,7 @@ void TechTree::load(const string &dir, set<string> &factions, Checksum* checksum
sprintf(szBuf,"%s %s [%d / %d] - %s",Lang::getInstance().get("Loading").c_str(),Lang::getInstance().get("Faction").c_str(),i+1,(int)factions.size(),factionName.c_str());
Logger &logger= Logger::getInstance();
logger.setState(szBuf);
logger.setProgress((int)((((double)i + 1.0) / (double)factions.size()) * 100.0));
logger.setProgress((int)((((double)i) / (double)factions.size()) * 100.0));
str=dir+"/factions/" + factionName;
factionTypes[i++].load(str, this, checksum,&checksumValue);