Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 9e81de406b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/build.h
View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 1 #define VERSION_MINOR 2
#define VERSION_BUILD 683 #define VERSION_BUILD 684

4
src/kernel/save.c
View File

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

3
src/laws.c
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);