reference-counted

diff --git a/src/reference-counted.cpp b/src/reference-counted.cpp
index 1060df4b56c9d657216ace980e44190719c7df89..3e099d142419d7d91548dbbaabc4f24fb2e1f5e3 100644 (file)
--- a/src/reference-counted.cpp
+++ b/src/reference-counted.cpp
@@ -21,38 +21,28 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
-#include "device.h"
 #include "gsubr.h"
 #include "reference-counted.h"
-#include "scene-node-animator.h"
+
+
+using namespace irr;
+
+
+template <typename T>
+SCM
+IReferenceCounted_drop (SCM obj)
+{
+  return scm_from_bool (((T) scm_to_pointer (obj))->drop ());
+}
+
 
 extern "C" {
 
   void
   init_reference_counted (void)
   {
-    DEFINE_GSUBR ("drop!", 1, 0, 0, irr_drop);
-  }
-
-  SCM
-  irr_drop (SCM wrapped_obj)
-  {
-    bool result = 0;
-    if (device_p (wrapped_obj))
-      {
-        result = unwrap_device (wrapped_obj)->drop ();
-      }
-    else if (scene_node_animator_p (wrapped_obj))
-      {
-        result = unwrap_scene_node_animator (wrapped_obj)->drop ();
-      }
-    else
-      {
-        scm_error (scm_arg_type_key, NULL, "Object cannot be dropped: ~S",
-                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
-      }
-    return scm_from_bool (result);
+    DEFINE_GSUBR ("IReferenceCounted_drop_IrrlichtDevice", 1, 0, 0,
+                  IReferenceCounted_drop<IrrlichtDevice*>);
   }
 
 }

diff --git a/src/reference-counted.h b/src/reference-counted.h
index f2a261315983051dc1f1cf3409d3017a05126daf..13d84373b689a73993c5c6a3074e403d4b086a9f 100644 (file)
--- a/src/reference-counted.h
+++ b/src/reference-counted.h
@@ -26,13 +26,8 @@
 #include <libguile.h>
 
 extern "C" {
-
   void
   init_reference_counted (void);
-
-  SCM
-  irr_drop (SCM wrapped_obj);
-
 }
 
 #endif