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

Merge branch 'version-3-2' 

Conflicts:
	src/laws.c
This commit is contained in:
Enno Rehling 2014-09-02 09:26:59 +02:00
parent ae9ed99cd9 9e81de406b
commit 54cf4f4b7b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
s/preview
View File

@ -88,7 +88,9 @@ zip="$turn-$1.zip"
zip -q -u $zip $turn-$1.?r zip -q -u $zip $turn-$1.?r
email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//') email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//')
echo "sending reports to $1 / $email" echo "sending reports to $1 / $email"
cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email info=/dev/null
[ -e ../email.txt ] && info=../email.txt
cat $info | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email
} }
game=0 game=0

2
src/kernel/save.c
View File

@ -1571,8 +1571,10 @@ int readgame(const char *filename, int backup)
} }
} }
a_read(&store, &pl->attribs, pl); a_read(&store, &pl->attribs, pl);
if (pl->id != 1094969858) { // Regatta
addlist(&planes, pl); addlist(&planes, pl);
} }
}
/* Read factions */ /* Read factions */
if (gdata.version >= ALLIANCES_VERSION) { if (gdata.version >= ALLIANCES_VERSION) {