Merge pull request #117 from mad-s/master

Fix #116
This commit is contained in:
Jeffrey Han 2015-08-09 13:52:19 -05:00
commit 4195bb1a8c

View File

@ -1037,10 +1037,13 @@ public class GameData {
* or {@code Grade.NULL} if no objects have been processed. * or {@code Grade.NULL} if no objects have been processed.
*/ */
private Grade getGrade() { private Grade getGrade() {
boolean silver = scoreData==null?
(GameMod.HIDDEN.isActive() || GameMod.FLASHLIGHT.isActive()):
(scoreData.mods&(GameMod.HIDDEN.getBit()|GameMod.FLASHLIGHT.getBit()))!=0;
return getGrade( return getGrade(
hitResultCount[HIT_300], hitResultCount[HIT_100], hitResultCount[HIT_300], hitResultCount[HIT_100],
hitResultCount[HIT_50], hitResultCount[HIT_MISS], hitResultCount[HIT_50], hitResultCount[HIT_MISS],
(GameMod.HIDDEN.isActive() || GameMod.FLASHLIGHT.isActive()) silver
); );
} }