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

- more general bugfixes (not all upgrade values were being used in the code)

Browse Source
This commit is contained in:
SoftCoder
2014-12-21 21:07:24 -08:00
parent 3705d56057
commit f97f0ef852
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/graphics/renderer.cpp
View File

@@ -8425,7 +8425,7 @@ void Renderer::renderHealthBar(Vec3f v, Unit *unit, float height, bool lineBorde
int barCount=0; int barCount=0;
float hp=unit->getHpRatio(); float hp=unit->getHpRatio();
float ep=-1.f; float ep=-1.f;
if(unit->getType()->getMaxEp()!=0){ if(unit->getType()->getTotalMaxEp(unit->getTotalUpgrade()) !=0 ) {
ep=unit->getEpRatio(); ep=unit->getEpRatio();
numberOfBars++; numberOfBars++;
} }

1
source/glest_game/menu/menu_state_connected_game.cpp
View File

@@ -482,7 +482,6 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
buttonPlayNow.init(buttonx, buttony, 125); buttonPlayNow.init(buttonx, buttony, 125);
buttonPlayNow.setText(lang.getString("PlayNow")); buttonPlayNow.setText(lang.getString("PlayNow"));
buttonPlayNow.setVisible(false); buttonPlayNow.setVisible(false);
buttonx+=130;
// write hint to console: // write hint to console:

1
source/glest_game/menu/menu_state_custom_game.cpp
View File

@@ -221,7 +221,6 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow"); buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow");
buttonPlayNow.init(buttonx, buttony, 125); buttonPlayNow.init(buttonx, buttony, 125);
buttonx+=130;
labelLocalGameVersion.registerGraphicComponent(containerName,"labelLocalGameVersion"); labelLocalGameVersion.registerGraphicComponent(containerName,"labelLocalGameVersion");
labelLocalGameVersion.init(10, networkHeadPos+labelOffset); labelLocalGameVersion.init(10, networkHeadPos+labelOffset);

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

@@ -1220,7 +1220,7 @@ void Faction::applyCostsOnInterval(const ResourceType *rtApply) {
//decrease unit hp //decrease unit hp
if(scriptManager->getPlayerModifiers(this->index)->getConsumeEnabled() == true) { if(scriptManager->getPlayerModifiers(this->index)->getConsumeEnabled() == true) {
bool decHpResult = unit->decHp(unit->getType()->getMaxHp() / 3); bool decHpResult = unit->decHp(unit->getType()->getTotalMaxHp(unit->getTotalUpgrade()) / 3);
if(decHpResult) { if(decHpResult) {
unit->setCauseOfDeath(ucodStarvedResource); unit->setCauseOfDeath(ucodStarvedResource);
world->getStats()->die(unit->getFactionIndex(),unit->getType()->getCountUnitDeathInStats()); world->getStats()->die(unit->getFactionIndex(),unit->getType()->getCountUnitDeathInStats());

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

@@ -1050,7 +1050,7 @@ float Unit::getEpRatio() const {
throw megaglest_runtime_error(szBuf); throw megaglest_runtime_error(szBuf);
} }
if(type->getMaxHp() == 0) { if(type->getTotalMaxHp(&totalUpgrade) == 0) {
return 0.f; return 0.f;
} }
else { else {
@@ -3199,11 +3199,11 @@ void Unit::tick() {
} }
//regenerate hp //regenerate hp
else { else {
if(type->getHpRegeneration() >= 0) { if(type->getTotalMaxHpRegeneration(&totalUpgrade) >= 0) {
if( currSkill->getClass() != scBeBuilt){ if( currSkill->getClass() != scBeBuilt){
checkItemInVault(&this->hp,this->hp); checkItemInVault(&this->hp,this->hp);
int original_hp = this->hp; int original_hp = this->hp;
this->hp += type->getHpRegeneration(); this->hp += type->getTotalMaxHpRegeneration(&totalUpgrade);
if(this->hp > type->getTotalMaxHp(&totalUpgrade)) { if(this->hp > type->getTotalMaxHp(&totalUpgrade)) {
this->hp = type->getTotalMaxHp(&totalUpgrade); this->hp = type->getTotalMaxHp(&totalUpgrade);
} }
@@ -3220,7 +3220,7 @@ void Unit::tick() {
} }
// If we have negative regeneration then check if the unit should die // If we have negative regeneration then check if the unit should die
else { else {
bool decHpResult = decHp(-type->getHpRegeneration()); bool decHpResult = decHp(-type->getTotalMaxHpRegeneration(&totalUpgrade));
if(decHpResult) { if(decHpResult) {
this->setCauseOfDeath(ucodStarvedRegeneration); this->setCauseOfDeath(ucodStarvedRegeneration);
@@ -4262,7 +4262,7 @@ void Unit::checkCustomizedParticleTriggers(bool force) {
} }
void Unit::startDamageParticles() { void Unit::startDamageParticles() {
if(hp < type->getMaxHp() / 2 && hp > 0 && alive == true) { if(hp < type->getTotalMaxHp(&totalUpgrade) / 2 && hp > 0 && alive == true) {
//start additional particles //start additional particles
if( showUnitParticles && if( showUnitParticles &&
type->damageParticleSystemTypes.empty() == false ) { type->damageParticleSystemTypes.empty() == false ) {

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

@@ -1463,7 +1463,7 @@ void TotalUpgrade::deapply(int sourceUnitId, const UpgradeTypeBase *ut,int destU
sourceUnitId,destUnitId,ut->toString().c_str()); sourceUnitId,destUnitId,ut->toString().c_str());
for(unsigned int index = 0; index < boostUpgrades.size(); ++index) { for(unsigned int index = 0; index < boostUpgrades.size(); ++index) {
TotalUpgrade *boost = boostUpgrades[index]; TotalUpgrade *boost = boostUpgrades[index];
printf("\nBoost #%d\n%s\n",index,boost->toString().c_str()); printf("\nBoost #%u\n%s\n",index,boost->toString().c_str());
} }
} }
} }