Reverted 2007-07-26T20:12:06Z!esr@thyrsus.com; default era is now named "Default" again.

We might later want to change it to "Standard", however (discussion
welcome).

changelog

@@ -13,14 +13,12 @@ Version 1.3.6+svn:
    * improvements to the sound of the countdown timer
    * the countdown timer alert can now start sounding while dialogs are open
    * unit descriptions are no longer evaluated for the recruitment checksum
-     and thus avoiding an OOS error when different languages are used. 
+     and thus avoiding an OOS error when different languages are used.
      The change is incompatible with older trunk versions fixes (bug #9472).
    * Show the (possibly bogus) GPV and fog settings of games with "Use map
      settings" on in a darker font. (patch #771 by uso)
    * the random start ToD option is now properly saved and loaded when use map
      default is used (bug #9532)
-   * "Default Era" is now renamed to "Era of Turmoil" (bug #4210) in
-     accordance with the master history.
    * Changed the Id of the Halberdier from "Halbardier" to "Halberdier"
    * New name for the "Soul Shooter" : "Banebow"
    * multiplayer lobby: highlight the names of the players which have joined
@@ -30,7 +28,7 @@ Version 1.3.6+svn:
  * graphics
    * fixed a glitch with the undo of recruit or recall on high places.
    * Improve rendering of "black stripes": don't hide footsteps and fog
-   * Improve rendering of grid : draw under fog, shroud and "black stripes" 
+   * Improve rendering of grid : draw under fog, shroud and "black stripes"
  * user interface:
    * Enable "Save Game" and "View Chat Log" menu entries in replay mode.
    * Add an additional line below the minimap in the "Multiplayer->Create game"
@@ -52,7 +50,7 @@ Version 1.3.6+svn:
    * fix a bug where containers could only be stored at the top-level
    * fix a bug where both x and y had to be specified in location filters
    * better handling/reporting of invalid WML variable type usage
-   * new key find_in= to allow searching a variable of previously stored  
+   * new key find_in= to allow searching a variable of previously stored
      locations when using the standard location filter
    * new key find_in= to allow searching a variable of previously stored
      units when using the standard unit filter
@@ -87,7 +85,7 @@ Version 1.3.6:
    * the automatic unit description used a non-MP safe way, this has been
      fixed
    * the unit name generation could with different locales call get_random() a
-     different number of times. This lead to different names and traits. 
+     different number of times. This lead to different names and traits.
      Changed to call random a fixed number of times which fixes the traits.
  * miscellaneous and bug fixes
    * various code cleanups

data/multiplayer/eras.cfg

@@ -8,16 +8,16 @@
 #enddef
 
 [era]
-    id=era_turmoil
-    name= _ "Era of Turmoil"
+    id=era_default
+    name= _ "Default"
 
     {RANDOM_SIDE}
-    {multiplayer/factions/loyalists-turmoil.cfg}
-    {multiplayer/factions/rebels-turmoil.cfg}
-    {multiplayer/factions/northerners-turmoil.cfg}
-    {multiplayer/factions/undead-turmoil.cfg}
-    {multiplayer/factions/knalgans-turmoil.cfg}
-    {multiplayer/factions/drakes-turmoil.cfg}
+    {multiplayer/factions/loyalists-default.cfg}
+    {multiplayer/factions/rebels-default.cfg}
+    {multiplayer/factions/northerners-default.cfg}
+    {multiplayer/factions/undead-default.cfg}
+    {multiplayer/factions/knalgans-default.cfg}
+    {multiplayer/factions/drakes-default.cfg}
 [/era]
 
 [era]

players_changelog

@@ -6,15 +6,13 @@ Version 1.3.6+svn:
   * Multiplayer
     * New map: Mokena Prairie.
     * Revised maps: Hamlets, Meteor Lake, 4p Hamlets.
-    * Fixed a OOS message when recruiting which happened if the players use 
+    * Fixed a OOS message when recruiting which happened if the players use
       different languages.
     * Show the (possibly bogus) gold per village and fog settings of games with
       "Use map settings" on in a darker font. (patch #771 by uso)
-    * The random starting time of day setting is will now be remembered if 
+    * The random starting time of day setting is will now be remembered if
       "Use map settings" is used.
-    * "Default Era" is now renamed to "Era of Turmoil" (bug #4210) in
-      accordance with the master history.
-    * The "Soul Shooter" is now renamed to "Banebow"
+    * The "Soul Shooter" is now renamed to "Banebow".
 
   * User interface
     * Enable "Save Game" and "View Chat Log" menu entries in replay mode.
@@ -41,7 +39,7 @@ Version 1.3.6:
     * The random starting time of day setting is will now be remembered.
     * Fixed a bug which could lead to the map in the lobby to become invisible.
     * Fixed an OOS which happened when a unit was recruited.
-    * Fixed an OOS which was caused by different traits. This only happened if 
+    * Fixed an OOS which was caused by different traits. This only happened if
       the players use different languages. A related problem which causes the
       names to differ and also cause OOS errors hasn't been fixed yet.
 

src/game.cpp

@@ -468,7 +468,7 @@ bool game_controller::play_multiplayer_mode()
 		return true;
 	}
 
-	std::string era = "era_turmoil";
+	std::string era = "era_default";
 	std::string scenario = "multiplayer_Charge";
 	std::map<int,std::string> side_types, side_controllers, side_algorithms;
 	std::map<int,string_map> side_parameters;