Unwrap Irrlicht objects in C++ instead of Guile

[guile-irrlicht.git] / irrlicht / device.scm

diff --git a/irrlicht/device.scm b/irrlicht/device.scm
index 4db0e940695cacbf2d3680ae1a61db608ceca644..97e2bbab2d207f3ffb23dfb1350464cc00e3ce2e 100644 (file)
--- a/irrlicht/device.scm
+++ b/irrlicht/device.scm
@@ -54,26 +54,27 @@
      fullscreen
      stencilbuffer
      vsync
-     (irr-pointer receiver))))
+     receiver)))
 
 (define-method (get-gui-environment (device <irrlicht-device>))
-  (make <gui-environment>
-    #:irr-pointer ((get-irrlicht-proc "getGUIEnvironment" device) (irr-pointer device))))
+  (let ((getGUIEnvironment (get-irrlicht-proc "getGUIEnvironment" device)))
+    (make <gui-environment>
+      #:irr-pointer (getGUIEnvironment device))))
 
 (define-method (get-scene-manager (device <irrlicht-device>))
   (make <scene-manager>
-    #:irr-pointer ((get-irrlicht-proc "getSceneManager" device) (irr-pointer device))))
+    #:irr-pointer ((get-irrlicht-proc "getSceneManager" device) device)))
 
 (define-method (get-video-driver (device <irrlicht-device>))
   (make <video-driver>
-    #:irr-pointer ((get-irrlicht-proc "getVideoDriver" device) (irr-pointer device))))
+    #:irr-pointer ((get-irrlicht-proc "getVideoDriver" device) device)))
 
 (define-method (run (device <irrlicht-device>))
-  ((get-irrlicht-proc "run" device) (irr-pointer device)))
+  ((get-irrlicht-proc "run" device) device))
 
 (define-method (set-window-caption! (device <irrlicht-device>) text)
   ((get-irrlicht-proc "setWindowCaption" device)
-   (irr-pointer device) text))
+   device text))
 
 (export create-device get-gui-environment get-scene-manager get-video-driver run
         set-window-caption!)