Merge branch 'master' of github.com:diasurgical/devilution

This commit is contained in:
Anders Jenbo 2019-06-22 18:13:54 +02:00
commit f187fe7d3a
40 changed files with 1608 additions and 1639 deletions

View file

@ -30,20 +30,20 @@ void init_seed_desync()
{
int i;
for(i = 0; i < 4096; i++) {
for (i = 0; i < 4096; i++) {
seed_table[i] = -1;
}
seed_index = 0;
for(i = 0; i < NUMLEVELS; i++) {
for (i = 0; i < NUMLEVELS; i++) {
level_seeds[i] = 0;
}
}
void seed_desync_index_get()
{
if(currlevel == 0) {
if (currlevel == 0) {
return;
}
@ -53,7 +53,7 @@ void seed_desync_index_get()
void seed_desync_index_set()
{
if(currlevel == 0) {
if (currlevel == 0) {
return;
}
@ -63,13 +63,13 @@ void seed_desync_index_set()
void seed_desync_check(int seed)
{
if(!update_seed_check || seed_index == 4096 || currlevel == 0) {
if (!update_seed_check || seed_index == 4096 || currlevel == 0) {
return;
}
if(seed_table[seed_index] == -1) {
if (seed_table[seed_index] == -1) {
seed_table[seed_index] = seed;
} else if(seed != seed_table[seed_index]) {
} else if (seed != seed_table[seed_index]) {
app_fatal("Seeds desynced");
}