# HG changeset patch # User maedhros # Date 1177772792 0 # Node ID a20ddaf4dc9726ee035d8ca3585dd0820a071db5 # Parent 60b0e082723c754319b035dd51190a2aa8f4301b (svn r9734) -Feature: Add an option to automatically pause when starting a new game. diff -r 60b0e082723c -r a20ddaf4dc97 src/genworld.cpp --- a/src/genworld.cpp Sat Apr 28 10:41:00 2007 +0000 +++ b/src/genworld.cpp Sat Apr 28 15:06:32 2007 +0000 @@ -10,6 +10,7 @@ #include "table/sprites.h" #include "variables.h" #include "thread.h" +#include "command.h" #include "genworld.h" #include "gfx.h" #include "gfxinit.h" @@ -153,6 +154,8 @@ if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game"); + if (_patches.pause_on_newgame) DoCommandP(0, 1, 0, NULL, CMD_PAUSE); + return NULL; } diff -r 60b0e082723c -r a20ddaf4dc97 src/lang/english.txt --- a/src/lang/english.txt Sat Apr 28 10:41:00 2007 +0000 +++ b/src/lang/english.txt Sat Apr 28 15:06:32 2007 +0000 @@ -1097,6 +1097,7 @@ STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLL :Scroll map STR_CONFIG_PATCHES_SCROLLWHEEL_OFF :Off STR_CONFIG_PATCHES_SCROLLWHEEL_MULTIPLIER :{LTBLUE}Map scrollwheel speed: {ORANGE}{STRING1} +STR_CONFIG_PATCHES_PAUSE_ON_NEW_GAME :{LTBLUE}Automatically pause when starting a new game: {ORANGE}{STRING1} STR_CONFIG_PATCHES_MAX_TRAINS :{LTBLUE}Max trains per player: {ORANGE}{STRING1} STR_CONFIG_PATCHES_MAX_ROADVEH :{LTBLUE}Max road vehicles per player: {ORANGE}{STRING1} diff -r 60b0e082723c -r a20ddaf4dc97 src/settings.cpp --- a/src/settings.cpp Sat Apr 28 10:41:00 2007 +0000 +++ b/src/settings.cpp Sat Apr 28 15:06:32 2007 +0000 @@ -1323,6 +1323,7 @@ SDT_BOOL(Patches, prefer_teamchat, S, 0, false, STR_CONFIG_PATCHES_PREFER_TEAMCHAT, NULL), SDT_VAR(Patches, scrollwheel_scrolling,SLE_UINT8,S,MS, 0, 0, 2, 0, STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLLING, NULL), SDT_VAR(Patches,scrollwheel_multiplier,SLE_UINT8,S, 0, 5, 1, 15, 1, STR_CONFIG_PATCHES_SCROLLWHEEL_MULTIPLIER,NULL), + SDT_BOOL(Patches, pause_on_newgame, S, 0, false, STR_CONFIG_PATCHES_PAUSE_ON_NEW_GAME, NULL), /***************************************************************************/ /* Construction section of the GUI-configure patches window */ diff -r 60b0e082723c -r a20ddaf4dc97 src/settings_gui.cpp --- a/src/settings_gui.cpp Sat Apr 28 10:41:00 2007 +0000 +++ b/src/settings_gui.cpp Sat Apr 28 15:06:32 2007 +0000 @@ -596,6 +596,7 @@ * Since it's also able to completely disable the scrollwheel will we display it on all platforms anyway */ "scrollwheel_scrolling", "scrollwheel_multiplier", + "pause_on_newgame", }; static const char *_patches_construction[] = { diff -r 60b0e082723c -r a20ddaf4dc97 src/variables.h --- a/src/variables.h Sat Apr 28 10:41:00 2007 +0000 +++ b/src/variables.h Sat Apr 28 15:06:32 2007 +0000 @@ -229,6 +229,8 @@ uint8 town_growth_rate; ///< Town growth rate uint8 larger_towns; ///< The number of cities to build. These start off larger and grow twice as fast uint8 initial_city_size; ///< Multiplier for the initial size of the cities compared to towns + + bool pause_on_newgame; ///< Whether to start new games paused or not. }; VARDEF Patches _patches;