attempt to support HitCircleOverlap and ScoreOverlap (#4)

This commit is contained in:
yugecin 2016-09-30 16:13:23 +02:00
parent 19f4e5f11d
commit 965f88ecc3

View File

@ -498,7 +498,7 @@ public class GameData {
*/ */
public void drawSymbolNumber(int n, float x, float y, float scale, float alpha) { public void drawSymbolNumber(int n, float x, float y, float scale, float alpha) {
int length = (int) (Math.log10(n) + 1); int length = (int) (Math.log10(n) + 1);
float digitWidth = getDefaultSymbolImage(0).getWidth() * scale; float digitWidth = (getDefaultSymbolImage(0).getWidth() - Options.getSkin().getHitCircleFontOverlap()) * scale;
float cx = x + ((length - 1) * (digitWidth / 2)); float cx = x + ((length - 1) * (digitWidth / 2));
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
@ -527,7 +527,7 @@ public class GameData {
Image digit = getScoreSymbolImage(c[i]); Image digit = getScoreSymbolImage(c[i]);
if (scale != 1.0f) if (scale != 1.0f)
digit = digit.getScaledCopy(scale); digit = digit.getScaledCopy(scale);
cx -= digit.getWidth(); cx -= digit.getWidth() + Options.getSkin().getScoreFontOverlap();
digit.setAlpha(alpha); digit.setAlpha(alpha);
digit.draw(cx, y); digit.draw(cx, y);
digit.setAlpha(1f); digit.setAlpha(1f);
@ -540,7 +540,7 @@ public class GameData {
digit.setAlpha(alpha); digit.setAlpha(alpha);
digit.draw(cx, y); digit.draw(cx, y);
digit.setAlpha(1f); digit.setAlpha(1f);
cx += digit.getWidth(); cx += digit.getWidth() - Options.getSkin().getScoreFontOverlap();
} }
} }
} }