X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fdevice.scm;h=0fdeed7ffecad1484d7e473a6e497a87ed654f7e;hb=d5b9b4c374ea66da84610d1e6124bd0773e87348;hp=e5eac5a5b460c616d51ebc4b58fd02374ad58ba1;hpb=7ef67d269cc1f6d9f9c58583c100d761d77801d8;p=guile-irrlicht.git

diff --git a/irrlicht/device.scm b/irrlicht/device.scm
index e5eac5a..0fdeed7 100644
--- a/irrlicht/device.scm
+++ b/irrlicht/device.scm
@@ -29,6 +29,10 @@
 (define-class <irrlicht-device> (<reference-counted>)
   (irr-class #:init-value "IrrlichtDevice"))
 
+(define-method (close-device (device <irrlicht-device>))
+  (let ((closeDevice (get-irrlicht-proc "closeDevice" device)))
+    (closeDevice device)))
+
 (define* (create-device #:key
                         (device-type 'software)
                         (window-size '(640 480))
@@ -45,10 +49,9 @@
   (let* ((createDevice (get-irrlicht-proc "createDevice"))
          (device (createDevice device-type window-size bits fullscreen stencilbuffer
                                vsync receiver)))
-    (cond ((null-object? device)
-           (error "In procedure create-device: Device cannot be created"))
-          (else
-           device))))
+    (if (null-object? device)
+        (error "In procedure create-device: Device cannot be created")
+        device)))
 
 (define-method (get-cursor-control (device <irrlicht-device>))
   (let ((getCursorControl (get-irrlicht-proc "getCursorControl" device)))
@@ -71,8 +74,11 @@
     (getTimer device)))
 
 (define-method (get-video-driver (device <irrlicht-device>))
-  (let ((getVideoDriver (get-irrlicht-proc "getVideoDriver" device)))
-    (getVideoDriver device)))
+  (let* ((getVideoDriver (get-irrlicht-proc "getVideoDriver" device))
+         (driver (getVideoDriver device)))
+    (if (null-object? driver)
+        (error "In procedure get-video-driver: Driver unavailable")
+        driver)))
 
 (define-method (is-window-active? (device <irrlicht-device>))
   (let ((isWindowActive (get-irrlicht-proc "isWindowActive" device)))
@@ -97,6 +103,6 @@
   (let ((yield (get-irrlicht-proc "yield" device)))
     (yield device)))
 
-(export <irrlicht-device> create-device get-cursor-control get-file-system get-gui-environment
-        get-scene-manager get-timer get-video-driver is-window-active? run set-event-receiver!
-        set-resizable! set-window-caption! yield-device)
+(export <irrlicht-device> close-device create-device get-cursor-control get-file-system
+        get-gui-environment get-scene-manager get-timer get-video-driver is-window-active? run
+        set-event-receiver! set-resizable! set-window-caption! yield-device)