X-Git-Url: https://git.jsancho.org/?p=dungeon-master.git;a=blobdiff_plain;f=src%2Fmods.cpp;h=7b9115e6320618ce749112f79ec9a15203e2c8a5;hp=06a5b2fc67244e76eeda8296fb355410165ac159;hb=4fce641cc077d18f972e250d2fe3be5067618127;hpb=602500ffe32004dc0437ed55ac2d25ec69fc9e25

diff --git a/src/mods.cpp b/src/mods.cpp
index 06a5b2f..7b9115e 100644
--- a/src/mods.cpp
+++ b/src/mods.cpp
@@ -16,56 +16,74 @@
 */
 
 #include <dirent.h>
-#include <iostream>
 #include <libguile.h>
 #include "generators.h"
 #include "mods.h"
 #include "paths.h"
 
-
-SCM register_scene_generator(SCM name, SCM type, SCM proc)
+SCM
+register_scene_generator (SCM name,
+                          SCM type,
+                          SCM proc)
 {
-  SceneGenerator generator {scm_to_locale_string(name), scm_to_locale_string(type), proc };
-  register_generator(generator);
-  printf ("Register: %s (%s)\n", generator.name.c_str(), generator.type.c_str());
-  scm_call_1(proc, scm_from_int(-1));
+  SceneGenerator* generator =
+    register_generator (scm_to_utf8_string (name),
+                        scm_to_utf8_string (scm_symbol_to_string (type)),
+                        proc);
+  printf ("Register: %s (%s)\n", generator->name, generator->type);
+  scm_call_1 (generator->proc, scm_from_int (-1));
   return SCM_UNSPECIFIED;
 }
 
-void init_dungeon_master_module(void *unused)
+void
+init_dungeon_master_module (void *unused)
+{
+  scm_c_define_gsubr ("register-scene-generator", 3, 0, 0, (scm_t_subr) register_scene_generator);
+  scm_c_export ("register-scene-generator", NULL);
+}
+
+void
+scm_init_dungeon_master_module ()
 {
-  scm_c_define_gsubr("register-scene-generator", 3, 0, 0, (scm_t_subr)register_scene_generator);
-  scm_c_export("register-scene-generator", NULL);
+  scm_c_define_module ("dungeon-master", init_dungeon_master_module, NULL);
 }
 
-void scm_init_dungeon_master_module()
+void
+add_to_load_path (std::string path)
 {
-  scm_c_define_module("dungeon-master", init_dungeon_master_module, NULL);
+  // Add path to %load-path variable, needed for mods structured like modules
+  std::string exp = "(add-to-load-path \"" + path + "\")";
+  scm_c_eval_string (exp.c_str ());
 }
 
-void load_mods()
+void
+load_dmaster_mods ()
 {
-  scm_init_guile();
-  scm_init_dungeon_master_module();
+  scm_init_guile ();
+  scm_init_dungeon_master_module ();
 
-  std::set<std::string> paths = get_dm_paths();
+  std::set<std::string> paths = get_dmaster_paths ();
   DIR* mods_dir;
   struct dirent* mod;
   std::string
     mods_path,
     mod_main;
 
-  for (const std::string &path : paths) {
-    mods_path = path + DIR_DELIM + "mods";
-    mods_dir = opendir(mods_path.c_str());
-    if (mods_dir != NULL) {
-      while (mod = readdir(mods_dir)) {
-	if (strcmp(mod->d_name, ".") != 0 && strcmp(mod->d_name, "..") != 0) {
-	  mod_main = mods_path + DIR_DELIM + mod->d_name + DIR_DELIM + "main.scm";
-	  scm_primitive_load(scm_from_locale_string(mod_main.c_str()));
-	}
-      }
+  for (const std::string &path : paths)
+    {
+      mods_path = path + PATH_DELIM + "mods";
+      add_to_load_path (mods_path);
+      mods_dir = opendir (mods_path.c_str ());
+      if (mods_dir != NULL)
+        {
+          while (mod = readdir (mods_dir))
+            {
+              if (strstr (mod->d_name, ".scm") != NULL) {
+                mod_main = mods_path + PATH_DELIM + mod->d_name;
+                scm_primitive_load (scm_from_locale_string (mod_main.c_str ()));
+              }
+            }
+        }
+      closedir (mods_dir);
     }
-    closedir(mods_dir);
-  }
 }