X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fstatistics.cpp;h=dc3e83a2e9e351cef0ae87bdddb50d1406b1d456;hb=5cd159000d29713fa4106634842b271f65c6ad1b;hp=0b1498dc12e558acaadc01e05d2b5e8634013511;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git diff --git a/src/statistics.cpp b/src/statistics.cpp index 0b1498dc1..dc3e83a2e 100644 --- a/src/statistics.cpp +++ b/src/statistics.cpp @@ -19,11 +19,10 @@ #include -#include "utils/lispreader.h" -#include "utils/lispwriter.h" #include "video/drawing_context.h" #include "app/gettext.h" #include "app/globals.h" +#include "lisp/lisp.h" #include "resources.h" #include "statistics.h" @@ -70,23 +69,21 @@ Statistics::~Statistics() } 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