wrap Irrlicht objects in C++

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

diff --git a/src/device.cpp b/src/device.cpp
index ba00f3960f86c821a6ec22ec4420d06d5b8966ba..dbd251cc390b65d733bae8416f38446383ff62a8 100644 (file)
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -46,7 +46,7 @@ irr_createDevice (SCM device_type,
                   scm_to_bool (stencilbuffer),
                   scm_to_bool (vsync),
                   (IEventReceiver*)scm_to_irr_pointer (receiver));
-  return scm_from_pointer ((void*)device, NULL);
+  return scm_from_irr_pointer ("<irrlicht-device>", (void*) device);
 }
 
 SCM
@@ -54,7 +54,7 @@ IrrlichtDevice_getCursorControl (SCM device)
 {
   gui::ICursorControl* cursor_control =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getCursorControl ();
-  return scm_from_pointer ((void*)cursor_control, NULL);
+  return scm_from_irr_pointer ("<cursor-control>", (void*) cursor_control);
 }
 
 SCM
@@ -62,7 +62,7 @@ IrrlichtDevice_getFileSystem (SCM device)
 {
   io::IFileSystem* file_system =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getFileSystem ();
-  return scm_from_pointer ((void*)file_system, NULL);
+  return scm_from_irr_pointer ("<file-system>", (void*) file_system);
 }
 
 SCM
@@ -70,7 +70,7 @@ IrrlichtDevice_getGUIEnvironment (SCM device)
 {
   gui::IGUIEnvironment* gui_env =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getGUIEnvironment ();
-  return scm_from_pointer ((void*)gui_env, NULL);
+  return scm_from_irr_pointer ("<gui-environment>", (void*) gui_env);
 }
 
 SCM
@@ -78,7 +78,7 @@ IrrlichtDevice_getSceneManager (SCM device)
 {
   scene::ISceneManager* manager =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getSceneManager ();
-  return scm_from_pointer ((void*)manager, NULL);
+  return scm_from_irr_pointer ("<scene-manager>", (void*) manager);
 }
 
 SCM
@@ -86,7 +86,7 @@ IrrlichtDevice_getTimer (SCM device)
 {
   ITimer* timer =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getTimer ();
-  return scm_from_pointer ((void*)timer, NULL);
+  return scm_from_irr_pointer ("<timer>", (void*) timer);
 }
 
 SCM
@@ -94,7 +94,7 @@ IrrlichtDevice_getVideoDriver (SCM device)
 {
   video::IVideoDriver* driver =
     ((IrrlichtDevice*)scm_to_irr_pointer (device))->getVideoDriver ();
-  return scm_from_pointer ((void*)driver, NULL);
+  return scm_from_irr_pointer ("<video-driver>", (void*) driver);
 }
 
 SCM