[project @ 2006-02-03 22:36:01 by unknown_lamer]

Actually fix issue with loading bobot-util.scm

diff --git a/ChangeLog b/ChangeLog
index 34b6227..6655f3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
 2006-02-03  Clinton Ebadi  <clinton@unknownlamer.org>
 
+       * source/Interp.C (Startup): Removed loading of bobot-utils.scm
+       (Startup2): Load bobot-utils.scm here
+
+       * source/Interp.H: Added Startup2 method
+
+       * source/Bot.C (Bot): Call Interp::Startup2
+
        * source/Main.C (main): Moved Interp::Startup call to after the
        Bot is created 
+       (main): Moved Interp::Startup back
 
 2005-09-12  Clinton Ebadi  <clinton@unknownlamer.org>
 

diff --git a/source/Bot.C b/source/Bot.C
index 8a38d01..53a0f37 100644 (file)
--- a/source/Bot.C
+++ b/source/Bot.C
@@ -159,6 +159,7 @@ Bot::Bot(String filename, bool debug_on)
   std::srand (std::time (0)); // srand for bot-random
 
 #ifdef USESCRIPTS
+  Interp::Startup2 ();
   botInterp = new BotInterp(this, logs_dir + scriptLogFileName);
   botInterp->LoadScript(autoexecFileName);
 #endif

diff --git a/source/Interp.C b/source/Interp.C
index 7cde5cb..da171f9 100644 (file)
--- a/source/Interp.C
+++ b/source/Interp.C
@@ -293,6 +293,10 @@ Interp::Startup()
   bot_module = scm_c_define_module ("the-bot-module", 
                                    interp_init_helper, 0);
 
+}
+
+void Interp::Startup2 ()
+{
   scm_c_call_with_current_module (bot_module,
                                  interp_post_startup_helper,
                                  bot_module);

diff --git a/source/Interp.H b/source/Interp.H
index 20105f1..57b5a97 100644 (file)
--- a/source/Interp.H
+++ b/source/Interp.H
@@ -49,6 +49,7 @@ private:
 #endif
 public:
   static void Startup();
+  static void Startup2 ();
   static void Shutdown();
   static void Execute(Bot *, String);
   static void LoadScript(Bot *, String);