make e3 server work with new bindings library

scripts/tests/eressea.lua

@@ -3,13 +3,13 @@ require "lunit"
 module("tests.e3.e2features", package.seeall, lunit.testcase )
 
 function setup()
-    free_game()
+    eressea.free_game()
-    settings.set("nmr.timeout", "0")
+    eressea.settings.set("nmr.timeout", "0")
-    settings.set("rules.economy.food", "4")
+    eressea.settings.set("rules.economy.food", "4")
 end
 
 function test_learn()
-    settings.set("study.random_progress", "0")
+    eressea.settings.set("study.random_progress", "0")
     local r = region.create(0, 0, "plain")
     local f = faction.create("noreply@eressea.de", "human", "de")
     f.age = 20
@@ -28,7 +28,7 @@ function test_learn()
 end
 
 function test_teach()
-    settings.set("study.random_progress", "0")
+    eressea.settings.set("study.random_progress", "0")
     local r = region.create(0, 0, "plain")
     local f = faction.create("noreply@eressea.de", "human", "de")
     f.age = 20

scripts/tests/spells-e2.lua

@@ -5,10 +5,10 @@ module("tests.e3.spells-e2", package.seeall, lunit.testcase)
 local r, f, u
 
 function setup()
-    free_game()
+    eressea.free_game()
-    settings.set("magic.regeneration.enable", "0")
+    eressea.settings.set("magic.regeneration.enable", "0")
-    settings.set("magic.fumble.enable", "0")
+    eressea.settings.set("magic.fumble.enable", "0")
-    settings.set("rules.economy.food", "4")
+    eressea.settings.set("rules.economy.food", "4")
 
     r = region.create(0, 0, "plain")
     f = faction.create("spell_payment@eressea.de", "elf", "de")

scripts/tests/spells.lua

@@ -3,12 +3,12 @@ require "lunit"
 module("tests.e3.spells", package.seeall, lunit.testcase)
 
 function setup()
-    free_game()
+    eressea.free_game()
-    settings.set("magic.fumble.enable", "0")
+    eressea.settings.set("magic.fumble.enable", "0")
 end
 
 function test_blessedharvest_lasts_n_turn()
-    free_game()
+    eressea.free_game()
     local r = region.create(0, 0, "plain")
     local f = faction.create("noreply@eressea.de", "halfling", "de")
     local u = unit.create(f, r)

src/CMakeLists.txt

@@ -44,6 +44,7 @@ set (SERVER_SRC
 add_executable(server ${SERVER_SRC})
 target_link_libraries(server
   ${ERESSEA_LIBRARY}
+  ${BINDINGS_LIBRARY}
   ${TOLUA_LIBRARIES}
   ${SQLITE3_LIBRARIES}
 )

src/main.c

@@ -4,7 +4,7 @@
 #include <kernel/types.h>
 #include <kernel/config.h>
 #include <kernel/save.h>
-
+#include <bindings/bindings.h>
 #include <eressea.h>
 #include <gmtool.h>
 
@@ -12,6 +12,7 @@
 #include "spells/spells.h"
 #include "curses.h"
 
+#include <lua.h>
 #include <assert.h>
 #include <locale.h>
 #include <wctype.h>
@@ -194,9 +195,10 @@ extern void bind_eressea(struct lua_State *L);
 int main(int argc, char **argv)
 {
   int err, result = 0;
+  lua_State *L;
 
   setup_signal_handler();
-
+  log_open("eressea.log");
   parse_config(inifile);
 
   err = parse_args(argc, argv, &result);
@@ -204,24 +206,20 @@ int main(int argc, char **argv)
     return result;
   }
 
-  log_open("eressea.log");
   locale_init();
 
 #ifdef CRTDBG
   init_crtdbg();
 #endif
 
-  err = eressea_init();
+  L = lua_init();
-  if (err) {
+  game_init();
-    log_error("initialization failed with code %d\n", err);
-    return err;
-  }
   register_races();
   register_curses();
   register_spells();
-  bind_eressea((struct lua_State *)global.vm_state);
+  bind_eressea(L);
 
-  err = eressea_run(luafile, entry_point);
+  err = eressea_run(L, luafile, entry_point);
   if (err) {
     log_error("server execution failed with code %d\n", err);
     return err;
@@ -230,7 +228,8 @@ int main(int argc, char **argv)
   malloc_stats();
 #endif
 
-  eressea_done();
+  game_done();
+  lua_done(L);
   log_close();
   if (global.inifile)
     iniparser_free(global.inifile);