Author: mordante
Date: Fri Nov 2 19:38:20 2007
New Revision: 21436
URL: http://svn.gna.org/viewcvs/wesnoth?rev=21436&view=rev
Log:
Added the option to delete a campaign with the master password.
Modified:
trunk/changelog
trunk/src/campaign_server/campaign_server.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=21436&r1=21435&r2=21436&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Fri Nov 2 19:38:20 2007
@@ -1,4 +1,6 @@
Version 1.3.9+svn:
+ * campaign server
+ * it's now possible to delete a campaign with the master password
* campaigns:
* Eastern Invasion
* Fixed bug #10195, related to Holy Amulet's description
Modified: trunk/src/campaign_server/campaign_server.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/campaign_server/campaign_server.cpp?rev=21436&r1=21435&r2=21436&view=diff
==============================================================================
--- trunk/src/campaign_server/campaign_server.cpp (original)
+++ trunk/src/campaign_server/campaign_server.cpp Fri Nov 2 19:38:20 2007
@@ -449,7 +449,10 @@
continue;
}
- if((*campaign)["passphrase"] !=
(*erase)["passphrase"]) {
+ if((*campaign)["passphrase"] !=
(*erase)["passphrase"]
+ &&
(campaigns()["master_password"] == ""
+ ||
campaigns()["master_password"] != (*erase)["passphrase"])) {
+
network::send_data(construct_error("The passphrase is incorrect."),sock);
continue;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
