Thread: [Widelands-cvs] SF.net SVN: widelands:[4337] trunk/src/editor/editorinteractive.cc
Status: Beta
Brought to you by:
sirver
From: <si...@us...> - 2009-06-30 14:07:48
|
Revision: 4337 http://widelands.svn.sourceforge.net/widelands/?rev=4337&view=rev Author: sigra Date: 2009-06-30 12:32:14 +0000 (Tue, 30 Jun 2009) Log Message: ----------- attempt to make this iteration safer Modified Paths: -------------- trunk/src/editor/editorinteractive.cc Modified: trunk/src/editor/editorinteractive.cc =================================================================== --- trunk/src/editor/editorinteractive.cc 2009-06-29 21:04:56 UTC (rev 4336) +++ trunk/src/editor/editorinteractive.cc 2009-06-30 12:32:14 UTC (rev 4337) @@ -229,26 +229,34 @@ } void Editor_Interactive::toggle_mainmenu() { - if (m_mainmenu.window) delete m_mainmenu.window; - else new Editor_Main_Menu(this, &m_mainmenu); + if (m_mainmenu.window) + delete m_mainmenu.window; + else + new Editor_Main_Menu(this, &m_mainmenu); } void Editor_Interactive::toggle_objectivesmenu() { - if (m_objectivesmenu.window) delete m_objectivesmenu.window; - else new Editor_Objectives_Menu(this, &m_objectivesmenu); + if (m_objectivesmenu.window) + delete m_objectivesmenu.window; + else + new Editor_Objectives_Menu(this, &m_objectivesmenu); } void Editor_Interactive::toggle_variablesmenu() { - if (m_variablesmenu.window) delete m_variablesmenu.window; - else new Editor_Variables_Menu(*this, &m_variablesmenu); + if (m_variablesmenu.window) + delete m_variablesmenu.window; + else + new Editor_Variables_Menu(*this, &m_variablesmenu); } void Editor_Interactive::toggle_eventmenu() { - if (m_eventmenu.window) delete m_eventmenu.window; - else new Editor_Event_Menu(*this, &m_eventmenu); + if (m_eventmenu.window) + delete m_eventmenu.window; + else + new Editor_Event_Menu(*this, &m_eventmenu); } void Editor_Interactive::map_clicked() { @@ -280,13 +288,16 @@ void Editor_Interactive::tool_menu_btn() { - if (m_toolmenu.window) delete m_toolmenu.window; - else new Editor_Tool_Menu(*this, m_toolmenu); + if (m_toolmenu.window) + delete m_toolmenu.window; + else + new Editor_Tool_Menu(*this, m_toolmenu); } void Editor_Interactive::toggle_playermenu() { - if (m_playermenu.window) delete m_playermenu.window; + if (m_playermenu.window) + delete m_playermenu.window; else { select_tool(tools.set_starting_pos, Editor_Tool::First); new Editor_Player_Menu(*this, &m_playermenu); @@ -296,8 +307,10 @@ void Editor_Interactive::toolsize_menu_btn() { - if (m_toolsizemenu.window) delete m_toolsizemenu.window; - else new Editor_Toolsize_Menu(this, &m_toolsizemenu); + if (m_toolsizemenu.window) + delete m_toolsizemenu.window; + else + new Editor_Toolsize_Menu(this, &m_toolsizemenu); } @@ -510,13 +523,19 @@ std::vector<Player_References>::iterator it = references.begin(); std::vector<Player_References>::const_iterator references_end = references.end(); - if (player > 0) { + if (player) for (; it < references_end; ++it) - if (it->player == player and it->object == data) break; - references.erase(it); - } else // Player is invalid. Remove all references from this object. - for (; it < references_end; ++it) - if (it->object == data) {references.erase(it); --it, --references_end;} + if (it->player == player and it->object == data) { + references.erase(it); + break; + } + else // Player is invalid. Remove all references from this object. + while (it < references_end) + if (it->object == data) { + it = references.erase(it); + references_end = references.end(); + } else + ++it; } bool Editor_Interactive::is_player_tribe_referenced(int32_t player) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2009-08-21 20:33:21
|
Revision: 4488 http://widelands.svn.sourceforge.net/widelands/?rev=4488&view=rev Author: sigra Date: 2009-08-21 20:33:14 +0000 (Fri, 21 Aug 2009) Log Message: ----------- Inform the user what is taking so long when starting the editor. Modified Paths: -------------- trunk/src/editor/editorinteractive.cc Modified: trunk/src/editor/editorinteractive.cc =================================================================== --- trunk/src/editor/editorinteractive.cc 2009-08-21 20:25:48 UTC (rev 4487) +++ trunk/src/editor/editorinteractive.cc 2009-08-21 20:33:14 UTC (rev 4488) @@ -599,9 +599,12 @@ { // Load all tribes into memory std::vector<std::string> tribenames; Widelands::Tribe_Descr::get_all_tribenames(tribenames); - container_iterate_const(std::vector<std::string>, tribenames, i) + container_iterate_const(std::vector<std::string>, tribenames, i) { + loader_ui.stepf(_("Loading tribe: %s"), i.current->c_str()); editor.manually_load_tribe(*i.current); + } } + loader_ui.step(std::string()); eia.select_tool(eia.tools.increase_height, Editor_Tool::First); editor.postload(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2010-01-30 23:14:59
|
Revision: 5026 http://widelands.svn.sourceforge.net/widelands/?rev=5026&view=rev Author: sirver Date: 2010-01-30 23:14:53 +0000 (Sat, 30 Jan 2010) Log Message: ----------- Fixed a bug with resource overlays in the editor When a map was loaded to be edited again, when the number of resources would been decreased to zero, the resource overlay would not vanish. The Problem was that upon loading, when the overlays were first installed, PicMod_Game was used while in the Editor PicMod_Menu was used. Fixed loading to PicMod_Menu too. Modified Paths: -------------- trunk/src/editor/editorinteractive.cc Modified: trunk/src/editor/editorinteractive.cc =================================================================== --- trunk/src/editor/editorinteractive.cc 2010-01-30 18:39:21 UTC (rev 5025) +++ trunk/src/editor/editorinteractive.cc 2010-01-30 23:14:53 UTC (rev 5026) @@ -140,7 +140,7 @@ (amount); if (immname.size()) overlay_manager.register_overlay - (fc, g_gr->get_picture(PicMod_Game, immname.c_str()), 4); + (fc, g_gr->get_picture(PicMod_Menu, immname.c_str()), 4); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |