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

Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2020-05-09 21:08:20 +02:00
parent 46b230cbba caf8f1de9d
commit 8ef2ec71e9
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/give.c
View File

@ -385,6 +385,9 @@ message * give_ship(unit *u1, unit *u2, int n, order *ord)
} }
} }
else { else {
if (u2->building) {
leave_building(u2);
}
if (n < u1->ship->number) { if (n < u1->ship->number) {
ship * sh = new_ship(u1->ship->type, u1->region, u1->faction->locale); ship * sh = new_ship(u1->ship->type, u1->region, u1->faction->locale);
scale_ship(sh, 0); scale_ship(sh, 0);

18
src/kernel/save.c
View File

@ -376,7 +376,7 @@ unit *read_unit(gamedata *data)
{ {
unit *u; unit *u;
const race *rc; const race *rc;
int number, n, p; int number, n, p, bn, sn;
order **orderp; order **orderp;
char obuf[DISPLAYSIZE]; char obuf[DISPLAYSIZE];
faction *f; faction *f;
@ -443,9 +443,10 @@ unit *read_unit(gamedata *data)
else else
u->irace = NULL; u->irace = NULL;
READ_INT(data->store, &n); READ_INT(data->store, &bn);
if (n > 0) { READ_INT(data->store, &sn);
building * b = findbuilding(n); if (sn <= 0 && bn > 0) {
building * b = findbuilding(bn);
if (b) { if (b) {
u_set_building(u, b); u_set_building(u, b);
if (fval(u, UFL_OWNER)) { if (fval(u, UFL_OWNER)) {
@ -453,13 +454,12 @@ unit *read_unit(gamedata *data)
} }
} }
else { else {
log_error("read_unit: unit in unkown building '%s'", itoa36(n)); log_error("read_unit: unit in unkown building '%s'", itoa36(bn));
} }
} }
READ_INT(data->store, &n); if (sn > 0) {
if (n > 0) { ship * sh = findship(sn);
ship * sh = findship(n);
if (sh) { if (sh) {
u_set_ship(u, sh); u_set_ship(u, sh);
if (fval(u, UFL_OWNER)) { if (fval(u, UFL_OWNER)) {
@ -467,7 +467,7 @@ unit *read_unit(gamedata *data)
} }
} }
else { else {
log_error("read_unit: unit in unkown ship '%s'", itoa36(n)); log_error("read_unit: unit in unkown ship '%s'", itoa36(sn));
} }
} }

2
src/kernel/unit.c
View File

@ -635,7 +635,7 @@ void leave_ship(unit * u)
{ {
struct ship *sh = u->ship; struct ship *sh = u->ship;
u->ship = 0; u->ship = NULL;
if (sh->_owner == u) { if (sh->_owner == u) {
ship_update_owner(sh); ship_update_owner(sh);
sh->_owner = ship_owner(sh); sh->_owner = ship_owner(sh);