diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index 306c08017..17fa60000 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -7542,7 +7542,7 @@ INT16 GetTownTrainPtsForCharacter( SOLDIERTYPE *pTrainer, UINT16 *pusMaxPts ) // check for teaching bonuses if( gGameOptions.fNewTraitSystem ) // old/new traits - SANDRO { - sTrainingBonus -= gSkillTraitValues.bSpeedModifierTrainingMilitia; // penalty for untrained mercs + sTrainingBonus += gSkillTraitValues.bSpeedModifierTrainingMilitia; // penalty for untrained mercs // bonus for teching trait if ( HAS_SKILL_TRAIT( pTrainer, TEACHING_NT) ) diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index eaa104b82..a990bd554 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -10171,8 +10171,7 @@ INT16 GetGearAPBonus( SOLDIERTYPE * pSoldier ) { OBJECTTYPE* pObj = &pSoldier->inv[j]; - attachmentList::iterator iterend = (*pObj)[0]->attachments.begin(); - for (attachmentList::iterator iter = (*pObj)[0]->attachments.begin(); iter != iterend; ++iter) + for (attachmentList::iterator iter = (*pObj)[0]->attachments.begin(); iter != (*pObj)[0]->attachments.end(); ++iter) { if(iter->exists()) { diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp index 9ff08819b..f77531890 100644 --- a/Tactical/Points.cpp +++ b/Tactical/Points.cpp @@ -1386,19 +1386,19 @@ void UnusedAPsToBreath( SOLDIERTYPE * pSoldier ) switch( gGameOptions.ubDifficultyLevel ) { case DIF_LEVEL_EASY: - sBreathPerAP *= 9/10; // -10% + sBreathPerAP = sBreathPerAP * 9/10; // -10% break; case DIF_LEVEL_MEDIUM: - sBreathPerAP *= 1; // normal + sBreathPerAP = sBreathPerAP; // normal break; case DIF_LEVEL_HARD: - sBreathPerAP *= 11/10; // +10% + sBreathPerAP = sBreathPerAP * 11/10; // +10% break; case DIF_LEVEL_INSANE: - sBreathPerAP *= 6/5; // +20% + sBreathPerAP = sBreathPerAP * 6/5; // +20% break; default: - sBreathPerAP *= 9/10; // -10% + sBreathPerAP = sBreathPerAP * 9/10; // -10% break; } } diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index 2a010b6b6..beaa9e962 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -9934,7 +9934,7 @@ INT32 BulletImpact( SOLDIERTYPE *pFirer, BULLET *pBullet, SOLDIERTYPE * pTarget, if (pTarget->name[0] && pTarget->bVisible == TRUE) { // make stat RED for a while... - pTarget->timeChanges.uiChangeDexterityTime = GetJA2Clock(); + pTarget->timeChanges.uiChangeHealthTime = GetJA2Clock(); pTarget->usValueGoneUp &= ~( HEALTH_INCREASE ); if (bStatLoss == 1)