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

Merge branch 'version-3-2'

Browse source 
Conflicts:
	src/laws.c
This commit is contained in:
Enno Rehling 2014-09-02 09:26:59 +02:00
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
email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/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

4
src/kernel/save.c
View file

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