diff --git a/.travis.yml b/.travis.yml index be630407e..003fb67ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: - libxml2-dev - valgrind os: -- linux + - linux notifications: slack: secure: F89aXLWaE125PaJIlETv12jT4EfH6wLXJmGCPZzrN3OcLn2ahDWqjwuzR7lOEDf2nAISmeMPyDZMhEHXLNHAE5qP6lg9yliYQw5hzGmDK9m1xUq/pPEne/b2Y7K3my1mkRZ6n3asbHgSmBWAfCIk1JN8R5Rv+rmbLuWLc+zofts= diff --git a/conf/e2/config.xml b/conf/e2/config.xml index b97abcea4..2001d5f62 100644 --- a/conf/e2/config.xml +++ b/conf/e2/config.xml @@ -100,6 +100,7 @@ + @@ -114,6 +115,7 @@ + diff --git a/scripts/eressea/cursed.lua b/scripts/eressea/cursed.lua index 795d7aeb3..ecf4db9de 100644 --- a/scripts/eressea/cursed.lua +++ b/scripts/eressea/cursed.lua @@ -1,11 +1,15 @@ -require 'bit32' +local function bitset(flags, bit) + -- TODO: use bit32 when we no longer have to consider lua 5.1 compatibility + local x = flags % (bit*2) + return x >= bit +end local function curse(file) for line in file:lines() do f = get_faction(line) if not f then print("no such faction: " .. line) - elseif bit32.band(16, f.flags)==0 then + elseif not bitset(f.flags, 16) then print("cursing " .. tostring(f)) f.flags = f.flags + 16 else @@ -17,7 +21,6 @@ end local cursed = {} function cursed.init() - print("curses!") local f = io.open("cursed.txt", "r") if f then print("found cursed.txt") diff --git a/src/buildno.h b/src/buildno.h index ba737a69f..05e1213de 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 6 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 diff --git a/src/creport.c b/src/creport.c index d0dce03db..ec81c26c9 100644 --- a/src/creport.c +++ b/src/creport.c @@ -1539,7 +1539,7 @@ report_computer(const char *filename, report_context * ctx, const char *charset) fprintf(F, "%d;Basis\n", 36); fprintf(F, "%d;Runde\n", turn); fprintf(F, "%d;Zeitalter\n", era); - fprintf(F, "%d.%d.%d;Build\n", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD); + fprintf(F, "\"%d.%d.%d\";Build\n", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD); if (mailto != NULL) { fprintf(F, "\"%s\";mailto\n", mailto); fprintf(F, "\"%s\";mailcmd\n", LOC(f->locale, "mailcmd"));