From 51287042b67b768e0f448239e23c68165d85bb12 Mon Sep 17 00:00:00 2001 From: LindseyB Date: Sun, 24 Oct 2010 14:20:56 -0400 Subject: [PATCH] updated miss bar counter --- dataScore.d | 6 +++++- levelScreen.d | 3 ++- warningBar.d | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dataScore.d b/dataScore.d index 1d2ca9f..bf644d9 100644 --- a/dataScore.d +++ b/dataScore.d @@ -18,6 +18,10 @@ class DataScore { _score += value; } + void setScore(int value) { + _score = value; + } + void draw() { int x = 0; int y = 0; @@ -40,7 +44,7 @@ class DataScore { move(y,x); - addstr(toStringz(("# Score: " ~ to!(char)(_score)))); + addstr(toStringz(("# Score: " ~ to!(char[])(_score)))); move(y,59); addch('#'); diff --git a/levelScreen.d b/levelScreen.d index 3927f57..b5cd5f1 100644 --- a/levelScreen.d +++ b/levelScreen.d @@ -38,7 +38,8 @@ class LevelScreen { } void draw(bool fast) { - updateWarningBar(_arrowSect.misses, _arrowSect.good+g_arrowSect.great); + _score.setScore((-50*_arrowSect.misses) + (100*_arrowSect.good) + (200*_arrowSect.great)); + _warningBar.updateWarningBar(_arrowSect.misses, (_arrowSect.good + _arrowSect.great)); move(0,0); _score.draw(); diff --git a/warningBar.d b/warningBar.d index 3ee1cba..e6bceae 100644 --- a/warningBar.d +++ b/warningBar.d @@ -11,16 +11,16 @@ class WarningBar { _level = 0; } - void updateWarningBar(int misses, int succeses){ - _level = _level - misses + successes; + void updateWarningBar(int misses, int successes){ + _level += misses - successes; } void draw() { - move(127, 0); + move(0,120); for(int i=0; i<_level; i++){ - addstr("---"); - move(127, i); + addstr(toStringz("---")); + move(i,120); } } }