Unwrap Irrlicht objects in C++ instead of Guile

[guile-irrlicht.git] / src / file-system.cpp

diff --git a/src/file-system.cpp b/src/file-system.cpp
index 76892ef7a74ac78a86113ff06659b36b5b996b2d..fe9b062d6e060b3fd268dfb0fb17526d5a18c189 100644 (file)
--- a/src/file-system.cpp
+++ b/src/file-system.cpp
@@ -24,21 +24,20 @@
 #include "file-archive.h"
 #include "file-system.h"
 #include "gsubr.h"
-
+#include "wrapped.h"
 
 using namespace irr;
 
-
 SCM
-io_IFileSystem_addFileArchive (SCM file_system,
-                               SCM filename,
-                               SCM ignore_case,
-                               SCM ignore_paths,
-                               SCM archive_type,
-                               SCM password,
-                               SCM ret_archive)
+IFileSystem_addFileArchive (SCM file_system,
+                            SCM filename,
+                            SCM ignore_case,
+                            SCM ignore_paths,
+                            SCM archive_type,
+                            SCM password,
+                            SCM ret_archive)
 {
-  io::IFileArchive* retArchive = (io::IFileArchive*)scm_to_pointer (ret_archive);
+  io::IFileArchive* retArchive = (io::IFileArchive*)scm_to_irr_pointer (ret_archive);
   io::IFileArchive** retArchiveReference = 0;
   if (retArchive != NULL)
     {
@@ -46,7 +45,7 @@ io_IFileSystem_addFileArchive (SCM file_system,
     }
 
   return scm_from_bool
-    (((io::IFileSystem*)scm_to_pointer (file_system))->
+    (((io::IFileSystem*)scm_to_irr_pointer (file_system))->
      addFileArchive (scm_to_utf8_stringn (filename, NULL),
                      scm_to_bool (ignore_case),
                      scm_to_bool (ignore_paths),
@@ -55,13 +54,8 @@ io_IFileSystem_addFileArchive (SCM file_system,
                      retArchiveReference));
 }
 
-
-extern "C" {
-
-  void
-  init_file_system (void)
-  {
-    DEFINE_GSUBR ("io_IFileSystem_addFileArchive", 7, 0, 0, io_IFileSystem_addFileArchive);
-  }
-
+void
+init_file_system (void)
+{
+  DEFINE_GSUBR ("IFileSystem_addFileArchive", 7, 0, 0, IFileSystem_addFileArchive);
 }