[Widelands-cvs] SF.net SVN: widelands: [1727] trunk/src
Status: Beta
Brought to you by:
sirver
From: <si...@us...> - 2006-10-30 16:56:48
|
Revision: 1727 http://svn.sourceforge.net/widelands/?rev=1727&view=rev Author: sigra Date: 2006-10-30 08:56:33 -0800 (Mon, 30 Oct 2006) Log Message: ----------- fixes Modified Paths: -------------- trunk/src/editor/ui_menus/editor_player_menu.cc trunk/src/editor/ui_menus/editor_variables_menu.cc trunk/src/editor/ui_menus/event_allow_building_option_menu.cc trunk/src/editor/ui_menus/trigger_building_option_menu.cc trunk/src/editor/ui_menus/trigger_null_option_menu.cc trunk/src/ui/ui_basic/ui_window.cc trunk/src/widelands_map_allowed_buildings_data_packet.cc trunk/src/widelands_map_building_data_packet.cc Modified: trunk/src/editor/ui_menus/editor_player_menu.cc =================================================================== --- trunk/src/editor/ui_menus/editor_player_menu.cc 2006-10-30 12:52:20 UTC (rev 1726) +++ trunk/src/editor/ui_menus/editor_player_menu.cc 2006-10-30 16:56:33 UTC (rev 1727) @@ -369,7 +369,7 @@ const Coords &c = m_parent->get_map()->get_starting_pos(p->get_player_number()); int idx = p->get_tribe()->get_building_index("headquarters"); if (idx < 0) - throw wexception("Tribe %s lacks headquarters", p->get_tribe()->get_name()); + throw wexception("Tribe %s lacks headquarters", p->get_tribe()->get_name().c_str()); m_parent->get_egbase()->warp_building(c, p->get_player_number(), idx); m_parent->reference_player_tribe(n, p->get_tribe()); Modified: trunk/src/editor/ui_menus/editor_variables_menu.cc =================================================================== --- trunk/src/editor/ui_menus/editor_variables_menu.cc 2006-10-30 12:52:20 UTC (rev 1726) +++ trunk/src/editor/ui_menus/editor_variables_menu.cc 2006-10-30 16:56:33 UTC (rev 1727) @@ -196,7 +196,7 @@ } else return false; // we're not dragable } -bool Edit_Variable_Window::handle_mouserelease(const Uint8 btn, int, int) +bool Edit_Variable_Window::handle_mouserelease(const Uint8, int, int) {return false;} /* Modified: trunk/src/editor/ui_menus/event_allow_building_option_menu.cc =================================================================== --- trunk/src/editor/ui_menus/event_allow_building_option_menu.cc 2006-10-30 12:52:20 UTC (rev 1726) +++ trunk/src/editor/ui_menus/event_allow_building_option_menu.cc 2006-10-30 16:56:33 UTC (rev 1727) @@ -143,7 +143,7 @@ } bool Event_Allow_Building_Option_Menu::handle_mouserelease -(const Uint8 btn, int, int) +(const Uint8, int, int) {return false;} /* Modified: trunk/src/editor/ui_menus/trigger_building_option_menu.cc =================================================================== --- trunk/src/editor/ui_menus/trigger_building_option_menu.cc 2006-10-30 12:52:20 UTC (rev 1726) +++ trunk/src/editor/ui_menus/trigger_building_option_menu.cc 2006-10-30 16:56:33 UTC (rev 1727) @@ -225,8 +225,7 @@ } else return false; // we're not dragable } -bool Trigger_Building_Option_Menu::handle_mouserelease -(const Uint8 btn, int, int) +bool Trigger_Building_Option_Menu::handle_mouserelease(const Uint8, int, int) {return false;} /* Modified: trunk/src/editor/ui_menus/trigger_null_option_menu.cc =================================================================== --- trunk/src/editor/ui_menus/trigger_null_option_menu.cc 2006-10-30 12:52:20 UTC (rev 1726) +++ trunk/src/editor/ui_menus/trigger_null_option_menu.cc 2006-10-30 16:56:33 UTC (rev 1727) @@ -84,7 +84,7 @@ } else return false; // we're not dragable } -bool Trigger_Null_Option_Menu::handle_mouserelease(const Uint8 btn, int, int) +bool Trigger_Null_Option_Menu::handle_mouserelease(const Uint8, int, int) {return false;} /* Modified: trunk/src/ui/ui_basic/ui_window.cc =================================================================== --- trunk/src/ui/ui_basic/ui_window.cc 2006-10-30 12:52:20 UTC (rev 1726) +++ trunk/src/ui/ui_basic/ui_window.cc 2006-10-30 16:56:33 UTC (rev 1727) @@ -293,7 +293,7 @@ } return true; } -bool UIWindow::handle_mouserelease(const Uint8 btn, int mx, int my) { +bool UIWindow::handle_mouserelease(const Uint8 btn, int, int) { if (btn == SDL_BUTTON_LEFT) { grab_mouse(false); _dragging = false; Modified: trunk/src/widelands_map_allowed_buildings_data_packet.cc =================================================================== --- trunk/src/widelands_map_allowed_buildings_data_packet.cc 2006-10-30 12:52:20 UTC (rev 1726) +++ trunk/src/widelands_map_allowed_buildings_data_packet.cc 2006-10-30 16:56:33 UTC (rev 1727) @@ -99,7 +99,7 @@ bool allowed = s->get_bool(name); int index=t->get_building_index(name); if(index==-1) - throw wexception("Unknown building found in map (Allowed_Buildings_Data): %s is not in tribe %s", name, t->get_name()); + throw wexception("Unknown building found in map (Allowed_Buildings_Data): %s is not in tribe %s", name, t->get_name().c_str()); plr->allow_building(index, allowed); } } Modified: trunk/src/widelands_map_building_data_packet.cc =================================================================== --- trunk/src/widelands_map_building_data_packet.cc 2006-10-30 12:52:20 UTC (rev 1726) +++ trunk/src/widelands_map_building_data_packet.cc 2006-10-30 16:56:33 UTC (rev 1727) @@ -86,7 +86,7 @@ int index=plr->get_tribe()->get_building_index(name.c_str()); if(index==-1) throw wexception("Widelands_Map_Building_Data_Packet::Read(): Should create building %s in tribe %s, but building is unknown!\n", - name.c_str(), plr->get_tribe()->get_name()); + name.c_str(), plr->get_tribe()->get_name().c_str()); // Now, create this Building, take extra special care for constructionsites Building* building=0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |