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

Merge pull request #426 from ennorehling/develop

Browse source 
fixing compilation and stuff
This commit is contained in:
Enno Rehling 2015-12-05 18:53:53 +01:00
commit 905aeff3a7
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
critbit

@ -1 +1 @@
Subproject commit dfe57a077222c6b572da61a79dc0687f81c10055 Subproject commit 934c2dd94d41da19637a76a1a8b3dfeb7aa8524d

4
scripts/eressea/xmas.lua
View file

@ -29,8 +29,10 @@ function self.init()
local tbl = gifts[config.rules] local tbl = gifts[config.rules]
if tbl then if tbl then
for _, gift in ipairs(tbl) do for _, gift in ipairs(tbl) do
if turn == gift.turn then if gift.turn then
if gift.turn==turn then
give_gifts(gift) give_gifts(gift)
end
elseif gift.key and not get_key(gift.key) then elseif gift.key and not get_key(gift.key) then
give_gifts(gift) give_gifts(gift)
set_key(gift.key) set_key(gift.key)

7
src/reports.test.c
View file

@ -336,10 +336,13 @@ static void test_spell_syntax(CuTest *tc, char *msg, spell_fixture *spell, char
while (linestart && !strstr(linestart, "ZAUBERE")) while (linestart && !strstr(linestart, "ZAUBERE"))
linestart = strtok(NULL, "\n") ; linestart = strtok(NULL, "\n") ;
CuAssertTrue(tc, (bool) linestart); CuAssertPtrNotNull(tc, linestart);
while ((newline = strtok(NULL, "\n"))) newline = strtok(NULL, "\n");
while (newline) {
*(newline - 1) = '\n'; *(newline - 1) = '\n';
newline = strtok(NULL, "\n");
}
CuAssertStrEquals_Msg(tc, msg, syntax, linestart); CuAssertStrEquals_Msg(tc, msg, syntax, linestart);

1
tests/runtests.bat
View file

@ -11,3 +11,4 @@ SET SERVER=%BUILD%\eressea.exe
%SERVER% ..\scripts\run-tests-e4.lua %SERVER% ..\scripts\run-tests-e4.lua
PAUSE PAUSE
RMDIR /s /q reports RMDIR /s /q reports
DEL score score.alliances