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

- disable faction update staggering

Browse Source
This commit is contained in:
Mark Vejvoda 2010-08-23 19:35:55 +00:00
parent 7442ac7c54
commit 61a2340e14
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/glest_game/world/world.cpp
View File

@ -307,8 +307,8 @@ void World::update(){
if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s] Line: %d took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis()); if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s] Line: %d took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
//tick //tick
//if(frameCount % GameConstants::updateFps == 0) { if(frameCount % GameConstants::updateFps == 0) {
if(frameCount % (GameConstants::updateFps / GameConstants::maxPlayers) == 0) { //if(frameCount % (GameConstants::updateFps / GameConstants::maxPlayers) == 0) {
if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s] Line: %d took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis()); if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s] Line: %d took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
tick(); tick();
@ -344,33 +344,34 @@ int World::tickFactionIndex() {
} }
void World::tick() { void World::tick() {
int factionIdxToTick = tickFactionIndex(); int factionIdxToTick = -1;
if(factionIdxToTick < 0) { //int factionIdxToTick = tickFactionIndex();
return; //if(factionIdxToTick < 0) {
} // return;
//}
computeFow(factionIdxToTick); computeFow(factionIdxToTick);
if(factionIdxToTick == 0) { if(factionIdxToTick == -1 || factionIdxToTick == 0) {
if(fogOfWarSmoothing == false) { if(fogOfWarSmoothing == false) {
minimap.updateFowTex(1.f); minimap.updateFowTex(1.f);
} }
} }
//increase hp //increase hp
int i = factionIdxToTick; //int i = factionIdxToTick;
//for(int i=0; i<getFactionCount(); ++i) { for(int i=0; i<getFactionCount(); ++i) {
// if(canTickFaction(i) == true) { if(factionIdxToTick == -1 || i == factionIdxToTick) {
for(int j=0; j<getFaction(i)->getUnitCount(); ++j) { for(int j=0; j<getFaction(i)->getUnitCount(); ++j) {
getFaction(i)->getUnit(j)->tick(); getFaction(i)->getUnit(j)->tick();
} }
// } }
//} }
//compute resources balance //compute resources balance
int k = factionIdxToTick; //int k = factionIdxToTick;
//for(int k=0; k<getFactionCount(); ++k) { for(int k=0; k<getFactionCount(); ++k) {
//if(canTickFaction(k) == true) { if(factionIdxToTick == -1 || k == factionIdxToTick) {
Faction *faction= getFaction(k); Faction *faction= getFaction(k);
//for each resource //for each resource
@ -394,8 +395,8 @@ void World::tick() {
faction->setResourceBalance(rt, balance); faction->setResourceBalance(rt, balance);
} }
} }
//} }
//} }
if(cartographer != NULL) { if(cartographer != NULL) {
cartographer->tick(); cartographer->tick();