X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fposition2d.cpp;h=4d063d434b51bc9b35fdd2fbd16821a52b736418;hb=79e12d94cc21232477796a4e76fc2ddb5d88f9dc;hp=16c44bc50672b742c096835829fc1268018039a2;hpb=2cdd08f70b0a58b2f00b341df5b73704d3febd47;p=guile-irrlicht.git

diff --git a/src/position2d.cpp b/src/position2d.cpp
index 16c44bc..4d063d4 100644
--- a/src/position2d.cpp
+++ b/src/position2d.cpp
@@ -23,22 +23,27 @@
 #include <libguile.h>
 #include "position2d.h"
 
-extern "C" {
-
-  irr::core::position2d<irr::f32>
-  scm_to_position2d_f32 (SCM position2d)
-  {
-    return irr::core::position2d<irr::f32>
-      (scm_to_double (scm_car (position2d)),
-       scm_to_double (scm_cadr (position2d)));
-  }
-
-  irr::core::position2d<irr::s32>
-  scm_to_position2d_s32 (SCM position2d)
-  {
-    return irr::core::position2d<irr::s32>
-      (scm_to_int32 (scm_car (position2d)),
-       scm_to_int32 (scm_cadr (position2d)));
-  }
+using namespace irr;
 
+SCM
+scm_from_position2d_s32 (core::position2d<s32> position2d)
+{
+  return scm_list_2 (scm_from_int32 (position2d.X),
+                     scm_from_int32 (position2d.Y));
+}
+
+core::position2d<f32>
+scm_to_position2d_f32 (SCM position2d)
+{
+  return core::position2d<f32>
+    (scm_to_double (scm_car (position2d)),
+     scm_to_double (scm_cadr (position2d)));
+}
+
+core::position2d<s32>
+scm_to_position2d_s32 (SCM position2d)
+{
+  return core::position2d<s32>
+    (scm_to_int32 (scm_car (position2d)),
+     scm_to_int32 (scm_cadr (position2d)));
 }