Merge branch 'master' of ssh://eressea_git/home/eressea/repo/eressea

2011-02-26 00:31:31 -08:00 · 2011-02-26 00:31:31 -08:00 · 9fcf31f44e
parent e8aa30c673 de4a69e2df
commit 9fcf31f44e
3 changed files with 278 additions and 278 deletions
--- a/scripts/e3a/main.lua
+++ b/scripts/e3a/main.lua
@ -48,7 +48,7 @@ function process(orders)
  update_scores()
  frost.update()

-  local localechange = { de = { "ii" } }
+  local localechange = { en = { "L46o" } }
  change_locales(localechange)

  -- use newfactions file to place out new players
--- a/scripts/tests/e3a.lua
+++ b/scripts/tests/e3a.lua
@ -417,7 +417,7 @@ function test_alliance()
  assert(f2.alliance~=nil)
  assert(f2.alliance==f1.alliance)
  for f in f1.alliance.factions do
-    assert_true(f==f1 or f==f2)
+    assert_true(f.id==f1.id or f.id==f2.id)
  end
  u1:clear_orders()
  u2:clear_orders()
--- a/src/spells/spells.c
+++ b/src/spells/spells.c