Fix skill time calculation

Fixes #17
Kev · Feb 2, 2014 · 31f7134 · 31f7134
1 parent 8727c16
commit 31f7134
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Controllers/SkillLevel.cpp b/Controllers/SkillLevel.cpp
@@ -39,13 +39,11 @@ int SkillLevel::getSkillPointsForLevel() const {
 }
 
 int SkillLevel::getSkillPointsTrained() const {
-	return (skillPoints_ >= 0) ? skillPoints_ : rawLevelPoints(level_);
+	return (skillPoints_ >= 0) ? skillPoints_ : (rawLevelPoints(level_ - 1) * getSkill()->getRank());
 }
 
 int SkillLevel::getRemainingSkillPoints() const {
-	int multiplier = getSkill()->getRank();
 	int points = getSkillPointsForLevel() - getSkillPointsTrained();
-	points *= multiplier;
 	return points;
 }
 

diff --git a/Controllers/SkillTime.h b/Controllers/SkillTime.h
@@ -27,6 +27,7 @@ namespace EveXin {
 				if (attributeModifier == 0) {
 					// Something has gone badly wrong. Perhaps corrupt character data,
 					// or skills that don't exist any more. Regardless, let's not blow up.
+					std::cerr << "WARNING: attribute modifier error" << std::endl;
 					attributeModifier = 1;
 				}
 				float minutes = pointsNeeded / attributeModifier;