From ae6e161f96dbf6df739b0c11aaa7d71bd9bdfa6f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 2 Sep 2014 07:24:55 +0200 Subject: [PATCH] version 3.2 remove regatta plane, it crashes all of a sudden. why is there a use of init_order here? that is a future feature. --- src/kernel/save.c | 4 +++- src/laws.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/kernel/save.c b/src/kernel/save.c index af608f4b1..e16e61161 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -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 */ diff --git a/src/laws.c b/src/laws.c index 505dd91a7..34f8ca08b 100755 --- a/src/laws.c +++ b/src/laws.c @@ -3944,7 +3944,8 @@ void defaultorders(void) char lbuf[8192]; order *new_order = 0; const char *s; - init_order(ord); + init_tokens(ord); + skip_token(); s = getstrtoken(); if (s) { strcpy(lbuf, s);