Author: ilor
Date: Tue Jun 10 17:42:51 2008
New Revision: 27088
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27088&view=rev
Log:
Use std::make_pair() instead of std::pair<long-name,long-name>()
Modified:
trunk/src/game_events.cpp
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=27088&r1=27087&r2=27088&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Tue Jun 10 17:42:51 2008
@@ -2944,70 +2944,70 @@
**/
static void init_function_call_map()
{
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("teleport", &wml_func_teleport));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("unstone", &wml_func_unstone));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("allow_recruit", &wml_func_allow_recruit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("disallow_recruit", &wml_func_disallow_recruit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("set_recruit", &wml_func_set_recruit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("music", &wml_func_music));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("sound", &wml_func_sound));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("colour_adjust", &wml_func_colour_adjust));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("remove_shroud", &wml_func_remove_shroud));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("place_shroud", &wml_func_place_shroud));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("delay", &wml_func_delay));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("scroll", &wml_func_scroll));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("scroll_to", &wml_func_scroll_to));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("scroll_to_unit", &wml_func_scroll_to_unit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("gold", &wml_func_gold));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("modify_side", &wml_func_modify_side));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("store_side", &wml_func_store_side));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("store_gold", &wml_func_store_gold));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("modify_turns", &wml_func_modify_turns));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("store_turns", &wml_func_store_turns));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("move_unit_fake", &wml_func_move_unit_fake));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("objectives", &wml_func_objectives));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("set_variable", &wml_func_set_variable));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("set_variables", &wml_func_set_variables));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("role", &wml_func_role));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("removeitem", &wml_func_removeitem));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("remove_unit_overlay", &wml_func_remove_unit_overlay));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("unit_overlay", &wml_func_unit_overlay));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("hide_unit", &wml_func_hide_unit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("unhide_unit", &wml_func_unhide_unit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("item", &wml_func_item));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("sound_source", &wml_func_sound_source));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("remove_sound_source", &wml_func_remove_sound_source));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("terrain_mask", &wml_func_terrain_mask));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("terrain", &wml_func_terrain));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("unit", &wml_func_unit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("recall", &wml_func_recall));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("object", &wml_func_object));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("print", &wml_func_print));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("deprecated_message", &wml_func_deprecated_message));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("debug_message", &wml_func_debug_message));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("kill", &wml_func_kill));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("fire_event", &wml_func_fire_event));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("set_menu_item", &wml_func_set_menu_item));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("store_unit", &wml_func_store_unit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("unstore_unit", &wml_func_unstore_unit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("store_map_dimesions", &wml_func_store_map_dimensions));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("store_starting_location",
&wml_func_store_starting_location));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("store_villages", &wml_func_store_villages));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("store_locations", &wml_func_store_locations));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("capture_village", &wml_func_capture_village));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("clear_variable", &wml_func_clear_variable));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("endlevel", &wml_func_endlevel));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("redraw", &wml_func_redraw));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("animate_unit", &wml_func_animate_unit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("label", &wml_func_label));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("heal_unit", &wml_func_heal_unit));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("command", &wml_func_command));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("allow_undo", &wml_func_allow_undo));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("if", &wml_func_if));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("while", &wml_func_while));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("switch", &wml_func_switch));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("message", &wml_func_message));
- function_call_map.insert(std::pair<std::string,
wml_handler_function>("event", &wml_func_event));
+ function_call_map.insert(std::make_pair("teleport",
&wml_func_teleport));
+ function_call_map.insert(std::make_pair("unstone",
&wml_func_unstone));
+ function_call_map.insert(std::make_pair("allow_recruit",
&wml_func_allow_recruit));
+ function_call_map.insert(std::make_pair("disallow_recruit",
&wml_func_disallow_recruit));
+ function_call_map.insert(std::make_pair("set_recruit",
&wml_func_set_recruit));
+ function_call_map.insert(std::make_pair("music",
&wml_func_music));
+ function_call_map.insert(std::make_pair("sound",
&wml_func_sound));
+ function_call_map.insert(std::make_pair("colour_adjust",
&wml_func_colour_adjust));
+ function_call_map.insert(std::make_pair("remove_shroud",
&wml_func_remove_shroud));
+ function_call_map.insert(std::make_pair("place_shroud",
&wml_func_place_shroud));
+ function_call_map.insert(std::make_pair("delay",
&wml_func_delay));
+ function_call_map.insert(std::make_pair("scroll",
&wml_func_scroll));
+ function_call_map.insert(std::make_pair("scroll_to",
&wml_func_scroll_to));
+ function_call_map.insert(std::make_pair("scroll_to_unit",
&wml_func_scroll_to_unit));
+ function_call_map.insert(std::make_pair("gold",
&wml_func_gold));
+ function_call_map.insert(std::make_pair("modify_side",
&wml_func_modify_side));
+ function_call_map.insert(std::make_pair("store_side",
&wml_func_store_side));
+ function_call_map.insert(std::make_pair("store_gold",
&wml_func_store_gold));
+ function_call_map.insert(std::make_pair("modify_turns",
&wml_func_modify_turns));
+ function_call_map.insert(std::make_pair("store_turns",
&wml_func_store_turns));
+ function_call_map.insert(std::make_pair("move_unit_fake",
&wml_func_move_unit_fake));
+ function_call_map.insert(std::make_pair("objectives",
&wml_func_objectives));
+ function_call_map.insert(std::make_pair("set_variable",
&wml_func_set_variable));
+ function_call_map.insert(std::make_pair("set_variables",
&wml_func_set_variables));
+ function_call_map.insert(std::make_pair("role",
&wml_func_role));
+ function_call_map.insert(std::make_pair("removeitem",
&wml_func_removeitem));
+ function_call_map.insert(std::make_pair("remove_unit_overlay",
&wml_func_remove_unit_overlay));
+ function_call_map.insert(std::make_pair("unit_overlay",
&wml_func_unit_overlay));
+ function_call_map.insert(std::make_pair("hide_unit",
&wml_func_hide_unit));
+ function_call_map.insert(std::make_pair("unhide_unit",
&wml_func_unhide_unit));
+ function_call_map.insert(std::make_pair("item",
&wml_func_item));
+ function_call_map.insert(std::make_pair("sound_source",
&wml_func_sound_source));
+ function_call_map.insert(std::make_pair("remove_sound_source",
&wml_func_remove_sound_source));
+ function_call_map.insert(std::make_pair("terrain_mask",
&wml_func_terrain_mask));
+ function_call_map.insert(std::make_pair("terrain",
&wml_func_terrain));
+ function_call_map.insert(std::make_pair("unit",
&wml_func_unit));
+ function_call_map.insert(std::make_pair("recall",
&wml_func_recall));
+ function_call_map.insert(std::make_pair("object",
&wml_func_object));
+ function_call_map.insert(std::make_pair("print",
&wml_func_print));
+ function_call_map.insert(std::make_pair("deprecated_message",
&wml_func_deprecated_message));
+ function_call_map.insert(std::make_pair("debug_message",
&wml_func_debug_message));
+ function_call_map.insert(std::make_pair("kill",
&wml_func_kill));
+ function_call_map.insert(std::make_pair("fire_event",
&wml_func_fire_event));
+ function_call_map.insert(std::make_pair("set_menu_item",
&wml_func_set_menu_item));
+ function_call_map.insert(std::make_pair("store_unit",
&wml_func_store_unit));
+ function_call_map.insert(std::make_pair("unstore_unit",
&wml_func_unstore_unit));
+ function_call_map.insert(std::make_pair("store_map_dimesions",
&wml_func_store_map_dimensions));
+
function_call_map.insert(std::make_pair("store_starting_location",
&wml_func_store_starting_location));
+ function_call_map.insert(std::make_pair("store_villages",
&wml_func_store_villages));
+ function_call_map.insert(std::make_pair("store_locations",
&wml_func_store_locations));
+ function_call_map.insert(std::make_pair("capture_village",
&wml_func_capture_village));
+ function_call_map.insert(std::make_pair("clear_variable",
&wml_func_clear_variable));
+ function_call_map.insert(std::make_pair("endlevel",
&wml_func_endlevel));
+ function_call_map.insert(std::make_pair("redraw",
&wml_func_redraw));
+ function_call_map.insert(std::make_pair("animate_unit",
&wml_func_animate_unit));
+ function_call_map.insert(std::make_pair("label",
&wml_func_label));
+ function_call_map.insert(std::make_pair("heal_unit",
&wml_func_heal_unit));
+ function_call_map.insert(std::make_pair("command",
&wml_func_command));
+ function_call_map.insert(std::make_pair("allow_undo",
&wml_func_allow_undo));
+ function_call_map.insert(std::make_pair("if", &wml_func_if));
+ function_call_map.insert(std::make_pair("while",
&wml_func_while));
+ function_call_map.insert(std::make_pair("switch",
&wml_func_switch));
+ function_call_map.insert(std::make_pair("message",
&wml_func_message));
+ function_call_map.insert(std::make_pair("event",
&wml_func_event));
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
