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

bugfix for both progress and animation smoothness

Browse Source
This commit is contained in:
Mark Vejvoda 2013-06-03 14:50:50 +00:00
parent 25450ebb85
commit 50ade6b471
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/glest_game/type_instances/faction.cpp
View File

@ -370,14 +370,14 @@ void FactionThread::execute() {
//update = true; //update = true;
if(update == true) { if(update == true) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) { if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
int updateProgressValue = unit->getUpdateProgress(); int64 updateProgressValue = unit->getUpdateProgress();
int speed = unit->getCurrSkill()->getTotalSpeed(unit->getTotalUpgrade()); int64 speed = unit->getCurrSkill()->getTotalSpeed(unit->getTotalUpgrade());
int df = unit->getDiagonalFactor(); int64 df = unit->getDiagonalFactor();
int hf = unit->getHeightFactor(); int64 hf = unit->getHeightFactor();
bool changedActiveCommand = unit->isChangedActiveCommand(); bool changedActiveCommand = unit->isChangedActiveCommand();
char szBuf[8096]=""; char szBuf[8096]="";
snprintf(szBuf,8096,"unit->needToUpdate() returned: %d updateProgressValue: %d speed: %d changedActiveCommand: %d df: %d hf: %d",update,updateProgressValue,speed,changedActiveCommand,df,hf); snprintf(szBuf,8096,"unit->needToUpdate() returned: %d updateProgressValue: %ld speed: %ld changedActiveCommand: %d df: %ld hf: %ld",update,updateProgressValue,speed,changedActiveCommand,df,hf);
unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf); unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
} }
@ -394,14 +394,14 @@ void FactionThread::execute() {
} }
else { else {
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) { if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
int updateProgressValue = unit->getUpdateProgress(); int64 updateProgressValue = unit->getUpdateProgress();
int speed = unit->getCurrSkill()->getTotalSpeed(unit->getTotalUpgrade()); int64 speed = unit->getCurrSkill()->getTotalSpeed(unit->getTotalUpgrade());
int df = unit->getDiagonalFactor(); int64 df = unit->getDiagonalFactor();
int hf = unit->getHeightFactor(); int64 hf = unit->getHeightFactor();
bool changedActiveCommand = unit->isChangedActiveCommand(); bool changedActiveCommand = unit->isChangedActiveCommand();
char szBuf[8096]=""; char szBuf[8096]="";
snprintf(szBuf,8096,"unit->needToUpdate() returned: %d updateProgressValue: %d speed: %d changedActiveCommand: %d df: %d hf: %d",update,updateProgressValue,speed,changedActiveCommand,df,hf); snprintf(szBuf,8096,"unit->needToUpdate() returned: %d updateProgressValue: %ld speed: %ld changedActiveCommand: %d df: %ld hf: %ld",update,updateProgressValue,speed,changedActiveCommand,df,hf);
unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf); unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
} }
} }