diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/common/game.h freeciv/common/game.h --- FreecivCVS/common/game.h Sun Mar 12 23:32:58 2000 +++ freeciv/common/game.h Mon Mar 13 01:28:38 2000 @@ -268,8 +268,9 @@ #define GAME_MIN_BARBARIANRATE 0 #define GAME_MAX_BARBARIANRATE 4 -#define GAME_DEFAULT_ONSETBARBARIAN GAME_MIN_END_YEAR -#define GAME_MIN_ONSETBARBARIAN GAME_MIN_END_YEAR +#define GAME_DEFAULT_ONSETBARBARIAN (GAME_START_YEAR+ \ + ((GAME_DEFAULT_END_YEAR-GAME_START_YEAR)/3)) +#define GAME_MIN_ONSETBARBARIAN GAME_START_YEAR #define GAME_MAX_ONSETBARBARIAN GAME_MAX_END_YEAR #define GAME_DEFAULT_OCCUPYCHANCE 0