Project

General

Profile

Download (13.6 KB)

Feature #1361 ยป 0045-api_game_find.c-Replace-NULL-with-nullptr.patch

Marko Lindqvist, 05/03/2025 11:14 AM

View differences:

common/scriptcore/api_game_find.c
**************************************************************************/
Player *api_find_player_by_name(lua_State *L, const char *name)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return player_by_name(name);
}
......
**************************************************************************/
Player *api_find_player(lua_State *L, int player_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return player_by_number(player_id);
}
......
**************************************************************************/
City *api_find_city(lua_State *L, Player *pplayer, int city_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
if (pplayer) {
return player_city_by_number(pplayer, city_id);
......
**************************************************************************/
Unit *api_find_unit(lua_State *L, Player *pplayer, int unit_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
if (pplayer) {
return player_unit_by_number(pplayer, unit_id);
......
Unit *api_find_transport_unit(lua_State *L, Player *pplayer,
Unit_Type *ptype, Tile *ptile)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, pplayer, 2, Player, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, ptype, 3, Unit_Type, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, ptile, 4, Tile, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, pplayer, 2, Player, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, ptype, 3, Unit_Type, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, ptile, 4, Tile, nullptr);
{
struct unit *ptransport;
struct unit *pvirt = unit_virtual_create(pplayer, NULL, ptype, 0);
struct unit *pvirt = unit_virtual_create(pplayer, nullptr, ptype, 0);
unit_tile_set(pvirt, ptile);
pvirt->homecity = 0;
ptransport = transporter_for_unit(pvirt);
......
{
int role_or_flag;
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, role_name, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, role_name, 2, string, nullptr);
role_or_flag = unit_role_id_by_name(role_name, fc_strcasecmp);
if (!unit_role_id_is_valid(role_or_flag)) {
role_or_flag = unit_type_flag_id_by_name(role_name, fc_strcasecmp);
if (!unit_type_flag_id_is_valid(role_or_flag)) {
return NULL;
return nullptr;
}
}
......
} else if (num_role_units(role_or_flag) > 0) {
return get_role_unit(role_or_flag, 0);
} else {
return NULL;
return nullptr;
}
}
......
**************************************************************************/
Tile *api_find_tile(lua_State *L, int nat_x, int nat_y)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return native_pos_to_tile(&(wld.map), nat_x, nat_y);
}
......
**************************************************************************/
Tile *api_find_tile_by_index(lua_State *L, int tindex)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return index_to_tile(&(wld.map), tindex);
}
......
**************************************************************************/
Government *api_find_government(lua_State *L, int government_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return government_by_number(government_id);
}
......
Government *api_find_government_by_name(lua_State *L,
const char *name_orig)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, nullptr);
return government_by_rule_name(name_orig);
}
......
**************************************************************************/
Nation_Type *api_find_nation_type(lua_State *L, int nation_type_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return nation_by_number(nation_type_id);
}
......
Nation_Type *api_find_nation_type_by_name(lua_State *L,
const char *name_orig)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, nullptr);
return nation_by_rule_name(name_orig);
}
......
**************************************************************************/
Action *api_find_action(lua_State *L, action_id act_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return action_by_number(act_id);
}
......
Action *api_find_action_by_name(lua_State *L, const char *name_orig)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, nullptr);
return action_by_rule_name(name_orig);
}
......
**************************************************************************/
Building_Type *api_find_building_type(lua_State *L, int building_type_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return improvement_by_number(building_type_id);
}
......
Building_Type *api_find_building_type_by_name(lua_State *L,
const char *name_orig)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, nullptr);
return improvement_by_rule_name(name_orig);
}
......
**************************************************************************/
Unit_Type *api_find_unit_type(lua_State *L, int unit_type_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return utype_by_number(unit_type_id);
}
......
**************************************************************************/
Unit_Type *api_find_unit_type_by_name(lua_State *L, const char *name_orig)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, nullptr);
return unit_type_by_rule_name(name_orig);
}
......
**************************************************************************/
Tech_Type *api_find_tech_type(lua_State *L, int tech_type_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return advance_by_number(tech_type_id);
}
......
**************************************************************************/
Tech_Type *api_find_tech_type_by_name(lua_State *L, const char *name_orig)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, nullptr);
return advance_by_rule_name(name_orig);
}
......
**************************************************************************/
Terrain *api_find_terrain(lua_State *L, int terrain_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return terrain_by_number(terrain_id);
}
......
**************************************************************************/
Terrain *api_find_terrain_by_name(lua_State *L, const char *name_orig)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, nullptr);
return terrain_by_rule_name(name_orig);
}
......
**************************************************************************/
Achievement *api_find_achievement(lua_State *L, int achievement_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return achievement_by_number(achievement_id);
}
......
**************************************************************************/
Achievement *api_find_achievement_by_name(lua_State *L, const char *name_orig)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, nullptr);
return achievement_by_rule_name(name_orig);
}
......
**************************************************************************/
Disaster *api_find_disaster(lua_State *L, int disaster_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return disaster_by_number(disaster_id);
}
......
**************************************************************************/
Disaster *api_find_disaster_by_name(lua_State *L, const char *name_orig)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name_orig, 2, string, nullptr);
return disaster_by_rule_name(name_orig);
}
......
**************************************************************************/
const Direction *api_find_direction(lua_State *L, int id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return luascript_dir((enum direction8) id);
}
......
**************************************************************************/
Action *api_find_action_type_by_id(lua_State *L, int id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return action_by_number(id);
}
......
**************************************************************************/
Action *api_find_action_type_by_name(lua_State *L, const char *name)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name, 2, string, nullptr);
return action_by_rule_name(name);
}
......
**************************************************************************/
Counter *api_find_counter(lua_State *L, int counter_id)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return counter_by_id(counter_id);
}
......
**************************************************************************/
Counter *api_find_counter_by_name(lua_State *L, const char *name)
{
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_ARG_NIL(L, name, 2, string, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
LUASCRIPT_CHECK_ARG_NIL(L, name, 2, string, nullptr);
return counter_by_rule_name(name);
}
......
{
static char *p = "";
LUASCRIPT_CHECK_STATE(L, NULL);
LUASCRIPT_CHECK_STATE(L, nullptr);
return p;
}
    (1-1/1)