Feature #2282 ยป 0066-infracache.c-Replace-NULL-with-nullptr.patch
| server/advisors/infracache.c | ||
|---|---|---|
|
adv_want goodness;
|
||
|
struct terrain *old_terrain, *new_terrain;
|
||
|
fc_assert_ret_val(ptile != NULL, -1);
|
||
|
fc_assert_ret_val(ptile != nullptr, -1);
|
||
|
old_terrain = tile_terrain(ptile);
|
||
|
new_terrain = old_terrain->cultivate_result;
|
||
| ... | ... | |
|
return -1;
|
||
|
}
|
||
|
/* Irrigation would change the terrain type, clearing conflicting
|
||
|
* extras in the process. Calculate the benefit of doing so. */
|
||
|
* extras in the process. Calculate the benefit of doing so. */
|
||
|
vtile = tile_virtual_new(ptile);
|
||
|
tile_change_terrain(vtile, new_terrain);
|
||
| ... | ... | |
|
adv_want goodness;
|
||
|
struct terrain *old_terrain, *new_terrain;
|
||
|
fc_assert_ret_val(ptile != NULL, -1);
|
||
|
fc_assert_ret_val(ptile != nullptr, -1);
|
||
|
old_terrain = tile_terrain(ptile);
|
||
|
new_terrain = old_terrain->plant_result;
|
||
| ... | ... | |
|
return -1;
|
||
|
}
|
||
|
/* Mining would change the terrain type, clearing conflicting
|
||
|
* extras in the process. Calculate the benefit of doing so. */
|
||
|
* extras in the process. Calculate the benefit of doing so. */
|
||
|
vtile = tile_virtual_new(ptile);
|
||
|
tile_change_terrain(vtile, new_terrain);
|
||
| ... | ... | |
|
struct terrain *old_terrain, *new_terrain;
|
||
|
const struct civ_map *nmap = &(wld.map);
|
||
|
fc_assert_ret_val(ptile != NULL, -1);
|
||
|
fc_assert_ret_val(ptile != nullptr, -1);
|
||
|
old_terrain = tile_terrain(ptile);
|
||
|
new_terrain = old_terrain->transform_result;
|
||
| ... | ... | |
|
{
|
||
|
adv_want goodness = -1;
|
||
|
fc_assert_ret_val(ptile != NULL, -1);
|
||
|
fc_assert_ret_val(ptile != nullptr, -1);
|
||
|
if (player_can_build_extra(pextra, city_owner(pcity), ptile)) {
|
||
|
struct tile *vtile = tile_virtual_new(ptile);
|
||
| ... | ... | |
|
{
|
||
|
adv_want goodness = -1;
|
||
|
fc_assert_ret_val(ptile != NULL, -1);
|
||
|
fc_assert_ret_val(ptile != nullptr, -1);
|
||
|
if (player_can_remove_extra(pextra, city_owner(pcity), ptile)) {
|
||
|
struct tile *vtile = tile_virtual_new(ptile);
|
||
| ... | ... | |
|
adv_city_update(pcity);
|
||
|
}
|
||
|
fc_assert_ret(NULL != pcity);
|
||
|
fc_assert_ret(NULL != pcity->server.adv);
|
||
|
fc_assert_ret(NULL != pcity->server.adv->act_cache);
|
||
|
fc_assert_ret(pcity != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv->act_cache != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv->act_cache_radius_sq
|
||
|
== city_map_radius_sq_get(pcity));
|
||
|
fc_assert_ret(city_tile_index < city_map_tiles_from_city(pcity));
|
||
| ... | ... | |
|
int city_tile_index,
|
||
|
enum unit_activity act_id)
|
||
|
{
|
||
|
fc_assert_ret_val(NULL != pcity, 0);
|
||
|
fc_assert_ret_val(NULL != pcity->server.adv, 0);
|
||
|
fc_assert_ret_val(NULL != pcity->server.adv->act_cache, 0);
|
||
|
fc_assert_ret_val(pcity != nullptr, 0);
|
||
|
fc_assert_ret_val(pcity->server.adv != nullptr, 0);
|
||
|
fc_assert_ret_val(pcity->server.adv->act_cache != nullptr, 0);
|
||
|
fc_assert_ret_val(pcity->server.adv->act_cache_radius_sq
|
||
|
== city_map_radius_sq_get(pcity), 0);
|
||
|
fc_assert_ret_val(city_tile_index < city_map_tiles_from_city(pcity), 0);
|
||
| ... | ... | |
|
adv_city_update(pcity);
|
||
|
}
|
||
|
fc_assert_ret(NULL != pcity);
|
||
|
fc_assert_ret(NULL != pcity->server.adv);
|
||
|
fc_assert_ret(NULL != pcity->server.adv->act_cache);
|
||
|
fc_assert_ret(pcity != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv->act_cache != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv->act_cache_radius_sq
|
||
|
== city_map_radius_sq_get(pcity));
|
||
|
fc_assert_ret(city_tile_index < city_map_tiles_from_city(pcity));
|
||
| ... | ... | |
|
adv_city_update(pcity);
|
||
|
}
|
||
|
fc_assert_ret(NULL != pcity);
|
||
|
fc_assert_ret(NULL != pcity->server.adv);
|
||
|
fc_assert_ret(NULL != pcity->server.adv->act_cache);
|
||
|
fc_assert_ret(pcity != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv->act_cache != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv->act_cache_radius_sq
|
||
|
== city_map_radius_sq_get(pcity));
|
||
|
fc_assert_ret(city_tile_index < city_map_tiles_from_city(pcity));
|
||
| ... | ... | |
|
int adv_city_worker_extra_get(const struct city *pcity, int city_tile_index,
|
||
|
const struct extra_type *pextra)
|
||
|
{
|
||
|
fc_assert_ret_val(NULL != pcity, 0);
|
||
|
fc_assert_ret_val(NULL != pcity->server.adv, 0);
|
||
|
fc_assert_ret_val(NULL != pcity->server.adv->act_cache, 0);
|
||
|
fc_assert_ret_val(pcity != nullptr, 0);
|
||
|
fc_assert_ret_val(pcity->server.adv != nullptr, 0);
|
||
|
fc_assert_ret_val(pcity->server.adv->act_cache != nullptr, 0);
|
||
|
fc_assert_ret_val(pcity->server.adv->act_cache_radius_sq
|
||
|
== city_map_radius_sq_get(pcity), 0);
|
||
|
fc_assert_ret_val(city_tile_index < city_map_tiles_from_city(pcity), 0);
|
||
| ... | ... | |
|
int adv_city_worker_rmextra_get(const struct city *pcity, int city_tile_index,
|
||
|
const struct extra_type *pextra)
|
||
|
{
|
||
|
fc_assert_ret_val(NULL != pcity, 0);
|
||
|
fc_assert_ret_val(NULL != pcity->server.adv, 0);
|
||
|
fc_assert_ret_val(NULL != pcity->server.adv->act_cache, 0);
|
||
|
fc_assert_ret_val(pcity != nullptr, 0);
|
||
|
fc_assert_ret_val(pcity->server.adv != nullptr, 0);
|
||
|
fc_assert_ret_val(pcity->server.adv->act_cache != nullptr, 0);
|
||
|
fc_assert_ret_val(pcity->server.adv->act_cache_radius_sq
|
||
|
== city_map_radius_sq_get(pcity), 0);
|
||
|
fc_assert_ret_val(city_tile_index < city_map_tiles_from_city(pcity), 0);
|
||
| ... | ... | |
|
{
|
||
|
int radius_sq = city_map_radius_sq_get(pcity);
|
||
|
fc_assert_ret(NULL != pcity);
|
||
|
fc_assert_ret(NULL != pcity->server.adv);
|
||
|
fc_assert_ret(pcity != nullptr);
|
||
|
fc_assert_ret(pcity->server.adv != nullptr);
|
||
|
/* initialize act_cache if needed */
|
||
|
if (pcity->server.adv->act_cache == NULL
|
||
|
/* Initialize act_cache if needed */
|
||
|
if (pcity->server.adv->act_cache == nullptr
|
||
|
|| pcity->server.adv->act_cache_radius_sq == -1
|
||
|
|| pcity->server.adv->act_cache_radius_sq != radius_sq) {
|
||
|
pcity->server.adv->act_cache
|
||
|
= fc_realloc(pcity->server.adv->act_cache,
|
||
|
city_map_tiles(radius_sq)
|
||
|
* sizeof(*(pcity->server.adv->act_cache)));
|
||
|
/* initialize with 0 */
|
||
|
/* Initialize with 0 */
|
||
|
memset(pcity->server.adv->act_cache, 0,
|
||
|
city_map_tiles(radius_sq)
|
||
|
* sizeof(*(pcity->server.adv->act_cache)));
|
||
| ... | ... | |
|
{
|
||
|
pcity->server.adv = fc_calloc(1, sizeof(*pcity->server.adv));
|
||
|
pcity->server.adv->act_cache = NULL;
|
||
|
pcity->server.adv->act_cache = nullptr;
|
||
|
pcity->server.adv->act_cache_radius_sq = -1;
|
||
|
/* Allocate memory for pcity->ai->act_cache */
|
||
|
adv_city_update(pcity);
|
||
| ... | ... | |
|
**************************************************************************/
|
||
|
void adv_city_free(struct city *pcity)
|
||
|
{
|
||
|
fc_assert_ret(NULL != pcity);
|
||
|
fc_assert_ret(pcity != nullptr);
|
||
|
if (pcity->server.adv) {
|
||
|
if (pcity->server.adv->act_cache) {
|
||