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.
This commit is contained in:
Enno Rehling 2014-09-02 07:24:55 +02:00
parent 2246ce9d7a
commit ae6e161f96
2 changed files with 5 additions and 2 deletions

View File

@ -1571,8 +1571,10 @@ int readgame(const char *filename, int backup)
} }
} }
a_read(&store, &pl->attribs, pl); a_read(&store, &pl->attribs, pl);
if (pl->id != 1094969858) { // Regatta
addlist(&planes, pl); addlist(&planes, pl);
} }
}
/* Read factions */ /* Read factions */
if (gdata.version >= ALLIANCES_VERSION) { if (gdata.version >= ALLIANCES_VERSION) {

View File

@ -3944,7 +3944,8 @@ void defaultorders(void)
char lbuf[8192]; char lbuf[8192];
order *new_order = 0; order *new_order = 0;
const char *s; const char *s;
init_order(ord); init_tokens(ord);
skip_token();
s = getstrtoken(); s = getstrtoken();
if (s) { if (s) {
strcpy(lbuf, s); strcpy(lbuf, s);