Merge branch 'version-3-3'

Conflicts:
	src/build.h
	src/kernel/faction.c

process/cron/backup-eressea

@@ -0,0 +1,31 @@
+#!/bin/bash
+if [ -z $ERESSEA ] ; then
+  ERESSEA=$HOME/eressea
+  echo "The ERESSEA environment variable is not set. Assuming $ERESSEA."
+fi
+GAME=$1
+if [ ! -d $ERESSEA/game-$GAME ]; then
+  echo "No such game: game-$GAME."
+  exit 1
+fi
+cd $ERESSEA/game-$GAME
+TURN=$2
+if [ -z $TURN ]; then
+  TURN=$(cat turn)
+fi
+if [ ! -e data/$TURN.dat ]; then
+  echo "No data for turn $TURN in game $GAME."
+  exit 2
+fi
+if [ ! -d backup ] ; then
+  echo "creating missing backup directory for game $GAME."
+  mkdir -p ~/backup/eressea/game-$GAME
+  ln -sf ~/backup/eressea/game-$GAME backup
+fi
+
+files="data/$TURN.dat parteien.full parteien"
+if [ -e orders.$TURN ]; then
+files="$files orders.$TURN"
+fi
+echo "backup turn $TURN, game $GAME, files: $files"
+tar cjf backup/$TURN.tar.bz2 $files

process/cron/create-orders

@@ -0,0 +1,16 @@
+GAME=$1
+TURN=$2
+
+if [ ! -d $ERESSEA/game-$GAME ] ; then
+  echo "No such game: $GAME"
+  exit 1
+fi
+
+cd $ERESSEA/game-$GAME
+if [ -d orders.dir.$TURN ]; then
+  echo "orders.dir.$TURN already exists"
+else
+  mv orders.dir orders.dir.$TURN
+  mkdir -p orders.dir
+fi
+ls -1rt orders.dir.$TURN/turn-* | xargs cat > orders.$TURN

process/cron/run-eressea

@@ -12,14 +12,15 @@ if [ -d $REPORTS ]; then
   rm -rf $REPORTS
 fi
 mkdir $REPORTS
-$BIN/backup-eressea $GAME $TURN
 
 cd $ERESSEA/game-$GAME
 if [ -d test ]; then
   touch test/execute.lock
 fi
+$BIN/create-orders $GAME $TURN
+$BIN/backup-eressea $GAME $TURN
 rm -f execute.lock
-$BIN/run-turn $GAME
+$BIN/run-turn $GAME $TURN
 touch execute.lock
 
 if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then

process/cron/run-turn

@@ -0,0 +1,14 @@
+GAME=$1
+TURN=$2
+
+if [ ! -d $ERESSEA/game-$GAME ] ; then
+  echo "No such game: $GAME"
+  exit 1
+fi
+
+cd $ERESSEA/game-$GAME
+
+echo "running turn $TURN, game $GAME"
+$ERESSEA/server/bin/eressea -v1 -t $TURN run-turn.lua
+mkdir -p log
+ln -f eressea.log log/eressea.log.$TURN

src/buildno.h

@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 5
-#define VERSION_BUILD 696
+#define VERSION_BUILD 697

src/kernel/faction.c

@@ -280,9 +280,7 @@ unit *addplayer(region * r, faction * f)
 
 bool checkpasswd(const faction * f, const char *passwd)
 {
-    if (passwd && unicode_utf8_strcasecmp(f->passw, passwd) == 0)
-        return true;
-    return false;
+    return (passwd && unicode_utf8_strcasecmp(f->passw, passwd) == 0);
 }
 
 variant read_faction_reference(struct storage * store)