r6450 - packages/trunk/wesnoth/debian/patches

[Gerfried Fuchs]

Author: alfie
Date: 2008-04-06 15:10:03 +0000 (Sun, 06 Apr 2008)
New Revision: 6450

Added:
   packages/trunk/wesnoth/debian/patches/04no-campaign-fix
Removed:
   packages/trunk/wesnoth/debian/patches/03sample.py-fix
Log:
svn removed the wrong patch, damn


Deleted: packages/trunk/wesnoth/debian/patches/03sample.py-fix
===================================================================
--- packages/trunk/wesnoth/debian/patches/03sample.py-fix	2008-04-06 15:08:25 UTC (rev 6449)
+++ packages/trunk/wesnoth/debian/patches/03sample.py-fix	2008-04-06 15:10:03 UTC (rev 6450)
@@ -1,25 +0,0 @@
-Author: Tommy <yobbobandana at yahoo.co.nz>	vim:ft=diff:
-Description: fix python syntax in sample.py AI
-
-Index: wesnoth-1.4/data/ais/sample.py
-===================================================================
---- wesnoth-1.4.orig/data/ais/sample.py
-+++ wesnoth-1.4/data/ais/sample.py
-@@ -253,7 +253,7 @@ class AI:
-             resistance /= n
- 
-             debug("%s: speed: %f, defense: %f, aggression: %f, resistance: %f" %
--                (recruit.name, speed, defense, aggression, resistance)
-+                (recruit.name, speed, defense, aggression, resistance))
- 
-             recruits_list.append((recruit, speed, defense, aggression, resistance))
- 
-@@ -280,7 +280,7 @@ class AI:
-                     r = random.uniform(0, total_v)
-                     while 1:
-                         v, recruit = heapq.heappop(heap)
--                        debug("%d %d" % % (r, v))
-+                        debug("%d %d" % (r, v))
-                         r += v
-                         if r <= 0: break
- 

Added: packages/trunk/wesnoth/debian/patches/04no-campaign-fix
===================================================================
--- packages/trunk/wesnoth/debian/patches/04no-campaign-fix	                        (rev 0)
+++ packages/trunk/wesnoth/debian/patches/04no-campaign-fix	2008-04-06 15:10:03 UTC (rev 6450)
@@ -0,0 +1,20 @@
+Author: Eric S. Raymond <esr at thyrsus.com>	vim:ft=diff:
+Description: display an error message if no campaign is available
+
+Index: wesnoth-1.4/src/game.cpp
+===================================================================
+--- wesnoth-1.4.orig/src/game.cpp
++++ wesnoth-1.4/src/game.cpp
+@@ -895,10 +895,11 @@ bool game_controller::new_campaign()
+ 		campaign_desc.push_back(std::pair<std::string,std::string>(desc,image));
+ 	}
+ 
+-	dialogs::campaign_preview_pane campaign_preview(disp().video(),&campaign_desc);
+ 	if(campaign_names.size() <= 0) {
++		gui::show_error_message(disp(), _("No campaigns are available.\n"));
+ 		return false;
+ 	}
++	dialogs::campaign_preview_pane campaign_preview(disp().video(),&campaign_desc);
+ 	gui::dialog cmenu(disp(), _("Play a campaign"), " ", gui::OK_CANCEL);
+ 	cmenu.set_menu(campaign_names);
+ 	cmenu.add_pane(&campaign_preview);