Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Enno Rehling 2011-02-26 00:31:31 -08:00
commit 9fcf31f44e
3 changed files with 278 additions and 278 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/e3a/main.lua
View file

@ -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

2
scripts/tests/e3a.lua
View file

@ -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()

552
src/spells/spells.c
View file

File diff suppressed because it is too large Load diff