Bug #1066 ยป 0053-Correct-sending-unknown-original-owner-in-short-city.patch
| client/packhand.c | ||
|---|---|---|
|
struct tile *ptile = NULL;
|
||
|
struct tile_list *worked_tiles = NULL;
|
||
|
struct player *powner = player_by_number(packet->owner);
|
||
|
struct player *original;
|
||
|
struct player *original = player_by_number(packet->original);
|
||
|
int radius_sq = game.info.init_city_radius_sq;
|
||
|
fc_assert_ret_msg(NULL != powner, "Bad player number %d.", packet->owner);
|
||
|
fc_assert_ret_msg(NULL != pcenter, "Invalid tile index %d.", packet->tile);
|
||
|
if (packet->original >= 0) {
|
||
|
original = player_by_number(packet->original);
|
||
|
} else {
|
||
|
original = NULL;
|
||
|
}
|
||
|
if (NULL != pcity) {
|
||
|
ptile = city_tile(pcity);
|
||
| server/citytools.c | ||
|---|---|---|
|
if (pdcity->original != NULL) {
|
||
|
packet->original = player_number(pdcity->original);
|
||
|
} else {
|
||
|
packet->original = -1;
|
||
|
packet->original = MAX_NUM_PLAYER_SLOTS;
|
||
|
}
|
||
|
packet->tile = tile_index(ptile);
|
||