mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-28 10:19:55 +02:00
Code Issues Projects Releases Wiki Activity

bugfix for animation progress

Browse Source
This commit is contained in:
Mark Vejvoda
2013-06-01 03:24:06 +00:00
parent 4af65d1e19
commit 4daef05777
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/glest_game/type_instances/unit.cpp
View File

@@ -2043,13 +2043,28 @@ bool Unit::update() {
} }
if(getAnimProgressAsFloat() < targetProgress) { if(getAnimProgressAsFloat() < targetProgress) {
float diff = targetProgress - getAnimProgressAsFloat(); float diff = targetProgress - getAnimProgressAsFloat();
this->animProgress = this->animProgress + static_cast<int>(diff * 100.f) / (GameConstants::updateFps); int progressIncrease = this->animProgress + static_cast<int>(diff * 100.f) / (GameConstants::updateFps);
// Ensure we increment at least a value of 1 of the action will be stuck infinitely
if(diff > 0 && GameConstants::updateFps > 0 && progressIncrease == 0) {
progressIncrease = 1;
}
this->animProgress = progressIncrease;
} }
} }
else { else {
int speedDenominator = speedDivider * int speedDenominator = speedDivider *
game->getWorld()->getUpdateFps(this->getFactionIndex()); game->getWorld()->getUpdateFps(this->getFactionIndex());
this->animProgress += (currSkill->getAnimSpeed() * heightFactor) / speedDenominator; int progressIncrease = (currSkill->getAnimSpeed() * heightFactor) / speedDenominator;
// Ensure we increment at least a value of 1 of the action will be stuck infinitely
if(currSkill->getAnimSpeed() > 0 && heightFactor > 0 && progressIncrease == 0) {
progressIncrease = 1;
}
this->animProgress += progressIncrease;
//this->animProgress += (currSkill->getAnimSpeed() * heightFactor) / speedDenominator;
//if(currSkill->getClass() == scDie) {
// printf("Unit died progress: %d anim: %d\n",progress,this->animProgress);
//}
} }
//update target //update target
updateTarget(); updateTarget();