fix segfault, disable intermittent test

This commit is contained in:
Enno Rehling 2015-08-20 16:18:15 +02:00
parent 1641e6ef89
commit 853290413f
9 changed files with 9 additions and 9 deletions

2
cmake

@ -1 +1 @@
Subproject commit cd779ba36efb4045a040af170588a8dfe496d7b9
Subproject commit f1fb3943ace59994d90d71a891b80033dc2700a2

@ -1 +1 @@
Subproject commit 61989d93368022602a2a7ac4218c83f254701f0f
Subproject commit e538739b38593b90312831a5e52d2e3bd731069b

2
cutest

@ -1 +1 @@
Subproject commit 788659594ef87e9f497b8039da764182adfd2943
Subproject commit 6e268687dbf6ae55afb63210c3753530d216a622

@ -1 +1 @@
Subproject commit 4292cd5e81395d09a7457ab93659ea3b7784e958
Subproject commit f1446c47ca1774ae84bf86a28502e91daf6b421a

@ -1 +1 @@
Subproject commit f84066fb7d3254bdd9e89694acc4c1c20d001eed
Subproject commit ecf956b9808c28c2db52e6b73930f57876dbb258

@ -1 +1 @@
Subproject commit 40ae383100a8f012393ab29bc3d98e182fe57c19
Subproject commit 45f4577b8205d87b78d2b1f30b5c9baa25c86779

View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3
#define VERSION_MINOR 5
#define VERSION_BUILD 5
#define VERSION_BUILD 6

View File

@ -1686,7 +1686,7 @@ int readgame(const char *filename, int backup)
}
}
}
if (global.data_version < SPELL_LEVEL_VERSION) {
if (global.data_version < SPELL_LEVEL_VERSION && f->spellbook) {
spellbook_foreach(f->spellbook, cb_sb_maxlevel, f);
}
}

@ -1 +1 @@
Subproject commit bcc2874cf289a1d0fc9cc79ff3ed271403b2e24c
Subproject commit 86b96744157eb08c55998df4c12fa2e073005b49