Merge pull request #426 from ennorehling/develop

fixing compilation and stuff

critbit

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

scripts/eressea/xmas.lua

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

src/reports.test.c

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

tests/runtests.bat

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