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

Merge branch 'version-3-3' 

Conflicts:
	src/build.h
This commit is contained in:
Enno Rehling 2014-12-28 17:29:34 +01:00
parent 14bb27d89c 50aa3cc444
commit 880b965c54
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
process/cron/run-eressea
View File

@ -26,15 +26,17 @@ if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then
echo "server did not create orders for turn $TURN in game $GAME" echo "server did not create orders for turn $TURN in game $GAME"
exit 2 exit 2
fi fi
if [ ! -s $REPORTS/reports.txt ]; then
echo "server did not create reports.txt in game $GAME"
exit 4
fi
$BIN/backup-eressea $GAME $TURN
let TURN=$TURN+1 let TURN=$TURN+1
if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then
echo "server did not create data for turn $TURN in game $GAME" echo "server did not create data for turn $TURN in game $GAME"
exit 3 exit 3
fi fi
if [ ! -s $REPORTS/reports.txt ]; then echo "sending reports for game $GAME, turn $TURN"
echo "server did not create reports.txt for turn $TURN in game $GAME"
exit 4
fi
$BIN/compress.sh $GAME $TURN $BIN/compress.sh $GAME $TURN
$BIN/sendreports.sh $GAME $BIN/sendreports.sh $GAME
$BIN/backup-eressea $GAME $TURN $BIN/backup-eressea $GAME $TURN

2
scripts/eressea/eternath.lua
View File

@ -23,7 +23,7 @@ local eternath = {}
function eternath.update() function eternath.update()
if b1 and b2 then if b1 and b2 then
local size = 5 local size = 5
local units1 = gates.units(b1, size) local units1 = gates.units(b1, size)
local units2 = gates.units(b2, size) local units2 = gates.units(b2, size)

2
src/buildno.h
View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 4 #define VERSION_MINOR 4
#define VERSION_BUILD 694 #define VERSION_BUILD 695