summaryrefslogtreecommitdiff
path: root/src/utility.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2010-12-21 18:08:24 +0200
committerPerttu Ahola <celeron55@gmail.com>2010-12-21 18:08:24 +0200
commit3f5bad938a3fcb601ad41924a4707476b8b87241 (patch)
treeddf9d7d49a93c092c31fcbdd6bf1c2ad42e43bc8 /src/utility.cpp
parent3b0bff2f743a3abf100368f94efafa7c2843a9b7 (diff)
downloadminetest-3f5bad938a3fcb601ad41924a4707476b8b87241.tar.gz
minetest-3f5bad938a3fcb601ad41924a4707476b8b87241.tar.bz2
minetest-3f5bad938a3fcb601ad41924a4707476b8b87241.zip
organizing stuff.
Diffstat (limited to 'src/utility.cpp')
-rw-r--r--src/utility.cpp20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/utility.cpp b/src/utility.cpp
index 3da2f48d5..7126cbbdc 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -23,33 +23,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "utility.h"
#include "irrlichtwrapper.h"
+#include "gettime.h"
-TimeTaker::TimeTaker(const char *name, IrrlichtWrapper *irrlicht, u32 *result)
+TimeTaker::TimeTaker(const char *name, u32 *result)
{
m_name = name;
- m_irrlicht = irrlicht;
m_result = result;
m_running = true;
- if(irrlicht == NULL)
- {
- m_time1 = 0;
- return;
- }
- m_time1 = m_irrlicht->getTime();
+ m_time1 = getTimeMs();
}
u32 TimeTaker::stop(bool quiet)
{
if(m_running)
{
- if(m_irrlicht == NULL)
- {
- /*if(quiet == false)
- std::cout<<"Couldn't measure time for "<<m_name
- <<": irrlicht==NULL"<<std::endl;*/
- return 0;
- }
- u32 time2 = m_irrlicht->getTime();
+ u32 time2 = getTimeMs();
u32 dtime = time2 - m_time1;
if(m_result != NULL)
{