diff --git a/src/timer.cpp b/src/timer.cpp index f93d546..5fab8b1 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -9,14 +9,14 @@ using namespace std; Timer::Timer(size_t triggeramount, function myaction, milliseconds triggerinterval) :triggeramount(triggeramount) - , timeraction(myaction) + , callback(myaction) , triggerinterval(triggerinterval) {} void Timer::add_time(milliseconds deltatime) { accumulator += deltatime; if (accumulator >= triggerinterval) { accumulator -= triggerinterval; - timeraction(); + callback(); triggercount++; if (!isinfinite && triggercount >= triggeramount){ isexpired=true; diff --git a/src/timer.hpp b/src/timer.hpp index 4925515..47a6b7a 100644 --- a/src/timer.hpp +++ b/src/timer.hpp @@ -11,13 +11,14 @@ class Timer { public: size_t triggeramount; - bool isexpired = false; bool isinfinite = false; size_t triggercount = 0; - std::function timeraction; + + std::function callback; Timer(size_t triggeramount, std::function myaction, std::chrono::milliseconds triggerinterval); + void add_time(std::chrono::milliseconds deltatime); private: