// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
-#include "utils/lispreader.h"
-#include "utils/lispwriter.h"
-#include "video/drawing_context.h"
-#include "app/gettext.h"
-#include "app/globals.h"
-#include "resources.h"
-#include "statistics.h"
+#include <config.h>
+
+#include "video/drawing_context.hpp"
+#include "gettext.hpp"
+#include "lisp/lisp.hpp"
+#include "resources.hpp"
+#include "main.hpp"
+#include "statistics.hpp"
Statistics global_stats;
Statistics::Statistics()
{
- timer.init(true);
display_stat = 1;
for(int i = 0; i < NUM_STATS; i++)
}
void
-Statistics::parse(LispReader& reader)
+Statistics::parse(const lisp::Lisp& reader)
{
- for(int i = 0; i < NUM_STATS; i++)
- {
- reader.read_int(stat_name_to_string(i).c_str(), stats[i][SPLAYER]);
- reader.read_int((stat_name_to_string(i) + "-total").c_str(), stats[i][STOTAL]);
- }
+ for(int i = 0; i < NUM_STATS; i++) {
+ reader.get(stat_name_to_string(i).c_str(), stats[i][SPLAYER]);
+ reader.get((stat_name_to_string(i) + "-total").c_str(), stats[i][STOTAL]);
+ }
}
void
-Statistics::write(LispWriter& writer)
+Statistics::write(lisp::Writer& writer)
{
- for(int i = 0; i < NUM_STATS; i++)
- {
+ for(int i = 0; i < NUM_STATS; i++) {
writer.write_int(stat_name_to_string(i), stats[i][SPLAYER]);
writer.write_int(stat_name_to_string(i) + "-total", stats[i][STOTAL]);
- }
+ }
}
#define TOTAL_DISPLAY_TIME 3400
if(stats[SCORE_STAT][SPLAYER] == -1) // not initialized yet
return;
- if(!timer.check())
+ if(timer.check())
{
timer.start(TOTAL_DISPLAY_TIME);
display_stat++;
// draw other small info
int alpha;
- if(timer.get_gone() < FADING_TIME)
- alpha = timer.get_gone() * 255 / FADING_TIME;
- else if(timer.get_left() < FADING_TIME)
- alpha = timer.get_left() * 255 / FADING_TIME;
+ if(timer.get_timegone() < FADING_TIME)
+ alpha = int(timer.get_timegone() * 255 / FADING_TIME);
+ else if(timer.get_timeleft() < FADING_TIME)
+ alpha = int(timer.get_timeleft() * 255 / FADING_TIME);
else
alpha = 255;
if(stats[SCORE_STAT][SPLAYER] == -1) // not initialized yet
return;
- context.draw_text(gold_text, title, Vector(screen->w/2, 410), CENTER_ALLIGN, LAYER_GUI);
+ context.draw_text(gold_text, title, Vector(SCREEN_WIDTH/2, 410), CENTER_ALLIGN, LAYER_GUI);
char str[128];
sprintf(str, _( "Max score: %d"), stats[SCORE_STAT][SPLAYER]);
- context.draw_text(white_text, str, Vector(screen->w/2, 450), CENTER_ALLIGN, LAYER_GUI);
+ context.draw_text(white_text, str, Vector(SCREEN_WIDTH/2, 450), CENTER_ALLIGN, LAYER_GUI);
for(int i = 1; i < NUM_STATS; i++)
{
stats[TIME_NEEDED_STAT][STOTAL]);
- context.draw_text(white_small_text, str, Vector(screen->w/2, 462 + i*18), CENTER_ALLIGN, LAYER_GUI);
+ context.draw_text(white_small_text, str, Vector(SCREEN_WIDTH/2, 462 + i*18), CENTER_ALLIGN, LAYER_GUI);
}
}