timer

diff --git a/src/timer.cpp b/src/timer.cpp
index 0022f1060fe2f7928d6313565615568ec825ffba..48ea549e1c234f0e557e854723b5630858d8ef62 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -21,28 +21,26 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
 #include "gsubr.h"
 #include "timer.h"
-#include "wrapped.h"
+
+
+using namespace irr;
+
+
+SCM
+ITimer_getTime (SCM timer)
+{
+  return scm_from_uint32 (((ITimer*) scm_to_pointer (timer))->getTime());
+}
+
 
 extern "C" {
 
   void
   init_timer (void)
   {
-    init_timer_type ();
-    DEFINE_GSUBR ("get-time", 1, 0, 0, irr_getTime);
-  }
-
-  DEFINE_WRAPPED_TYPE (irr::ITimer*, "timer",
-                       init_timer_type, timer_p,
-                       wrap_timer, unwrap_timer);
-
-  SCM
-  irr_getTime (SCM wrapped_timer)
-  {
-    return scm_from_uint32 (unwrap_timer (wrapped_timer)->getTime());
+    DEFINE_GSUBR ("ITimer_getTime", 1, 0, 0, ITimer_getTime);
   }
 
 }

diff --git a/src/timer.h b/src/timer.h
index 0187e94e42b79aab2b1c095f206bb622e89b6403..fbae584b36388543c6e136ae9a8d89addc49b0a4 100644 (file)
--- a/src/timer.h
+++ b/src/timer.h
@@ -22,21 +22,9 @@
 #ifndef __GUILE_IRRLICHT_TIMER_H_INCLUDED__
 #define __GUILE_IRRLICHT_TIMER_H_INCLUDED__
 
-#include <irrlicht/irrlicht.h>
-#include <libguile.h>
-#include "wrapped.h"
-
 extern "C" {
-
   void
   init_timer (void);
-
-  DECLARE_WRAPPED_TYPE (irr::ITimer*, init_timer_type,
-                        timer_p, wrap_timer, unwrap_timer);
-
-  SCM
-  irr_getTime (SCM wrapped_timer);
-
 }
 
 #endif