Merge branch 'master' of github.com:eressea/server

This commit is contained in:
Enno Rehling 2014-08-23 09:18:15 +02:00
commit b458c889be
7 changed files with 19 additions and 10 deletions

View File

@ -118,7 +118,7 @@
<param name="study.speedup" value="0"/>
<param name="world.era" value="3"/>
<param name="rules.migrants" value="0"/>
<param name="rules.monsters.attack_chance" value="0.1"/>
<param name="rules.monsters.attack_chance" value="0.0"/>
<param name="rules.transfermen" value="0"/>
<param name="rules.stealth.faction" value="1"/>
<param name="rules.stealth.anon_battle" value="0"/>

View File

@ -1476,7 +1476,7 @@
<text locale="en">MAKE</text>
</string>
<string name="maketemp">
<text locale="de">MAKETEMP</text>
<text locale="en">MAKETEMP</text>
</string>
<string name="move">
<text locale="en">MOVE</text>

View File

@ -1,6 +1,6 @@
#!/bin/bash
s/preview build
s/preview build master
s/preview version
for game in 2 3 4 ; do
s/preview -g $game run && \

View File

@ -23,6 +23,7 @@ function build() {
assert_dir $SOURCE
cd $SOURCE
git pull || abort "failed to update source. do you have local changes?"
[ -z $1 ] || git checkout $1
s/build || abort "build failed."
}
@ -83,11 +84,11 @@ let turn=$turn+1
}
function send() {
echo "sending reports to $1"
zip="$turn-$1.zip"
zip -q -u $zip $turn-$1.?r
email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//')
cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $GAME Partei $1" -a $zip -- $email
echo "sending reports to $1 / $email"
cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email
}
game=0
@ -128,7 +129,8 @@ case "$1" in
version
;;
"build")
build
shift
build $*
;;
"setup")
setup
@ -153,8 +155,8 @@ case "$1" in
sent=1
done
if [ $sent -eq 0 ]; then
if [ -e $factions ]; then
for faction in $(cat $factions) ; do
if [ -e ../$factions ]; then
for faction in $(cat ../$factions) ; do
send $faction
done
fi

View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3
#define VERSION_MINOR 0
#define VERSION_BUILD 682
#define VERSION_MINOR 2
#define VERSION_BUILD 684

View File

@ -256,6 +256,11 @@ static order *create_order_i(keyword_t kwd, const char *sptr, int persistent,
order *ord = NULL;
int lindex;
if (keyword_disabled(kwd)) {
log_error("trying to create an order for disabled keyword %s.", keyword(kwd));
return NULL;
}
/* if this is just nonsense, then we skip it. */
if (lomem) {
switch (kwd) {

View File

@ -3627,6 +3627,8 @@ void new_units(void)
}
continue;
}
init_tokens(makeord);
skip_token();
alias = getid();
token = getstrtoken();