From e9ed01ee5f7225b899108d913170c8928fd038d6 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sun, 4 Jan 2015 23:19:11 +1100 Subject: [PATCH] Fixup HEAD Restored a comma I accidentally deleted and fixed a minor style inconsistency --- src/scripting/game_lua_kernel.cpp | 146 +++++++++++++++--------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index 16f537c27c90..81c7e208c961 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -3626,79 +3626,79 @@ game_lua_kernel::game_lua_kernel(const config &cfg, CVideo * video, game_state & { NULL, NULL } }; lua_cpp::Reg const cpp_callbacks[] = { - { "add_event_handler", boost::bind(&game_lua_kernel::intf_add_event, this, _1) }, - { "add_tile_overlay", boost::bind(&game_lua_kernel::intf_add_tile_overlay, this, _1) }, - { "add_time_area", boost::bind(&game_lua_kernel::intf_add_time_area, this, _1) }, - { "allow_end_turn", boost::bind(&game_lua_kernel::intf_allow_end_turn, this, _1) }, - { "allow_undo", boost::bind(&game_lua_kernel::intf_allow_undo, this, _1) }, - { "animate_unit", boost::bind(&game_lua_kernel::intf_animate_unit, this, _1) }, - { "check_end_level_disabled", boost::bind(&game_lua_kernel::intf_check_end_level_disabled, this, _1) }, - { "clear_menu_item", boost::bind(&game_lua_kernel::intf_clear_menu_item, this, _1) }, - { "clear_messages", boost::bind(&game_lua_kernel::intf_clear_messages, this, _1) }, - { "color_adjust", boost::bind(&game_lua_kernel::intf_color_adjust, this, _1) }, - { "delay", boost::bind(&game_lua_kernel::intf_delay, this, _1) }, - { "end_turn", boost::bind(&game_lua_kernel::intf_end_turn, this, _1) }, - { "end_level", boost::bind(&game_lua_kernel::intf_end_level, this, _1) }, - { "extract_unit", boost::bind(&game_lua_kernel::intf_extract_unit, this, _1) }, - { "find_cost_map", boost::bind(&game_lua_kernel::intf_find_cost_map, this, _1) }, - { "find_path", boost::bind(&game_lua_kernel::intf_find_path, this, _1) }, - { "find_reach", boost::bind(&game_lua_kernel::intf_find_reach this, _1) }, - { "find_vacant_tile", boost::bind(&game_lua_kernel::intf_find_vacant_tile, this, _1) }, - { "fire_event", boost::bind(&game_lua_kernel::intf_fire_event, this, _1) }, - { "float_label", boost::bind(&game_lua_kernel::intf_float_label, this, _1) }, - { "gamestate_inspector", boost::bind(&game_lua_kernel::intf_gamestate_inspector, this, _1) }, - { "get_all_vars", boost::bind(&game_lua_kernel::intf_get_all_vars, this, _1) }, - { "get_locations", boost::bind(&game_lua_kernel::intf_get_locations, this, _1) }, - { "get_map_size", boost::bind(&game_lua_kernel::intf_get_map_size, this, _1) }, - { "get_mouseover_tile", boost::bind(&game_lua_kernel::intf_get_mouseover_tile, this, _1) }, - { "get_recall_units", boost::bind(&game_lua_kernel::intf_get_recall_units, this, _1) }, - { "get_selected_tile", boost::bind(&game_lua_kernel::intf_get_selected_tile, this, _1) }, - { "get_sides", boost::bind(&game_lua_kernel::intf_get_sides, this, _1) }, - { "get_starting_location", boost::bind(&game_lua_kernel::intf_get_starting_location, this, _1) }, - { "get_terrain", boost::bind(&game_lua_kernel::intf_get_terrain, this, _1) }, - { "get_terrain_info", boost::bind(&game_lua_kernel::intf_get_terrain_info, this, _1) }, - { "get_time_of_day", boost::bind(&game_lua_kernel::intf_get_time_of_day, this, _1) }, - { "get_unit", boost::bind(&game_lua_kernel::intf_get_unit, this, _1) }, - { "get_units", boost::bind(&game_lua_kernel::intf_get_units, this, _1) }, - { "get_variable", boost::bind(&game_lua_kernel::intf_get_variable, this, _1) }, - { "get_villages", boost::bind(&game_lua_kernel::intf_get_villages, this, _1) }, - { "get_village_owner", boost::bind(&game_lua_kernel::intf_get_village_owner, this, _1) }, - { "get_displayed_unit", boost::bind(&game_lua_kernel::intf_get_displayed_unit, this, _1) }, - { "heal_unit", boost::bind(&game_lua_kernel::intf_heal_unit, this, _1) }, - { "highlight_hex", boost::bind(&game_lua_kernel::intf_highlight_hex, this, _1) }, - { "is_enemy", boost::bind(&game_lua_kernel::intf_is_enemy, this, _1) }, - { "kill", boost::bind(&game_lua_kernel::intf_kill, this, _1) }, - { "label", boost::bind(&game_lua_kernel::intf_label, this, _1) }, - { "lock_view", boost::bind(&game_lua_kernel::intf_lock_view, this, _1) }, - { "match_location", boost::bind(&game_lua_kernel::intf_match_location, this, _1) }, - { "match_side", boost::bind(&game_lua_kernel::intf_match_side, this, _1) }, - { "match_unit", boost::bind(&game_lua_kernel::intf_match_unit, this, _1) }, - { "message", boost::bind(&game_lua_kernel::intf_message, this, _1) }, - { "modify_side", boost::bind(&game_lua_kernel::intf_modify_side, this, _1) }, - { "open_help", boost::bind(&game_lua_kernel::intf_open_help, this, _1) }, - { "play_sound", boost::bind(&game_lua_kernel::intf_play_sound, this, _1) }, - { "place_shroud", boost::bind(&game_lua_kernel::intf_shroud_op, this, _1, true) }, - { "put_recall_unit", boost::bind(&game_lua_kernel::intf_put_recall_unit, this, _1) }, - { "put_unit", boost::bind(&game_lua_kernel::intf_put_unit, this, _1) }, - { "redraw", boost::bind(&game_lua_kernel::intf_redraw, this, _1) }, - { "remove_event_handler", boost::bind(&game_lua_kernel::intf_remove_event, this, _1) }, - { "remove_shroud", boost::bind(&game_lua_kernel::intf_shroud_op, this, _1, false)}, - { "remove_tile_overlay", boost::bind(&game_lua_kernel::intf_remove_tile_overlay, this, _1) }, - { "remove_time_area", boost::bind(&game_lua_kernel::intf_remove_time_area, this, _1) }, - { "replace_schedule", boost::bind(&game_lua_kernel::intf_replace_schedule, this, _1) }, - { "scroll", boost::bind(&game_lua_kernel::intf_scroll, this, _1) }, - { "scroll_to_tile", boost::bind(&game_lua_kernel::intf_scroll_to_tile, this, _1) }, - { "select_hex", boost::bind(&game_lua_kernel::intf_select_hex, this, _1) }, - { "set_end_campaign_credits", boost::bind(&game_lua_kernel::intf_set_end_campaign_credits, this, _1) }, - { "set_end_campaign_text", boost::bind(&game_lua_kernel::intf_set_end_campaign_text, this, _1) }, - { "set_menu_item", boost::bind(&game_lua_kernel::intf_set_menu_item, this, _1) }, - { "set_next_scenario", boost::bind(&game_lua_kernel::intf_set_next_scenario, this, _1) }, - { "set_terrain", boost::bind(&game_lua_kernel::intf_set_terrain, this, _1) }, - { "set_variable", boost::bind(&game_lua_kernel::intf_set_variable, this, _1) }, - { "set_village_owner", boost::bind(&game_lua_kernel::intf_set_village_owner, this, _1) }, - { "simulate_combat", boost::bind(&game_lua_kernel::intf_simulate_combat, this, _1) }, - { "synchronize_choice", boost::bind(&game_lua_kernel::intf_synchronize_choice, this, _1) }, - { "view_locked", boost::bind(&game_lua_kernel::intf_view_locked, this, _1) }, + { "add_event_handler", boost::bind(&game_lua_kernel::intf_add_event, this, _1 )}, + { "add_tile_overlay", boost::bind(&game_lua_kernel::intf_add_tile_overlay, this, _1 )}, + { "add_time_area", boost::bind(&game_lua_kernel::intf_add_time_area, this, _1 )}, + { "allow_end_turn", boost::bind(&game_lua_kernel::intf_allow_end_turn, this, _1 )}, + { "allow_undo", boost::bind(&game_lua_kernel::intf_allow_undo, this, _1 )}, + { "animate_unit", boost::bind(&game_lua_kernel::intf_animate_unit, this, _1 )}, + { "check_end_level_disabled", boost::bind(&game_lua_kernel::intf_check_end_level_disabled, this, _1 )}, + { "clear_menu_item", boost::bind(&game_lua_kernel::intf_clear_menu_item, this, _1 )}, + { "clear_messages", boost::bind(&game_lua_kernel::intf_clear_messages, this, _1 )}, + { "color_adjust", boost::bind(&game_lua_kernel::intf_color_adjust, this, _1 )}, + { "delay", boost::bind(&game_lua_kernel::intf_delay, this, _1 )}, + { "end_turn", boost::bind(&game_lua_kernel::intf_end_turn, this, _1 )}, + { "end_level", boost::bind(&game_lua_kernel::intf_end_level, this, _1 )}, + { "extract_unit", boost::bind(&game_lua_kernel::intf_extract_unit, this, _1 )}, + { "find_cost_map", boost::bind(&game_lua_kernel::intf_find_cost_map, this, _1 )}, + { "find_path", boost::bind(&game_lua_kernel::intf_find_path, this, _1 )}, + { "find_reach", boost::bind(&game_lua_kernel::intf_find_reach, this, _1 )}, + { "find_vacant_tile", boost::bind(&game_lua_kernel::intf_find_vacant_tile, this, _1 )}, + { "fire_event", boost::bind(&game_lua_kernel::intf_fire_event, this, _1 )}, + { "float_label", boost::bind(&game_lua_kernel::intf_float_label, this, _1 )}, + { "gamestate_inspector", boost::bind(&game_lua_kernel::intf_gamestate_inspector, this, _1 )}, + { "get_all_vars", boost::bind(&game_lua_kernel::intf_get_all_vars, this, _1 )}, + { "get_locations", boost::bind(&game_lua_kernel::intf_get_locations, this, _1 )}, + { "get_map_size", boost::bind(&game_lua_kernel::intf_get_map_size, this, _1 )}, + { "get_mouseover_tile", boost::bind(&game_lua_kernel::intf_get_mouseover_tile, this, _1 )}, + { "get_recall_units", boost::bind(&game_lua_kernel::intf_get_recall_units, this, _1 )}, + { "get_selected_tile", boost::bind(&game_lua_kernel::intf_get_selected_tile, this, _1 )}, + { "get_sides", boost::bind(&game_lua_kernel::intf_get_sides, this, _1 )}, + { "get_starting_location", boost::bind(&game_lua_kernel::intf_get_starting_location, this, _1 )}, + { "get_terrain", boost::bind(&game_lua_kernel::intf_get_terrain, this, _1 )}, + { "get_terrain_info", boost::bind(&game_lua_kernel::intf_get_terrain_info, this, _1 )}, + { "get_time_of_day", boost::bind(&game_lua_kernel::intf_get_time_of_day, this, _1 )}, + { "get_unit", boost::bind(&game_lua_kernel::intf_get_unit, this, _1 )}, + { "get_units", boost::bind(&game_lua_kernel::intf_get_units, this, _1 )}, + { "get_variable", boost::bind(&game_lua_kernel::intf_get_variable, this, _1 )}, + { "get_villages", boost::bind(&game_lua_kernel::intf_get_villages, this, _1 )}, + { "get_village_owner", boost::bind(&game_lua_kernel::intf_get_village_owner, this, _1 )}, + { "get_displayed_unit", boost::bind(&game_lua_kernel::intf_get_displayed_unit, this, _1 )}, + { "heal_unit", boost::bind(&game_lua_kernel::intf_heal_unit, this, _1 )}, + { "highlight_hex", boost::bind(&game_lua_kernel::intf_highlight_hex, this, _1 )}, + { "is_enemy", boost::bind(&game_lua_kernel::intf_is_enemy, this, _1 )}, + { "kill", boost::bind(&game_lua_kernel::intf_kill, this, _1 )}, + { "label", boost::bind(&game_lua_kernel::intf_label, this, _1 )}, + { "lock_view", boost::bind(&game_lua_kernel::intf_lock_view, this, _1 )}, + { "match_location", boost::bind(&game_lua_kernel::intf_match_location, this, _1 )}, + { "match_side", boost::bind(&game_lua_kernel::intf_match_side, this, _1 )}, + { "match_unit", boost::bind(&game_lua_kernel::intf_match_unit, this, _1 )}, + { "message", boost::bind(&game_lua_kernel::intf_message, this, _1 )}, + { "modify_side", boost::bind(&game_lua_kernel::intf_modify_side, this, _1 )}, + { "open_help", boost::bind(&game_lua_kernel::intf_open_help, this, _1 )}, + { "play_sound", boost::bind(&game_lua_kernel::intf_play_sound, this, _1 )}, + { "place_shroud", boost::bind(&game_lua_kernel::intf_shroud_op, this, _1, true )}, + { "put_recall_unit", boost::bind(&game_lua_kernel::intf_put_recall_unit, this, _1 )}, + { "put_unit", boost::bind(&game_lua_kernel::intf_put_unit, this, _1 )}, + { "redraw", boost::bind(&game_lua_kernel::intf_redraw, this, _1 )}, + { "remove_event_handler", boost::bind(&game_lua_kernel::intf_remove_event, this, _1 )}, + { "remove_shroud", boost::bind(&game_lua_kernel::intf_shroud_op, this, _1, false )}, + { "remove_tile_overlay", boost::bind(&game_lua_kernel::intf_remove_tile_overlay, this, _1 )}, + { "remove_time_area", boost::bind(&game_lua_kernel::intf_remove_time_area, this, _1 )}, + { "replace_schedule", boost::bind(&game_lua_kernel::intf_replace_schedule, this, _1 )}, + { "scroll", boost::bind(&game_lua_kernel::intf_scroll, this, _1 )}, + { "scroll_to_tile", boost::bind(&game_lua_kernel::intf_scroll_to_tile, this, _1 )}, + { "select_hex", boost::bind(&game_lua_kernel::intf_select_hex, this, _1 )}, + { "set_end_campaign_credits", boost::bind(&game_lua_kernel::intf_set_end_campaign_credits, this, _1 )}, + { "set_end_campaign_text", boost::bind(&game_lua_kernel::intf_set_end_campaign_text, this, _1 )}, + { "set_menu_item", boost::bind(&game_lua_kernel::intf_set_menu_item, this, _1 )}, + { "set_next_scenario", boost::bind(&game_lua_kernel::intf_set_next_scenario, this, _1 )}, + { "set_terrain", boost::bind(&game_lua_kernel::intf_set_terrain, this, _1 )}, + { "set_variable", boost::bind(&game_lua_kernel::intf_set_variable, this, _1 )}, + { "set_village_owner", boost::bind(&game_lua_kernel::intf_set_village_owner, this, _1 )}, + { "simulate_combat", boost::bind(&game_lua_kernel::intf_simulate_combat, this, _1 )}, + { "synchronize_choice", boost::bind(&game_lua_kernel::intf_synchronize_choice, this, _1 )}, + { "view_locked", boost::bind(&game_lua_kernel::intf_view_locked, this, _1 )}, { NULL, NULL } }; lua_getglobal(L, "wesnoth");