From c6079c8fb0f540bfd28e3afc02d80a9a83de3d02 Mon Sep 17 00:00:00 2001
From: Aaron Marks <nymacro@gmail.com>
Date: Wed, 27 Apr 2005 12:14:17 +0000
Subject: Made scripting defines slightly cleaner. Changed LivingObject to
 Being (as that is standard TMW name for it).

---
 src/main.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 56e0d69..8f40c5c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,6 +21,7 @@
  *  $Id$
  */
 
+#include <iostream>
 #include "netsession.h"
 #include "connectionhandler.h"
 #include "accounthandler.h"
@@ -28,9 +29,17 @@
 #include <SDL_net.h>
 
 #ifdef SCRIPT_SUPPORT
-#define SCRIPT_SQUIRREL
+
 #include "script.h"
-#include "script-sq.h"
+#define SCRIPT_SQUIRREL_SUPPORT
+
+#ifdef SCRIPT_SQUIRREL_SUPPORT
+#include "script-squirrel.h"
+#endif
+#ifdef SCRIPT_RUBY_SUPPORT
+#include "script-ruby.h"
+#endif
+std::string scriptLanguage = "squirrel";
 #endif
 
 #define TMW_WORLD_TICK  SDL_USEREVENT
@@ -79,12 +88,11 @@ void initialize()
 
     // Initialize scripting subsystem
 #ifdef SCRIPT_SUPPORT
-#ifdef SCRIPT_SQUIRREL
-    script = new ScriptSquirrel();
-#else
-#error Scripting enabled, but no language defined.
-#endif
-    script->init();
+    if (scriptLanguage == "squirrel")
+    {
+        script = new ScriptSquirrel();
+        script->init();
+    }
 #endif
 }
 
-- 
cgit