fix char related code

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

diff --git a/src/vertex3d.cpp b/src/vertex3d.cpp
index d7629eafc43f5c7ba3ce720b819df45d5da4418d..2bc305c524f5624146bd3e92d6d15cc759b50c87 100644 (file)
--- a/src/vertex3d.cpp
+++ b/src/vertex3d.cpp
@@ -26,11 +26,10 @@
 #include "vector2d.h"
 #include "vector3d.h"
 #include "vertex3d.h"
-
+#include "wrapped.h"
 
 using namespace irr;
 
-
 SCM
 video_S3DVertex_make (SCM position,
                       SCM normal,
@@ -45,30 +44,23 @@ video_S3DVertex_make (SCM position,
   return scm_from_pointer ((void*) vertex, NULL);
 }
 
-
 SCM
 video_S3DVertex_Pos (SCM vertex) {
-  video::S3DVertex* s3dvertex = (video::S3DVertex*) scm_to_pointer (vertex);
+  video::S3DVertex* s3dvertex = (video::S3DVertex*) scm_to_irr_pointer (vertex);
   return scm_from_vector3df (s3dvertex->Pos);
 }
 
-
-extern "C" {
-
-  void
-  init_vertex3d (void)
-  {
-    DEFINE_GSUBR ("video_S3DVertex_make", 4, 0, 0, video_S3DVertex_make);
-    DEFINE_GSUBR ("video_S3DVertex_Pos", 1, 0, 0, video_S3DVertex_Pos);
-  }
-
+void
+init_vertex3d (void)
+{
+  DEFINE_GSUBR ("video_S3DVertex_make", 4, 0, 0, video_S3DVertex_make);
+  DEFINE_GSUBR ("video_S3DVertex_Pos", 1, 0, 0, video_S3DVertex_Pos);
 }
 
-
 video::E_VERTEX_TYPE
 scm_to_vertex_type (SCM vertex_type)
 {
-  char* type = scm_to_utf8_stringn (scm_symbol_to_string (vertex_type), NULL);
+  char* type = scm_to_utf8_string (scm_symbol_to_string (vertex_type));
   if (!strcmp (type, "standard"))
     {
       return video::EVT_STANDARD;