Author: sapient
Date: Wed May 28 05:25:10 2008
New Revision: 26892
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26892&view=rev
Log:
raised default per-Turn MP timer bonus to 60 seconds
Modified:
trunk/changelog
trunk/src/game_preferences.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=26892&r1=26891&r2=26892&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Wed May 28 05:25:10 2008
@@ -30,6 +30,7 @@
* fonts: DejaVuSans 2.25
* multiplayer:
* revised maps: Den of Onis
+ * raised default per-Turn MP timer bonus to 60 seconds
* Python AI:
* Implemented a function which detects if a location is on the map border.
* Implemented a function which gives the game's gold parameters.
Modified: trunk/src/game_preferences.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_preferences.cpp?rev=26892&r1=26891&r2=26892&view=diff
==============================================================================
--- trunk/src/game_preferences.cpp (original)
+++ trunk/src/game_preferences.cpp Wed May 28 05:25:10 2008
@@ -98,7 +98,7 @@
for (std::vector<std::string>::iterator i =
current_history.begin(); i != current_history.end(); ++i) {
// remove the enclosing parens
history_ptr->push_back(i->substr(1, i->size() -
2));
- }
+ }
}
}
@@ -128,7 +128,7 @@
}
history[iter->first] = history_stream.str();
}
-
+
preferences::set_child("history", history);
history_map.clear();
@@ -166,11 +166,11 @@
}
void clear_friends() {
- preferences::set("friends", "");
+ preferences::set("friends", "");
}
void clear_ignores() {
- preferences::set("ignores", "");
+ preferences::set("ignores", "");
}
bool is_friend(const std::string nick) {
@@ -442,7 +442,7 @@
int countdown_turn_bonus()
{
return lexical_cast_in_range<int>(
- preferences::get("mp_countdown_turn_bonus"), 40, 0, 300);
+ preferences::get("mp_countdown_turn_bonus"), 60, 0, 300);
}
void set_countdown_turn_bonus(int value)
@@ -716,7 +716,7 @@
//! making a new one if it doesn't exist.
// FIXME only used for gui2. Could be used for the above histories.
std::vector<std::string>* get_history(const std::string& id) {
- return &history_map[id];
+ return &history_map[id];
}
bool green_confirm()
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
