X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=e557217fb3a7adc36cd1742058f4a32fcdd4cba1;hb=c4d9e46f268b4f7f738dd77685c632991125cec9;hp=0022f1060fe2f7928d6313565615568ec825ffba;hpb=56bdd24ab9463c0bba4d5be87b2933e6a817ccee;p=guile-irrlicht.git

diff --git a/src/timer.cpp b/src/timer.cpp
index 0022f10..e557217 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -21,28 +21,20 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
 #include "gsubr.h"
 #include "timer.h"
 #include "wrapped.h"
 
-extern "C" {
-
-  void
-  init_timer (void)
-  {
-    init_timer_type ();
-    DEFINE_GSUBR ("get-time", 1, 0, 0, irr_getTime);
-  }
+using namespace irr;
 
-  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());
-  }
+SCM
+ITimer_getTime (SCM timer)
+{
+  return scm_from_uint32 (((ITimer*) scm_to_irr_pointer (timer))->getTime());
+}
 
+void
+init_timer (void)
+{
+  DEFINE_GSUBR ("ITimer_getTime", 1, 0, 0, ITimer_getTime);
 }