Project

General

Profile

Feature #2303 » 0087-Qt-Add-action_id-parameter-to-pfcn_void.patch

Marko Lindqvist, 10/09/2026 04:15 AM

View differences:

client/gui-qt/dialogs.cpp
extern void popdown_city_report();
extern void popdown_endgame_report();
static void spy_request_strike_bld_list(QVariant data1, QVariant data2);
static void diplomat_incite(QVariant data1, QVariant data2);
static void diplomat_incite_escape(QVariant data1, QVariant data2);
static void spy_request_sabotage_list(QVariant data1, QVariant data2);
static void spy_request_sabotage_esc_list(QVariant data1, QVariant data2);
static void spy_sabotage(QVariant data1, QVariant data2);
static void spy_steal(QVariant data1, QVariant data2);
static void spy_steal_esc(QVariant data1, QVariant data2);
static void spy_steal_something(QVariant data1, QVariant data2);
static void diplomat_steal(QVariant data1, QVariant data2);
static void diplomat_steal_esc(QVariant data1, QVariant data2);
static void spy_poison(QVariant data1, QVariant data2);
static void spy_poison_esc(QVariant data1, QVariant data2);
static void spy_spread_plague(QVariant data1, QVariant data2);
static void spy_steal_gold(QVariant data1, QVariant data2);
static void spy_steal_gold_esc(QVariant data1, QVariant data2);
static void spy_steal_maps(QVariant data1, QVariant data2);
static void spy_steal_maps_esc(QVariant data1, QVariant data2);
static void spy_escape(QVariant data1, QVariant data2);
static void spy_nuke_city(QVariant data1, QVariant data2);
static void spy_nuke_city_esc(QVariant data1, QVariant data2);
static void nuke_city(QVariant data1, QVariant data2);
static void destroy_city(QVariant data1, QVariant data2);
static void diplomat_embassy(QVariant data1, QVariant data2);
static void spy_embassy(QVariant data1, QVariant data2);
static void spy_sabotage_unit(QVariant data1, QVariant data2);
static void spy_sabotage_unit_esc(QVariant data1, QVariant data2);
static void spy_investigate(QVariant data1, QVariant data2);
static void diplomat_investigate(QVariant data1, QVariant data2);
static void diplomat_sabotage(QVariant data1, QVariant data2);
static void diplomat_sabotage_esc(QVariant data1, QVariant data2);
static void diplomat_bribe_unit(QVariant data1, QVariant data2);
static void diplomat_bribe_stack(QVariant data1, QVariant data2);
static void spy_attack(QVariant data1, QVariant data2);
static void caravan_marketplace(QVariant data1, QVariant data2);
static void caravan_establish_trade(QVariant data1, QVariant data2);
static void caravan_help_build(QVariant data1, QVariant data2);
static void unit_disband_recover(QVariant data1, QVariant data2);
static void capture_units(QVariant data1, QVariant data2);
static void nuke_units(QVariant data1, QVariant data2);
static void collect_ransom(QVariant data1, QVariant data2);
static void wipe_units(QVariant data1, QVariant data2);
static void expel_unit(QVariant data1, QVariant data2);
static void bombard(QVariant data1, QVariant data2);
static void bombard2(QVariant data1, QVariant data2);
static void bombard3(QVariant data1, QVariant data2);
static void bombard4(QVariant data1, QVariant data2);
static void bombard_lethal(QVariant data1, QVariant data2);
static void bombard_lethal2(QVariant data1, QVariant data2);
static void found_city(QVariant data1, QVariant data2);
static void transform_terrain(QVariant data1, QVariant data2);
static void transform_terrain2(QVariant data1, QVariant data2);
static void cultivate(QVariant data1, QVariant data2);
static void cultivate2(QVariant data1, QVariant data2);
static void plant(QVariant data1, QVariant data2);
static void plant2(QVariant data1, QVariant data2);
static void pillage(QVariant data1, QVariant data2);
static void pillage2(QVariant data1, QVariant data2);
static void clean(QVariant data1, QVariant data2);
static void clean2(QVariant data1, QVariant data2);
static void road(QVariant data1, QVariant data2);
static void road2(QVariant data1, QVariant data2);
static void base(QVariant data1, QVariant data2);
static void base2(QVariant data1, QVariant data2);
static void mine(QVariant data1, QVariant data2);
static void mine2(QVariant data1, QVariant data2);
static void irrigate(QVariant data1, QVariant data2);
static void irrigate2(QVariant data1, QVariant data2);
static void nuke(QVariant data1, QVariant data2);
static void attack(QVariant data1, QVariant data2);
static void attack2(QVariant data1, QVariant data2);
static void suicide_attack(QVariant data1, QVariant data2);
static void suicide_attack2(QVariant data1, QVariant data2);
static void paradrop(QVariant data1, QVariant data2);
static void paradrop_conquer(QVariant data1, QVariant data2);
static void paradrop_frighten(QVariant data1, QVariant data2);
static void paradrop_frighten_conquer(QVariant data1, QVariant data2);
static void paradrop_enter(QVariant data1, QVariant data2);
static void paradrop_enter_conquer(QVariant data1, QVariant data2);
static void teleport(QVariant data1, QVariant data2);
static void teleport2(QVariant data1, QVariant data2);
static void teleport3(QVariant data1, QVariant data2);
static void teleport_conquer(QVariant data1, QVariant data2);
static void teleport_frighten(QVariant data1, QVariant data2);
static void teleport_frighten_conquer(QVariant data1, QVariant data2);
static void teleport_enter(QVariant data1, QVariant data2);
static void teleport_enter_conquer(QVariant data1, QVariant data2);
static void disembark1(QVariant data1, QVariant data2);
static void disembark2(QVariant data1, QVariant data2);
static void disembark3(QVariant data1, QVariant data2);
static void disembark4(QVariant data1, QVariant data2);
static void enter_hut(QVariant data1, QVariant data2);
static void enter_hut2(QVariant data1, QVariant data2);
static void enter_hut3(QVariant data1, QVariant data2);
static void enter_hut4(QVariant data1, QVariant data2);
static void frighten_hut(QVariant data1, QVariant data2);
static void frighten_hut2(QVariant data1, QVariant data2);
static void frighten_hut3(QVariant data1, QVariant data2);
static void frighten_hut4(QVariant data1, QVariant data2);
static void regular_move(QVariant data1, QVariant data2);
static void regular_move2(QVariant data1, QVariant data2);
static void regular_move3(QVariant data1, QVariant data2);
static void scout(QVariant data1, QVariant data2);
static void convert_unit(QVariant data1, QVariant data2);
static void fortify(QVariant data1, QVariant data2);
static void fortify2(QVariant data1, QVariant data2);
static void disband_unit(QVariant data1, QVariant data2);
static void homeless(QVariant data1, QVariant data2);
static void join_city(QVariant data1, QVariant data2);
static void unit_home_city(QVariant data1, QVariant data2);
static void unit_upgrade(QVariant data1, QVariant data2);
static void airlift(QVariant data1, QVariant data2);
static void conquer_city_shrink(QVariant data1, QVariant data2);
static void conquer_city_shrink2(QVariant data1, QVariant data2);
static void conquer_city_shrink3(QVariant data1, QVariant data2);
static void conquer_city_shrink4(QVariant data1, QVariant data2);
static void conquer_extras(QVariant data1, QVariant data2);
static void conquer_extras2(QVariant data1, QVariant data2);
static void conquer_extras3(QVariant data1, QVariant data2);
static void conquer_extras4(QVariant data1, QVariant data2);
static void heal_unit(QVariant data1, QVariant data2);
static void heal_unit2(QVariant data1, QVariant data2);
static void transport_board(QVariant data1, QVariant data2);
static void transport_board2(QVariant data1, QVariant data2);
static void transport_board3(QVariant data1, QVariant data2);
static void transport_embark(QVariant data1, QVariant data2);
static void transport_embark2(QVariant data1, QVariant data2);
static void transport_embark3(QVariant data1, QVariant data2);
static void transport_embark4(QVariant data1, QVariant data2);
static void transport_deboard(QVariant data1, QVariant data2);
static void transport_unload(QVariant data1, QVariant data2);
static void transport_load(QVariant data1, QVariant data2);
static void transport_load2(QVariant data1, QVariant data2);
static void transport_load3(QVariant data1, QVariant data2);
static void keep_moving(QVariant data1, QVariant data2);
static void pillage_something(QVariant data1, QVariant data2);
static void spy_request_strike_bld_list(QVariant data1, QVariant data2,
action_id act);
static void diplomat_incite(QVariant data1, QVariant data2, action_id act);
static void diplomat_incite_escape(QVariant data1, QVariant data2,
action_id act);
static void spy_request_sabotage_list(QVariant data1, QVariant data2,
action_id act);
static void spy_request_sabotage_esc_list(QVariant data1, QVariant data2,
action_id act);
static void spy_sabotage(QVariant data1, QVariant data2, action_id act);
static void spy_steal(QVariant data1, QVariant data2, action_id act);
static void spy_steal_esc(QVariant data1, QVariant data2, action_id act);
static void spy_steal_something(QVariant data1, QVariant data2, action_id act);
static void diplomat_steal(QVariant data1, QVariant data2, action_id act);
static void diplomat_steal_esc(QVariant data1, QVariant data2, action_id act);
static void spy_poison(QVariant data1, QVariant data2, action_id act);
static void spy_poison_esc(QVariant data1, QVariant data2, action_id act);
static void spy_spread_plague(QVariant data1, QVariant data2, action_id act);
static void spy_steal_gold(QVariant data1, QVariant data2, action_id act);
static void spy_steal_gold_esc(QVariant data1, QVariant data2, action_id act);
static void spy_steal_maps(QVariant data1, QVariant data2, action_id act);
static void spy_steal_maps_esc(QVariant data1, QVariant data2, action_id act);
static void spy_escape(QVariant data1, QVariant data2, action_id act);
static void spy_nuke_city(QVariant data1, QVariant data2, action_id act);
static void spy_nuke_city_esc(QVariant data1, QVariant data2, action_id act);
static void nuke_city(QVariant data1, QVariant data2, action_id act);
static void destroy_city(QVariant data1, QVariant data2, action_id act);
static void diplomat_embassy(QVariant data1, QVariant data2, action_id act);
static void spy_embassy(QVariant data1, QVariant data2, action_id act);
static void spy_sabotage_unit(QVariant data1, QVariant data2, action_id act);
static void spy_sabotage_unit_esc(QVariant data1, QVariant data2,
action_id act);
static void spy_investigate(QVariant data1, QVariant data2, action_id act);
static void diplomat_investigate(QVariant data1, QVariant data2, action_id act);
static void diplomat_sabotage(QVariant data1, QVariant data2, action_id act);
static void diplomat_sabotage_esc(QVariant data1, QVariant data2,
action_id act);
static void diplomat_bribe_unit(QVariant data1, QVariant data2, action_id act);
static void diplomat_bribe_stack(QVariant data1, QVariant data2, action_id act);
static void spy_attack(QVariant data1, QVariant data2, action_id act);
static void caravan_marketplace(QVariant data1, QVariant data2, action_id act);
static void caravan_establish_trade(QVariant data1, QVariant data2,
action_id act);
static void caravan_help_build(QVariant data1, QVariant data2, action_id act);
static void unit_disband_recover(QVariant data1, QVariant data2, action_id act);
static void capture_units(QVariant data1, QVariant data2, action_id act);
static void nuke_units(QVariant data1, QVariant data2, action_id act);
static void collect_ransom(QVariant data1, QVariant data2, action_id act);
static void wipe_units(QVariant data1, QVariant data2, action_id act);
static void expel_unit(QVariant data1, QVariant data2, action_id act);
static void bombard(QVariant data1, QVariant data2, action_id act);
static void bombard2(QVariant data1, QVariant data2, action_id act);
static void bombard3(QVariant data1, QVariant data2, action_id act);
static void bombard4(QVariant data1, QVariant data2, action_id act);
static void bombard_lethal(QVariant data1, QVariant data2, action_id act);
static void bombard_lethal2(QVariant data1, QVariant data2, action_id act);
static void found_city(QVariant data1, QVariant data2, action_id act);
static void transform_terrain(QVariant data1, QVariant data2, action_id act);
static void transform_terrain2(QVariant data1, QVariant data2, action_id act);
static void cultivate(QVariant data1, QVariant data2, action_id act);
static void cultivate2(QVariant data1, QVariant data2, action_id act);
static void plant(QVariant data1, QVariant data2, action_id act);
static void plant2(QVariant data1, QVariant data2, action_id act);
static void pillage(QVariant data1, QVariant data2, action_id act);
static void pillage2(QVariant data1, QVariant data2, action_id act);
static void clean(QVariant data1, QVariant data2, action_id act);
static void clean2(QVariant data1, QVariant data2, action_id act);
static void road(QVariant data1, QVariant data2, action_id act);
static void road2(QVariant data1, QVariant data2, action_id act);
static void base(QVariant data1, QVariant data2, action_id act);
static void base2(QVariant data1, QVariant data2, action_id act);
static void mine(QVariant data1, QVariant data2, action_id act);
static void mine2(QVariant data1, QVariant data2, action_id act);
static void irrigate(QVariant data1, QVariant data2, action_id act);
static void irrigate2(QVariant data1, QVariant data2, action_id act);
static void nuke(QVariant data1, QVariant data2, action_id act);
static void attack(QVariant data1, QVariant data2, action_id act);
static void attack2(QVariant data1, QVariant data2, action_id act);
static void suicide_attack(QVariant data1, QVariant data2, action_id act);
static void suicide_attack2(QVariant data1, QVariant data2, action_id act);
static void paradrop(QVariant data1, QVariant data2, action_id act);
static void paradrop_conquer(QVariant data1, QVariant data2, action_id act);
static void paradrop_frighten(QVariant data1, QVariant data2, action_id act);
static void paradrop_frighten_conquer(QVariant data1, QVariant data2,
action_id act);
static void paradrop_enter(QVariant data1, QVariant data2, action_id act);
static void paradrop_enter_conquer(QVariant data1, QVariant data2,
action_id act);
static void teleport(QVariant data1, QVariant data2, action_id act);
static void teleport2(QVariant data1, QVariant data2, action_id act);
static void teleport3(QVariant data1, QVariant data2, action_id act);
static void teleport_conquer(QVariant data1, QVariant data2, action_id act);
static void teleport_frighten(QVariant data1, QVariant data2, action_id act);
static void teleport_frighten_conquer(QVariant data1, QVariant data2,
action_id act);
static void teleport_enter(QVariant data1, QVariant data2, action_id act);
static void teleport_enter_conquer(QVariant data1, QVariant data2,
action_id act);
static void disembark1(QVariant data1, QVariant data2, action_id act);
static void disembark2(QVariant data1, QVariant data2, action_id act);
static void disembark3(QVariant data1, QVariant data2, action_id act);
static void disembark4(QVariant data1, QVariant data2, action_id act);
static void enter_hut(QVariant data1, QVariant data2, action_id act);
static void enter_hut2(QVariant data1, QVariant data2, action_id act);
static void enter_hut3(QVariant data1, QVariant data2, action_id act);
static void enter_hut4(QVariant data1, QVariant data2, action_id act);
static void frighten_hut(QVariant data1, QVariant data2, action_id act);
static void frighten_hut2(QVariant data1, QVariant data2, action_id act);
static void frighten_hut3(QVariant data1, QVariant data2, action_id act);
static void frighten_hut4(QVariant data1, QVariant data2, action_id act);
static void regular_move(QVariant data1, QVariant data2, action_id act);
static void regular_move2(QVariant data1, QVariant data2, action_id act);
static void regular_move3(QVariant data1, QVariant data2, action_id act);
static void scout(QVariant data1, QVariant data2, action_id act);
static void convert_unit(QVariant data1, QVariant data2, action_id act);
static void fortify(QVariant data1, QVariant data2, action_id act);
static void fortify2(QVariant data1, QVariant data2, action_id act);
static void disband_unit(QVariant data1, QVariant data2, action_id act);
static void homeless(QVariant data1, QVariant data2, action_id act);
static void join_city(QVariant data1, QVariant data2, action_id act);
static void unit_home_city(QVariant data1, QVariant data2, action_id act);
static void unit_upgrade(QVariant data1, QVariant data2, action_id act);
static void airlift(QVariant data1, QVariant data2, action_id act);
static void conquer_city_shrink(QVariant data1, QVariant data2, action_id act);
static void conquer_city_shrink2(QVariant data1, QVariant data2, action_id act);
static void conquer_city_shrink3(QVariant data1, QVariant data2, action_id act);
static void conquer_city_shrink4(QVariant data1, QVariant data2, action_id act);
static void conquer_extras(QVariant data1, QVariant data2, action_id act);
static void conquer_extras2(QVariant data1, QVariant data2, action_id act);
static void conquer_extras3(QVariant data1, QVariant data2, action_id act);
static void conquer_extras4(QVariant data1, QVariant data2, action_id act);
static void heal_unit(QVariant data1, QVariant data2, action_id act);
static void heal_unit2(QVariant data1, QVariant data2, action_id act);
static void transport_board(QVariant data1, QVariant data2, action_id act);
static void transport_board2(QVariant data1, QVariant data2, action_id act);
static void transport_board3(QVariant data1, QVariant data2, action_id act);
static void transport_embark(QVariant data1, QVariant data2, action_id act);
static void transport_embark2(QVariant data1, QVariant data2, action_id act);
static void transport_embark3(QVariant data1, QVariant data2, action_id act);
static void transport_embark4(QVariant data1, QVariant data2, action_id act);
static void transport_deboard(QVariant data1, QVariant data2, action_id act);
static void transport_unload(QVariant data1, QVariant data2, action_id act);
static void transport_load(QVariant data1, QVariant data2, action_id act);
static void transport_load2(QVariant data1, QVariant data2, action_id act);
static void transport_load3(QVariant data1, QVariant data2, action_id act);
static void keep_moving(QVariant data1, QVariant data2, action_id act);
static void pillage_something(QVariant data1, QVariant data2, action_id act);
static void action_entry(choice_dialog *cd,
action_id act,
const struct act_prob *act_probs,
......
}
func = af_map[action];
func(q1, q2);
func(q1, q2, action);
return true;
}
......
return false;
}
func = af_map[action];
func(q1, q2);
func(q1, q2, action);
return true;
}
......
Choice_dialog_button *button = buttons_list.at(action);
pfcn_void func = button->getFunc();
func(button->getData1(), button->getData2());
func(button->getData1(), button->getData2(), action);
close();
}
......
/***********************************************************************//**
Action enter market place for choice dialog
***************************************************************************/
static void caravan_marketplace(QVariant data1, QVariant data2)
static void caravan_marketplace(QVariant data1, QVariant data2, action_id act)
{
int actor_unit_id = data1.toInt();
int target_city_id = data2.toInt();
......
/***********************************************************************//**
Action establish trade for choice dialog
***************************************************************************/
static void caravan_establish_trade(QVariant data1, QVariant data2)
static void caravan_establish_trade(QVariant data1, QVariant data2, action_id act)
{
int actor_unit_id = data1.toInt();
int target_city_id = data2.toInt();
......
/***********************************************************************//**
Action help build wonder for choice dialog
***************************************************************************/
static void caravan_help_build(QVariant data1, QVariant data2)
static void caravan_help_build(QVariant data1, QVariant data2, action_id act)
{
int caravan_id = data1.toInt();
int caravan_target_id = data2.toInt();
......
/***********************************************************************//**
Action Disband Unit Recover for choice dialog
***************************************************************************/
static void unit_disband_recover(QVariant data1, QVariant data2)
static void unit_disband_recover(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int tgt_city_id = data2.toInt();
......
/***********************************************************************//**
Action Home City for choice dialog
***************************************************************************/
static void unit_home_city(QVariant data1, QVariant data2)
static void unit_home_city(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int tgt_city_id = data2.toInt();
......
/***********************************************************************//**
Action "Upgrade Unit" for choice dialog
***************************************************************************/
static void unit_upgrade(QVariant data1, QVariant data2)
static void unit_upgrade(QVariant data1, QVariant data2, action_id act)
{
struct unit *punit;
......
/***********************************************************************//**
Action "Airlift Unit" for choice dialog
***************************************************************************/
static void airlift(QVariant data1, QVariant data2)
static void airlift(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int tgt_city_id = data2.toInt();
......
/***********************************************************************//**
Action "Conquer City Shrink" for choice dialog
***************************************************************************/
static void conquer_city_shrink(QVariant data1, QVariant data2)
static void conquer_city_shrink(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int tgt_city_id = data2.toInt();
......
/***********************************************************************//**
Action "Conquer City Shrink 2" for choice dialog
***************************************************************************/
static void conquer_city_shrink2(QVariant data1, QVariant data2)
static void conquer_city_shrink2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int tgt_city_id = data2.toInt();
......
/***********************************************************************//**
Action "Conquer City Shrink 3" for choice dialog
***************************************************************************/
static void conquer_city_shrink3(QVariant data1, QVariant data2)
static void conquer_city_shrink3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int tgt_city_id = data2.toInt();
......
/***********************************************************************//**
Action "Conquer City Shrink 4" for choice dialog
***************************************************************************/
static void conquer_city_shrink4(QVariant data1, QVariant data2)
static void conquer_city_shrink4(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int tgt_city_id = data2.toInt();
......
/***********************************************************************//**
Action "Conquer Extras" for choice dialog
***************************************************************************/
static void conquer_extras(QVariant data1, QVariant data2)
static void conquer_extras(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Conquer Extras 2" for choice dialog
***************************************************************************/
static void conquer_extras2(QVariant data1, QVariant data2)
static void conquer_extras2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Conquer Extras 3" for choice dialog
***************************************************************************/
static void conquer_extras3(QVariant data1, QVariant data2)
static void conquer_extras3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Conquer Extras 4" for choice dialog
***************************************************************************/
static void conquer_extras4(QVariant data1, QVariant data2)
static void conquer_extras4(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Delay selection of what action to take.
***************************************************************************/
static void act_sel_wait(QVariant data1, QVariant data2)
static void act_sel_wait(QVariant data1, QVariant data2, action_id act)
{
key_unit_wait();
}
......
/***********************************************************************//**
Empty action for choice dialog (just do nothing)
***************************************************************************/
static void keep_moving(QVariant data1, QVariant data2)
static void keep_moving(QVariant data1, QVariant data2, action_id act)
{
}
......
/***********************************************************************//**
Action Disband Unit for choice dialog
***************************************************************************/
static void disband_unit(QVariant data1, QVariant data2)
static void disband_unit(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Fortify" for choice dialog
***************************************************************************/
static void fortify(QVariant data1, QVariant data2)
static void fortify(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Fortify 2" for choice dialog
***************************************************************************/
static void fortify2(QVariant data1, QVariant data2)
static void fortify2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action Convert Unit for choice dialog
***************************************************************************/
static void convert_unit(QVariant data1, QVariant data2)
static void convert_unit(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Unit Make Homeless" for choice dialog
***************************************************************************/
static void homeless(QVariant data1, QVariant data2)
static void homeless(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action bribe unit for choice dialog
***************************************************************************/
static void diplomat_bribe_unit(QVariant data1, QVariant data2)
static void diplomat_bribe_unit(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action bribe stack for choice dialog
***************************************************************************/
static void diplomat_bribe_stack(QVariant data1, QVariant data2)
static void diplomat_bribe_stack(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action sabotage unit for choice dialog
***************************************************************************/
static void spy_sabotage_unit(QVariant data1, QVariant data2)
static void spy_sabotage_unit(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action Sabotage Unit Escape for choice dialog
***************************************************************************/
static void spy_sabotage_unit_esc(QVariant data1, QVariant data2)
static void spy_sabotage_unit_esc(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action "Heal Unit" for choice dialog
***************************************************************************/
static void heal_unit(QVariant data1, QVariant data2)
static void heal_unit(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Heal Unit 2" for choice dialog
***************************************************************************/
static void heal_unit2(QVariant data1, QVariant data2)
static void heal_unit2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Board" for choice dialog
***************************************************************************/
static void transport_board(QVariant data1, QVariant data2)
static void transport_board(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Board 2" for choice dialog
***************************************************************************/
static void transport_board2(QVariant data1, QVariant data2)
static void transport_board2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Board 3" for choice dialog
***************************************************************************/
static void transport_board3(QVariant data1, QVariant data2)
static void transport_board3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Embark" for choice dialog
***************************************************************************/
static void transport_embark(QVariant data1, QVariant data2)
static void transport_embark(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Embark 2" for choice dialog
***************************************************************************/
static void transport_embark2(QVariant data1, QVariant data2)
static void transport_embark2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Embark 3" for choice dialog
***************************************************************************/
static void transport_embark3(QVariant data1, QVariant data2)
static void transport_embark3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Embark 4" for choice dialog
***************************************************************************/
static void transport_embark4(QVariant data1, QVariant data2)
static void transport_embark4(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Unload" for choice dialog
***************************************************************************/
static void transport_unload(QVariant data1, QVariant data2)
static void transport_unload(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Load" for choice dialog
***************************************************************************/
static void transport_load(QVariant data1, QVariant data2)
static void transport_load(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Load 2" for choice dialog
***************************************************************************/
static void transport_load2(QVariant data1, QVariant data2)
static void transport_load2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Load 3" for choice dialog
***************************************************************************/
static void transport_load3(QVariant data1, QVariant data2)
static void transport_load3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Deboard" for choice dialog
***************************************************************************/
static void transport_deboard(QVariant data1, QVariant data2)
static void transport_deboard(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Disembark" for choice dialog
***************************************************************************/
static void disembark1(QVariant data1, QVariant data2)
static void disembark1(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Disembark 2" for choice dialog
***************************************************************************/
static void disembark2(QVariant data1, QVariant data2)
static void disembark2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Disembark 3" for choice dialog
***************************************************************************/
static void disembark3(QVariant data1, QVariant data2)
static void disembark3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transport Disembark 4" for choice dialog
***************************************************************************/
static void disembark4(QVariant data1, QVariant data2)
static void disembark4(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Enter Hut" for choice dialog
***************************************************************************/
static void enter_hut(QVariant data1, QVariant data2)
static void enter_hut(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Enter Hut 2" for choice dialog
***************************************************************************/
static void enter_hut2(QVariant data1, QVariant data2)
static void enter_hut2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Enter Hut 3" for choice dialog
***************************************************************************/
static void enter_hut3(QVariant data1, QVariant data2)
static void enter_hut3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Enter Hut 4" for choice dialog
***************************************************************************/
static void enter_hut4(QVariant data1, QVariant data2)
static void enter_hut4(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Frighten Hut" for choice dialog
***************************************************************************/
static void frighten_hut(QVariant data1, QVariant data2)
static void frighten_hut(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Frighten Hut 2" for choice dialog
***************************************************************************/
static void frighten_hut2(QVariant data1, QVariant data2)
static void frighten_hut2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Frighten Hut 3" for choice dialog
***************************************************************************/
static void frighten_hut3(QVariant data1, QVariant data2)
static void frighten_hut3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Frighten Hut 4" for choice dialog
***************************************************************************/
static void frighten_hut4(QVariant data1, QVariant data2)
static void frighten_hut4(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/**********************************************************************//**
Action "Nuke Units" for choice dialog
***************************************************************************/
static void nuke_units(QVariant data1, QVariant data2)
static void nuke_units(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/**********************************************************************//**
Action "Collect Ransom" for choice dialog
***************************************************************************/
static void collect_ransom(QVariant data1, QVariant data2)
static void collect_ransom(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/**********************************************************************//**
Action "Spy Attack" for choice dialog
***************************************************************************/
static void spy_attack(QVariant data1, QVariant data2)
static void spy_attack(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/**********************************************************************//**
Action "Wipe Units" for choice dialog
***************************************************************************/
static void wipe_units(QVariant data1, QVariant data2)
static void wipe_units(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/**********************************************************************//**
Action capture units for choice dialog
***************************************************************************/
static void capture_units(QVariant data1, QVariant data2)
static void capture_units(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action expel unit for choice dialog
***************************************************************************/
static void expel_unit(QVariant data1, QVariant data2)
static void expel_unit(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Bombard" for choice dialog
***************************************************************************/
static void bombard(QVariant data1, QVariant data2)
static void bombard(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Bombard 2" for choice dialog
***************************************************************************/
static void bombard2(QVariant data1, QVariant data2)
static void bombard2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Bombard 3" for choice dialog
***************************************************************************/
static void bombard3(QVariant data1, QVariant data2)
static void bombard3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Bombard 4" for choice dialog
***************************************************************************/
static void bombard4(QVariant data1, QVariant data2)
static void bombard4(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Bombard Lethal" for choice dialog
***************************************************************************/
static void bombard_lethal(QVariant data1, QVariant data2)
static void bombard_lethal(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Bombard Lethal 2" for choice dialog
***************************************************************************/
static void bombard_lethal2(QVariant data1, QVariant data2)
static void bombard_lethal2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action build city for choice dialog
***************************************************************************/
static void found_city(QVariant data1, QVariant data2)
static void found_city(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
......
/***********************************************************************//**
Action "Transform Terrain" for choice dialog
***************************************************************************/
static void transform_terrain(QVariant data1, QVariant data2)
static void transform_terrain(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Transform Terrain 2" for choice dialog
***************************************************************************/
static void transform_terrain2(QVariant data1, QVariant data2)
static void transform_terrain2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Cultivate" for choice dialog
***************************************************************************/
static void cultivate(QVariant data1, QVariant data2)
static void cultivate(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Cultivate 2" for choice dialog
***************************************************************************/
static void cultivate2(QVariant data1, QVariant data2)
static void cultivate2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Plant" for choice dialog
***************************************************************************/
static void plant(QVariant data1, QVariant data2)
static void plant(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Plant 2" for choice dialog
***************************************************************************/
static void plant2(QVariant data1, QVariant data2)
static void plant2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Pillage" for choice dialog
***************************************************************************/
static void pillage(QVariant data1, QVariant data2)
static void pillage(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Pillage 2" for choice dialog
***************************************************************************/
static void pillage2(QVariant data1, QVariant data2)
static void pillage2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Clean" for choice dialog
***************************************************************************/
static void clean(QVariant data1, QVariant data2)
static void clean(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Clean 2" for choice dialog
***************************************************************************/
static void clean2(QVariant data1, QVariant data2)
static void clean2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Build Road" for choice dialog
***************************************************************************/
static void road(QVariant data1, QVariant data2)
static void road(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Build Road 2" for choice dialog
***************************************************************************/
static void road2(QVariant data1, QVariant data2)
static void road2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Build Base" for choice dialog
***************************************************************************/
static void base(QVariant data1, QVariant data2)
static void base(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Build Base 2" for choice dialog
***************************************************************************/
static void base2(QVariant data1, QVariant data2)
static void base2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Build Mine" for choice dialog
***************************************************************************/
static void mine(QVariant data1, QVariant data2)
static void mine(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Build Mine 2" for choice dialog
***************************************************************************/
static void mine2(QVariant data1, QVariant data2)
static void mine2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Build Irrigation" for choice dialog
***************************************************************************/
static void irrigate(QVariant data1, QVariant data2)
static void irrigate(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Build Irrigation 2" for choice dialog
***************************************************************************/
static void irrigate2(QVariant data1, QVariant data2)
static void irrigate2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Explode Nuclear" for choice dialog
***************************************************************************/
static void nuke(QVariant data1, QVariant data2)
static void nuke(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action "Attack" for choice dialog
***************************************************************************/
static void attack(QVariant data1, QVariant data2)
static void attack(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action "Attack 2" for choice dialog
***************************************************************************/
static void attack2(QVariant data1, QVariant data2)
static void attack2(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action "Suicide Attack" for choice dialog
***************************************************************************/
static void suicide_attack(QVariant data1, QVariant data2)
static void suicide_attack(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action "Suicide Attack 2" for choice dialog
***************************************************************************/
static void suicide_attack2(QVariant data1, QVariant data2)
static void suicide_attack2(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action "Paradrop Unit" for choice dialog
***************************************************************************/
static void paradrop(QVariant data1, QVariant data2)
static void paradrop(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Teleport Unit" for choice dialog
***************************************************************************/
static void teleport(QVariant data1, QVariant data2)
static void teleport(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Teleport Unit 2" for choice dialog
***************************************************************************/
static void teleport2(QVariant data1, QVariant data2)
static void teleport2(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Teleport Unit 3" for choice dialog
***************************************************************************/
static void teleport3(QVariant data1, QVariant data2)
static void teleport3(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Paradrop Unit Conquer" for choice dialog
***************************************************************************/
static void paradrop_conquer(QVariant data1, QVariant data2)
static void paradrop_conquer(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Teleport Unit Conquer" for choice dialog
***************************************************************************/
static void teleport_conquer(QVariant data1, QVariant data2)
static void teleport_conquer(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Paradrop Unit Frighten" for choice dialog
***************************************************************************/
static void paradrop_frighten(QVariant data1, QVariant data2)
static void paradrop_frighten(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Teleport Unit Frighten" for choice dialog
***************************************************************************/
static void teleport_frighten(QVariant data1, QVariant data2)
static void teleport_frighten(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Paradrop Unit Frighten Conquer" for choice dialog
***************************************************************************/
static void paradrop_frighten_conquer(QVariant data1, QVariant data2)
static void paradrop_frighten_conquer(QVariant data1, QVariant data2,
action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Teleport Unit Frighten Conquer" for choice dialog
***************************************************************************/
static void teleport_frighten_conquer(QVariant data1, QVariant data2)
static void teleport_frighten_conquer(QVariant data1, QVariant data2,
action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Paradrop Unit Enter" for choice dialog
***************************************************************************/
static void paradrop_enter(QVariant data1, QVariant data2)
static void paradrop_enter(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Teleport Unit Enter" for choice dialog
***************************************************************************/
static void teleport_enter(QVariant data1, QVariant data2)
static void teleport_enter(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Paradrop Unit Enter Conquer" for choice dialog
***************************************************************************/
static void paradrop_enter_conquer(QVariant data1, QVariant data2)
static void paradrop_enter_conquer(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Teleport Unit Enter Conquer" for choice dialog
***************************************************************************/
static void teleport_enter_conquer(QVariant data1, QVariant data2)
static void teleport_enter_conquer(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action join city for choice dialog
***************************************************************************/
static void join_city(QVariant data1, QVariant data2)
static void join_city(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action "Targeted Steal Tech" for choice dialog
***************************************************************************/
static void spy_steal(QVariant data1, QVariant data2)
static void spy_steal(QVariant data1, QVariant data2, action_id act)
{
spy_steal_shared(data1, data2, ACTION_SPY_TARGETED_STEAL_TECH);
}
......
/***********************************************************************//**
Action "Targeted Steal Tech Escape Expected" for choice dialog
***************************************************************************/
static void spy_steal_esc(QVariant data1, QVariant data2)
static void spy_steal_esc(QVariant data1, QVariant data2, action_id act)
{
spy_steal_shared(data1, data2, ACTION_SPY_TARGETED_STEAL_TECH_ESC);
}
......
/***********************************************************************//**
Action steal given tech for choice dialog
***************************************************************************/
static void spy_steal_something(QVariant data1, QVariant data2)
static void spy_steal_something(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toList().at(0).toInt();
int diplomat_target_id = data1.toList().at(1).toInt();
......
/***********************************************************************//**
Action request "Surgical Strike Building" list for choice dialog
***************************************************************************/
static void spy_request_strike_bld_list(QVariant data1, QVariant data2)
static void spy_request_strike_bld_list(QVariant data1, QVariant data2,
action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action request sabotage list for choice dialog
***************************************************************************/
static void spy_request_sabotage_list(QVariant data1, QVariant data2)
static void spy_request_sabotage_list(QVariant data1, QVariant data2,
action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action request sabotage (and escape) list for choice dialog
***************************************************************************/
static void spy_request_sabotage_esc_list(QVariant data1, QVariant data2)
static void spy_request_sabotage_esc_list(QVariant data1, QVariant data2,
action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action Poison City for choice dialog
***************************************************************************/
static void spy_poison(QVariant data1, QVariant data2)
static void spy_poison(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action Poison City Escape for choice dialog
***************************************************************************/
static void spy_poison_esc(QVariant data1, QVariant data2)
static void spy_poison_esc(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action Spread Plague for choice dialog
***************************************************************************/
static void spy_spread_plague(QVariant data1, QVariant data2)
static void spy_spread_plague(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action suitcase nuke for choice dialog
***************************************************************************/
static void spy_nuke_city(QVariant data1, QVariant data2)
static void spy_nuke_city(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action suitcase nuke escape for choice dialog
***************************************************************************/
static void spy_nuke_city_esc(QVariant data1, QVariant data2)
static void spy_nuke_city_esc(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action "Nuke City" for choice dialog
***************************************************************************/
static void nuke_city(QVariant data1, QVariant data2)
static void nuke_city(QVariant data1, QVariant data2, action_id act)
{
int actor_id = data1.toInt();
int target_id = data2.toInt();
......
/***********************************************************************//**
Action destroy city for choice dialog
***************************************************************************/
static void destroy_city(QVariant data1, QVariant data2)
static void destroy_city(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action steal gold for choice dialog
***************************************************************************/
static void spy_steal_gold(QVariant data1, QVariant data2)
static void spy_steal_gold(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action steal gold escape for choice dialog
***************************************************************************/
static void spy_steal_gold_esc(QVariant data1, QVariant data2)
static void spy_steal_gold_esc(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action steal maps for choice dialog
***************************************************************************/
static void spy_steal_maps(QVariant data1, QVariant data2)
static void spy_steal_maps(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action steal maps escape for choice dialog
***************************************************************************/
static void spy_steal_maps_esc(QVariant data1, QVariant data2)
static void spy_steal_maps_esc(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action Spy Escape for choice dialog
***************************************************************************/
static void spy_escape(QVariant data1, QVariant data2)
static void spy_escape(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action establish embassy for choice dialog
***************************************************************************/
static void spy_embassy(QVariant data1, QVariant data2)
static void spy_embassy(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action establish embassy for choice dialog
***************************************************************************/
static void diplomat_embassy(QVariant data1, QVariant data2)
static void diplomat_embassy(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action investigate city for choice dialog
***************************************************************************/
static void spy_investigate(QVariant data1, QVariant data2)
static void spy_investigate(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action Investigate City Spend Unit for choice dialog
***************************************************************************/
static void diplomat_investigate(QVariant data1, QVariant data2)
static void diplomat_investigate(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action sabotage for choice dialog
***************************************************************************/
static void diplomat_sabotage(QVariant data1, QVariant data2)
static void diplomat_sabotage(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action sabotage and escape for choice dialog
***************************************************************************/
static void diplomat_sabotage_esc(QVariant data1, QVariant data2)
static void diplomat_sabotage_esc(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action steal with diplomat for choice dialog
***************************************************************************/
static void diplomat_steal(QVariant data1, QVariant data2)
static void diplomat_steal(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
int diplomat_target_id = data2.toInt();
......
/***********************************************************************//**
Action "Steal Tech Escape Expected" for choice dialog
***************************************************************************/
static void diplomat_steal_esc(QVariant data1, QVariant data2)
static void diplomat_steal_esc(QVariant data1, QVariant data2, action_id act)
{
int diplomat_id = data1.toInt();
... This diff was truncated because it exceeds the maximum size that can be displayed.
(2-2/3)