From 9ce1b235a6d7843b67387fee18d7bfa5eb6fa515e2603a7e79458c07828f33ac Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Fri, 30 Apr 2010 11:06:08 +0000
Subject: [PATCH] add more fixes to constructor.patch

OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=25
---
 widelands-constructor.patch | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/widelands-constructor.patch b/widelands-constructor.patch
index cfea3a8..fc18f00 100644
--- a/widelands-constructor.patch
+++ b/widelands-constructor.patch
@@ -1,4 +1,6 @@
---- src/editor/ui_menus/editor_main_menu_new_map.cc
+Index: src/editor/ui_menus/editor_main_menu_new_map.cc
+===================================================================
+--- src/editor/ui_menus/editor_main_menu_new_map.cc.orig
 +++ src/editor/ui_menus/editor_main_menu_new_map.cc
 @@ -113,7 +113,7 @@ Main_Menu_New_Map::Main_Menu_New_Map(Edi
  		 posx, posy, width, height,
@@ -18,3 +20,34 @@
  			 	());
  		break;
  	}
+Index: src/editor/ui_menus/editor_main_menu_random_map.cc
+===================================================================
+--- src/editor/ui_menus/editor_main_menu_random_map.cc.orig
++++ src/editor/ui_menus/editor_main_menu_random_map.cc
+@@ -272,7 +272,7 @@ Main_Menu_New_Random_Map::Main_Menu_New_
+ 		 posx, posy, width, height,
+ 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
+ 		 &Main_Menu_New_Random_Map::button_clicked, *this, 8,
+-		 Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
++		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+ 
+ 	posy += height + spacing + spacing + spacing;
+ 
+@@ -343,7 +343,7 @@ void Main_Menu_New_Random_Map::button_cl
+ 		if (m_currentworld == m_worlds.size())
+ 			m_currentworld = 0;
+ 		m_world->set_title
+-			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
++			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+ 		break;
+ 	case 9:
+ 		break;
+@@ -476,7 +476,7 @@ void Main_Menu_New_Random_Map::id_edit_b
+ 			(strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
+ 			++m_currentworld;
+ 		m_world->set_title
+-			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
++			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+ 
+ 		button_clicked(-1);  // Update other values in UI as well
+