X-Git-Url: https://git.jsancho.org/?p=dungeon-master.git;a=blobdiff_plain;f=src%2Fmods.cpp;h=dea09b633b0e40261e5d25c060b849e95bc3339b;hp=c6fa4b6d7f0c29cc67e33250e912c7f32cb59b0e;hb=feed3accdc0482b11535c72119ea73f627f633ed;hpb=fe9df14f96d3f1d45a26438a5df06e2259893eac

diff --git a/src/mods.cpp b/src/mods.cpp
index c6fa4b6..dea09b6 100644
--- a/src/mods.cpp
+++ b/src/mods.cpp
@@ -1,4 +1,4 @@
-/* Dungeon Master --- Adventure generator for GNU Guile
+/* Dungeon Master --- RPG Adventure Generator
    Copyright © 2019 Javier Sancho <jsf@jsancho.org>
 
    Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with Haunt.  If not, see <http://www.gnu.org/licenses/>.
+   along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <dirent.h>
@@ -23,49 +23,60 @@
 #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 {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));
   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);
+  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()
+void scm_init_dungeon_master_module ()
 {
-  scm_c_define_module("dungeon-master", init_dungeon_master_module, NULL);
+  scm_c_define_module ("dungeon-master", init_dungeon_master_module, NULL);
 }
 
-void load_mods()
+void add_to_load_path (std::string path)
 {
-  scm_init_guile();
-  scm_init_dungeon_master_module();
+  // Add path to %load-path variable, needed for modules created in mods
+  std::string exp = "(add-to-load-path \"" + path + "\")";
+  scm_c_eval_string (exp.c_str ());
+}
+
+void load_dmaster_mods ()
+{
+  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);
-  }
 }