forked from github/server
remove data_turn and gamename from global settings.
make run-turn.sh work without valgrind
This commit is contained in:
parent
ba3f3a17d3
commit
8cfcffc4aa
|
@ -2,11 +2,9 @@
|
|||
email = eressea-server@kn-bremen.de
|
||||
sender = Eressea Server
|
||||
name = Eressea
|
||||
base = .
|
||||
report = reports
|
||||
verbose = 0
|
||||
lomem = 0
|
||||
debug = 0
|
||||
memcheck = 0
|
||||
locales = de,en
|
||||
|
||||
|
|
|
@ -93,9 +93,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
struct settings global = {
|
||||
"Eressea", /* gamename */
|
||||
};
|
||||
struct settings global;
|
||||
|
||||
bool lomem = false;
|
||||
int turn = -1;
|
||||
|
@ -841,7 +839,7 @@ void free_gamedata(void)
|
|||
const char * game_name(void)
|
||||
{
|
||||
const char * param = config_get("game.name");
|
||||
return param ? param : global.gamename;
|
||||
return param ? param : "Eressea";
|
||||
}
|
||||
|
||||
const char * game_mailcmd(void)
|
||||
|
|
|
@ -108,9 +108,7 @@ extern "C" {
|
|||
|
||||
/* globale settings des Spieles */
|
||||
typedef struct settings {
|
||||
const char *gamename;
|
||||
struct attrib *attribs;
|
||||
unsigned int data_turn;
|
||||
void *vm_state;
|
||||
struct global_functions {
|
||||
int(*wage) (const struct region * r, const struct faction * f,
|
||||
|
|
|
@ -244,7 +244,7 @@ static faction *factionorders(void)
|
|||
|
||||
/* TODO: +1 ist ein Workaround, weil cturn erst in process_orders
|
||||
* incrementiert wird. */
|
||||
f->lastorders = global.data_turn + 1;
|
||||
f->lastorders = turn + 1;
|
||||
|
||||
}
|
||||
else {
|
||||
|
@ -1633,7 +1633,6 @@ int read_game(gamedata *data) {
|
|||
}
|
||||
read_attribs(data, &global.attribs, NULL);
|
||||
READ_INT(store, &turn);
|
||||
global.data_turn = turn;
|
||||
log_debug(" - reading turn %d", turn);
|
||||
rng_init(turn);
|
||||
READ_INT(store, NULL); /* max_unique_id = ignore */
|
||||
|
|
|
@ -76,7 +76,6 @@ int update_nmrs(void)
|
|||
{
|
||||
int i, newplayers = 0;
|
||||
faction *f;
|
||||
int turn = global.data_turn;
|
||||
int timeout = NMRTimeout();
|
||||
|
||||
if (timeout>0) {
|
||||
|
|
|
@ -28,12 +28,12 @@ while [ ! -d $ROOT/.git ]; do
|
|||
ROOT=`dirname $ROOT`
|
||||
done
|
||||
|
||||
set -e
|
||||
cd $ROOT/tests
|
||||
setup
|
||||
cleanup
|
||||
VALGRIND=`which valgrind`
|
||||
SERVER=../Debug/eressea/eressea
|
||||
set -e
|
||||
if [ -n "$VALGRIND" ]; then
|
||||
SUPP=../share/ubuntu-12_04.supp
|
||||
SERVER="$VALGRIND --track-origins=yes --gen-suppressions=all --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER"
|
||||
|
@ -53,6 +53,7 @@ assert_grep_count reports/$CRFILE '^BURG' 1
|
|||
assert_grep_count reports/$CRFILE '^EINHEIT' 2
|
||||
assert_grep_count reports/$CRFILE '^GEGENSTAENDE' 2
|
||||
|
||||
assert_grep_count reports/185-heg.cr '185;Runde' 1
|
||||
assert_grep_count reports/185-heg.cr ';Baeume' 4
|
||||
assert_grep_count reports/185-heg.cr '"B.ume";type' 4
|
||||
assert_grep_count reports/185-heg.cr '"Pferde";type' 6
|
||||
|
@ -62,4 +63,4 @@ assert_grep_count reports/185-heg.cr '"neighbour";visibility' 11
|
|||
assert_grep_count reports/185-6rLo.cr '^EINHEIT' 2
|
||||
assert_grep_count reports/185-6rLo.cr '^REGION' 13
|
||||
echo "integration tests: PASS"
|
||||
#cleanup
|
||||
cleanup
|
||||
|
|
Loading…
Reference in New Issue