Merge branch 'master' of git://github.com/wesnoth/wesnoth

wesnoth · Jun 27, 2014 · 83d9976 · 83d9976
2 parents a226e6d + 9e447d1
commit 83d9976
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/data/gui/default/window/addon_filter_options.cfg b/data/gui/default/window/addon_filter_options.cfg
@@ -61,14 +61,18 @@
 			{_GUI_ADDON_TYPE_OPTION media _"addons_of_type^Resources"}
 			{_GUI_ADDON_TYPE_OPTION mp_scenarios _"addons_of_type^MP scenarios"}
 		[/row]
+		[row]
+			{_GUI_ADDON_TYPE_OPTION cores _"addons_of_type^Cores"}
+			{_GUI_ADDON_TYPE_OPTION mp_maps _"addons_of_type^MP map-packs"}
+		[/row]
 		[row]
 			# FIXME: (also in C++) should this and Unknown be a single option in the UI?
 			{_GUI_ADDON_TYPE_OPTION other _"addons_of_type^Other"}
-			{_GUI_ADDON_TYPE_OPTION mp_maps _"addons_of_type^MP map-packs"}
+			{_GUI_ADDON_TYPE_OPTION mp_mods _"addons_of_type^MP modifications"}
 		[/row]
 		[row]
 			{_GUI_ADDON_TYPE_OPTION unknown _"addons_of_type^Unknown"}
-			{_GUI_ADDON_TYPE_OPTION mp_mods _"addons_of_type^MP modifications"}
+			{_GUI_SPACER}
 		[/row]
 
 	[/grid]

diff --git a/data/tools/addon_manager/html.py b/data/tools/addon_manager/html.py
@@ -108,6 +108,10 @@ def w(x):
             w("""\
 <td>Campaign<div class="type"><b>single player campaign</b><br/>
 After install the campaign will show up in the list you get when choosing "Campaign" in the main menu.</div></td>""")
+        elif type == "campaign_sp_mp":
+            w("""\
+<td>SP/SP Campaign<div class="type"><b>single/multi player campaign</b><br />
+After install the campaign will show up both in the list you get when choosing "Campaign" in the main menu, and in the map list in the multiplayer "Create Game" dialog.</div></td>""")
         elif type == "campaign_mp":
             w("""\
 <td>MP Campaign<div class="type"><b>multiplayer campaign</b><br/>
@@ -128,6 +132,10 @@ def w(x):
             w("""\
 <td>MP faction<div class="type"><b>multiplayer faction</b><br/>
 Usually comes with an era or is dependency of another add-on.</div></td>""")
+        elif type == "mod_mp":
+            w("""\
+<td>MP modification<div class="type"><b>multiplayer modification</b><br />
+After install the included MP gameplay modification(s) will be available in the multiplayer "Create Game" dialog.</div></td>""")
         elif type == "media":
             w("""\
 <td>Resources<div class="type"><b>miscellaneous content/media</b><br/>

diff --git a/src/gui/dialogs/addon/filter_options.cpp b/src/gui/dialogs/addon/filter_options.cpp
@@ -127,6 +127,7 @@ taddon_filter_options::taddon_filter_options()
 	// This part has to be hardcoded, sadly.
 
 	register_displayed_type_field("show_unknown", ADDON_UNKNOWN);
+	register_displayed_type_field("show_cores", ADDON_CORE);
 	register_displayed_type_field("show_sp_campaigns", ADDON_SP_CAMPAIGN);
 	register_displayed_type_field("show_sp_mp_campaigns", ADDON_SP_MP_CAMPAIGN);
 	register_displayed_type_field("show_sp_scenarios", ADDON_SP_SCENARIO);

diff --git a/src/server/forum_user_handler.cpp b/src/server/forum_user_handler.cpp
@@ -203,7 +203,7 @@ std::string fuh::get_hash(const std::string& user) {
 		return get_detail_for_user(user, "user_password");
 	} catch (error& e) {
 		ERR_UH << "Could not retrieve password for user '" << user << "' :" << e.message << std::endl;
-		return time_t(0);
+		return "";
 	}
 }
 
@@ -212,7 +212,7 @@ std::string fuh::get_mail(const std::string& user) {
 		return get_detail_for_user(user, "user_email");
 	} catch (error& e) {
 		ERR_UH << "Could not retrieve email for user '" << user << "' :" << e.message << std::endl;
-		return time_t(0);
+		return "";
 	}
 }
 

diff --git a/utils/mp-server/new_release b/utils/mp-server/new_release
@@ -44,5 +44,4 @@ $echo sed -i -e "/motd=/s/$PREV_VERSION/$NEW_VERSION/g" $DEV_SERVER_CONFIG
 [ $PREV = yes ] && $echo sed -i -e "s,#\({./$DEV_VERSION-prev-redirect.cfg}\),\1," $DEV_SERVER_CONFIG
 # reload the config
 $echo killall -HUP wesnothd-$DEV_VERSION
-$echo sleep 1
 $echo $HOME/bin/send_server_message $DEV_VERSION "$SERVER_MESSAGE"