X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fdevice.cpp;fp=src%2Fdevice.cpp;h=503f11c2b54becab87f90b112d558e225abb5429;hb=c4d9e46f268b4f7f738dd77685c632991125cec9;hp=55c752fec4b1866a097dfd86a2169601d91297c2;hpb=6bcbb2cefb0e69afae9b1de828b85f506b1bef19;p=guile-irrlicht.git

diff --git a/src/device.cpp b/src/device.cpp
index 55c752f..503f11c 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -26,6 +26,7 @@
 #include "driver-types.h"
 #include "gsubr.h"
 #include "wchar.h"
+#include "wrapped.h"
 
 using namespace irr;
 
@@ -45,7 +46,7 @@ irr_createDevice (SCM device_type,
                   scm_to_bool (fullscreen),
                   scm_to_bool (stencilbuffer),
                   scm_to_bool (vsync),
-                  (IEventReceiver*)scm_to_pointer (receiver));
+                  (IEventReceiver*)scm_to_irr_pointer (receiver));
   return scm_from_pointer ((void*)device, NULL);
 }
 
@@ -53,7 +54,7 @@ SCM
 IrrlichtDevice_getCursorControl (SCM device)
 {
   gui::ICursorControl* cursor_control =
-    ((IrrlichtDevice*)scm_to_pointer (device))->getCursorControl ();
+    ((IrrlichtDevice*)scm_to_irr_pointer (device))->getCursorControl ();
   return scm_from_pointer ((void*)cursor_control, NULL);
 }
 
@@ -61,7 +62,7 @@ SCM
 IrrlichtDevice_getFileSystem (SCM device)
 {
   io::IFileSystem* file_system =
-    ((IrrlichtDevice*)scm_to_pointer (device))->getFileSystem ();
+    ((IrrlichtDevice*)scm_to_irr_pointer (device))->getFileSystem ();
   return scm_from_pointer ((void*)file_system, NULL);
 }
 
@@ -69,7 +70,7 @@ SCM
 IrrlichtDevice_getGUIEnvironment (SCM device)
 {
   gui::IGUIEnvironment* gui_env =
-    ((IrrlichtDevice*)scm_to_pointer (device))->getGUIEnvironment ();
+    ((IrrlichtDevice*)scm_to_irr_pointer (device))->getGUIEnvironment ();
   return scm_from_pointer ((void*)gui_env, NULL);
 }
 
@@ -77,7 +78,7 @@ SCM
 IrrlichtDevice_getSceneManager (SCM device)
 {
   scene::ISceneManager* manager =
-    ((IrrlichtDevice*)scm_to_pointer (device))->getSceneManager ();
+    ((IrrlichtDevice*)scm_to_irr_pointer (device))->getSceneManager ();
   return scm_from_pointer ((void*)manager, NULL);
 }
 
@@ -85,7 +86,7 @@ SCM
 IrrlichtDevice_getTimer (SCM device)
 {
   ITimer* timer =
-    ((IrrlichtDevice*)scm_to_pointer (device))->getTimer ();
+    ((IrrlichtDevice*)scm_to_irr_pointer (device))->getTimer ();
   return scm_from_pointer ((void*)timer, NULL);
 }
 
@@ -93,7 +94,7 @@ SCM
 IrrlichtDevice_getVideoDriver (SCM device)
 {
   video::IVideoDriver* driver =
-    ((IrrlichtDevice*)scm_to_pointer (device))->getVideoDriver ();
+    ((IrrlichtDevice*)scm_to_irr_pointer (device))->getVideoDriver ();
   return scm_from_pointer ((void*)driver, NULL);
 }
 
@@ -101,14 +102,14 @@ SCM
 IrrlichtDevice_isWindowActive (SCM device)
 {
   return scm_from_bool
-    (((IrrlichtDevice*)scm_to_pointer (device))->isWindowActive ());
+    (((IrrlichtDevice*)scm_to_irr_pointer (device))->isWindowActive ());
 }
 
 SCM
 IrrlichtDevice_run (SCM device)
 {
   return scm_from_bool
-    (((IrrlichtDevice*)scm_to_pointer (device))->run ());
+    (((IrrlichtDevice*)scm_to_irr_pointer (device))->run ());
 }
 
 template <typename TEventReceiver>
@@ -116,8 +117,8 @@ SCM
 IrrlichtDevice_setEventReceiver (SCM device,
                                  SCM receiver)
 {
-  ((IrrlichtDevice*)scm_to_pointer (device))->
-    setEventReceiver ((TEventReceiver)scm_to_pointer (receiver));
+  ((IrrlichtDevice*)scm_to_irr_pointer (device))->
+    setEventReceiver ((TEventReceiver)scm_to_irr_pointer (receiver));
   return SCM_UNSPECIFIED;
 }
 
@@ -125,7 +126,7 @@ SCM
 IrrlichtDevice_setResizable (SCM device,
                              SCM resize)
 {
-  ((IrrlichtDevice*)scm_to_pointer (device))->
+  ((IrrlichtDevice*)scm_to_irr_pointer (device))->
     setResizable (scm_to_bool (resize));
   return SCM_UNSPECIFIED;
 }
@@ -134,7 +135,7 @@ SCM
 IrrlichtDevice_setWindowCaption (SCM device,
                                  SCM text)
 {
-  ((IrrlichtDevice*)scm_to_pointer (device))->
+  ((IrrlichtDevice*)scm_to_irr_pointer (device))->
     setWindowCaption (scm_to_wide_char_string (text));
   return SCM_UNSPECIFIED;
 }
@@ -142,7 +143,7 @@ IrrlichtDevice_setWindowCaption (SCM device,
 SCM
 IrrlichtDevice_yield (SCM device)
 {
-  ((IrrlichtDevice*)scm_to_pointer (device))->yield ();
+  ((IrrlichtDevice*)scm_to_irr_pointer (device))->yield ();
   return SCM_UNSPECIFIED;
 }