refactor

[guile-irrlicht.git] / src / IrrlichtDevice.cpp

diff --git a/src/IrrlichtDevice.cpp b/src/IrrlichtDevice.cpp
index a220cac5a3e91cfa2681250ecee1b611175dcdcd..9cccd58067803b28daf69f74bd232e233ca1793d 100644 (file)
--- a/src/IrrlichtDevice.cpp
+++ b/src/IrrlichtDevice.cpp
@@ -28,7 +28,8 @@
 #include "IrrlichtDevice.h"
 #include "ISceneManager.h"
 #include "IVideoDriver.h"
-#include "util.h"
+#include "wchar.h"
+#include "wrapped.h"
 
 extern "C" {
 
@@ -37,7 +38,6 @@ extern "C" {
   {
     init_device_type ();
     scm_c_define_gsubr ("create-device", 7, 0, 0, (scm_t_subr)irr_createDevice);
-    scm_c_define_gsubr ("device-drop!", 1, 0, 0, (scm_t_subr)irr_deviceDrop);
     scm_c_define_gsubr ("get-gui-environment", 1, 0, 0, (scm_t_subr)irr_getGUIEnvironment);
     scm_c_define_gsubr ("get-scene-manager", 1, 0, 0, (scm_t_subr)irr_getSceneManager);
     scm_c_define_gsubr ("get-video-driver", 1, 0, 0, (scm_t_subr)irr_getVideoDriver);
@@ -45,7 +45,8 @@ extern "C" {
   }
 
   DEFINE_WRAPPED_TYPE (irr::IrrlichtDevice*, "device",
-                       init_device_type, wrap_device, unwrap_device);
+                       init_device_type, device_p,
+                       wrap_device, unwrap_device);
 
   SCM
   irr_createDevice (SCM deviceType,
@@ -66,13 +67,6 @@ extern "C" {
     return wrap_device (device);
   }
 
-  SCM
-  irr_deviceDrop (SCM wrapped_device)
-  {
-    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
-    return scm_from_bool (device->drop ());
-  }
-
   SCM
   irr_getGUIEnvironment (SCM wrapped_device)
   {