(svn r15711) -Codechange: lots of whitespace cleanup/fixes

src/company_cmd.cpp

@@ -780,7 +780,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 
 			if (_network_server) {
 				/* XXX - UGLY! p2 (pid) is mis-used to fetch the client-id, done at
-				* server-side in network_server.c:838, function
+				 * server side in network_server.c:838, function
 				 * DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND) */
 				CompanyID old_playas = ci->client_playas;
 				ci->client_playas = c->index;

src/console_gui.cpp

@@ -204,7 +204,7 @@ struct IConsoleWindow : Window
 		const int scroll_height = (this->height / ICON_LINE_HEIGHT) - 1;
 		switch (keycode) {
 			case WKC_UP:
-				IConsoleHistoryNavigate(+1);
+				IConsoleHistoryNavigate(1);
 				this->SetDirty();
 				break;
 

src/genworld_gui.cpp

@@ -555,10 +555,9 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 		EventState state;
 		this->HandleEditBoxKey(GLAND_RANDOM_EDITBOX, key, keycode, state);
 		/* the seed is unsigned, therefore atoi cannot be used.
-			* As 2^32 - 1 (UINT32_MAX) is a 'magic' value
-			* (use random seed) it should not be possible to be
-			* entered into the input field; the generate seed
-			* button can be used instead. */
+		 * As UINT32_MAX is a 'magic' value (use random seed) it
+		 * should not be possible to be entered into the input
+		 * field; the generate seed button can be used instead. */
 		_settings_newgame.game_creation.generation_seed = minu(strtoul(this->edit_str_buf, NULL, 10), UINT32_MAX - 1);
 		return state;
 	}

src/misc/blob.hpp

@@ -36,7 +36,7 @@
  *       it is stored can lead to several confusions:
  *         - it is not common pattern so the implementation code is bit harder to read
  *         - valgrind can generate warning that allocated block is lost (not accessible)
-* */
+ */
 class CBlobBaseSimple {
 public:
 	typedef ::ptrdiff_t bsize_t;

src/network/network_gui.cpp

@@ -713,8 +713,8 @@ public:
 		SetVScrollCount(this, this->servers.Length());
 
 		/* Additional colums in server list */
-		if (this->width > NetworkGameWindow::MIN_EXTRA_COLUMNS_WIDTH + GetWidgetWidth(NGWW_MAPSIZE)
-				+ GetWidgetWidth(NGWW_DATE) + GetWidgetWidth(NGWW_YEARS)) {
+		if (this->width > NetworkGameWindow::MIN_EXTRA_COLUMNS_WIDTH + GetWidgetWidth(NGWW_MAPSIZE) +
+				GetWidgetWidth(NGWW_DATE) + GetWidgetWidth(NGWW_YEARS)) {
 			/* show columns 'Map size', 'Date' and 'Years' */
 			this->SetWidgetsHiddenState(false, NGWW_MAPSIZE, NGWW_DATE, NGWW_YEARS, WIDGET_LIST_END);
 			AlignWidgetRight(NGWW_YEARS,   NGWW_INFO);

src/news_gui.cpp

@@ -892,18 +892,18 @@ struct MessageOptionsWindow : Window {
 /*
  * The news settings window widgets
  *
-* Main part of the window is a list of news-setting lines, one for each news category.
+ * Main part of the window is a list of news setting lines, one for each news category.
  * Each line is constructed by an expansion of the \c NEWS_SETTINGS_LINE macro
  */
 
 /**
-* Macro to construct one news-setting line in the news-settings window.
+ * Macro to construct one news setting line in the news - settings window.
  * One line consists of four widgets, namely
  * - A [<] button
  * - A [...] label
  * - A [>] button
  * - A text label describing the news category
-* Horizontal positions of the widgets are hard-coded, vertical start position is (\a basey + \a linenum * \c NEWS_SETTING_BASELINE_SKIP).
+ * Horizontal positions of the widgets are hard coded, vertical start position is (\a basey + \a linenum * \c NEWS_SETTING_BASELINE_SKIP).
  * Height of one line is 12, with the text label shifted 1 pixel down.
  *
  * First line should be widget number WIDGET_NEWSOPT_START_OPTION

src/table/files.h

@@ -3,25 +3,25 @@
 /** @file files.h MD5 checksum information and names of the original and extra data files. */
 
 /*
-	MD5 sums of graphics files
-
-	DOS -
-
-	TRG1.GRF 9311676280e5b14077a8ee41c1b42192
-	TRGC.GRF ed446637e034104c5559b32c18afe78d
-	TRGH.GRF ee6616fb0e6ef6b24892c58c93d86fc9
-	TRGI.GRF da6a6c9dcc451eec88d79211437b76a8
-	TRGT.GRF e30e8a398ae86c03dc534a8ac7dfb3b6 (German: fcde1d7e8a74197d72a62695884b909e)
-	SAMPLE.CAT 422ea3dd074d2859bb51639a6e0e85da
-
-	WINDOWS -
-
-	TRG1R.GRF b04ce593d8c5016e07473a743d7d3358
-	TRGCR.GRF 3668f410c761a050b5e7095a2b14879b
-	TRGHR.GRF 06bf2b7a31766f048baac2ebe43457b1
-	TRGIR.GRF 0c2484ff6be49fc63a83be6ab5c38f32
-	TRGTR.GRF de53650517fe661ceaa3138c6edb0eb8
-	SAMPLE.CAT 9212e81e72badd4bbe1eaeae66458e10
+ * MD5 sums of graphics files
+ *
+ * DOS -
+ *
+ * TRG1.GRF 9311676280e5b14077a8ee41c1b42192
+ * TRGC.GRF ed446637e034104c5559b32c18afe78d
+ * TRGH.GRF ee6616fb0e6ef6b24892c58c93d86fc9
+ * TRGI.GRF da6a6c9dcc451eec88d79211437b76a8
+ * TRGT.GRF e30e8a398ae86c03dc534a8ac7dfb3b6 (German: fcde1d7e8a74197d72a62695884b909e)
+ * SAMPLE.CAT 422ea3dd074d2859bb51639a6e0e85da
+ *
+ * WINDOWS -
+ *
+ * TRG1R.GRF b04ce593d8c5016e07473a743d7d3358
+ * TRGCR.GRF 3668f410c761a050b5e7095a2b14879b
+ * TRGHR.GRF 06bf2b7a31766f048baac2ebe43457b1
+ * TRGIR.GRF 0c2484ff6be49fc63a83be6ab5c38f32
+ * TRGTR.GRF de53650517fe661ceaa3138c6edb0eb8
+ * SAMPLE.CAT 9212e81e72badd4bbe1eaeae66458e10
  */
 
 

src/video/cocoa/fullscreen.mm

@@ -576,8 +576,8 @@ public:
 	}
 
 	/*
-		Convert local coordinate to window server (CoreGraphics) coordinate.
-		In fullscreen mode this just means copying the coords.
+	 * Convert local coordinate to window server (CoreGraphics) coordinate.
+	 * In fullscreen mode this just means copying the coords.
 	 */
 	virtual CGPoint PrivateLocalToCG(NSPoint *p)
 	{

src/window.cpp

@@ -1968,6 +1968,7 @@ void MouseLoop(MouseClick click, int mousewheel)
 				if (!scrollwheel_scrolling || w == NULL || w->window_class != WC_SMALLMAP) break;
 				/* We try to use the scrollwheel to scroll since we didn't touch any of the buttons.
 				 * Simulate a right button click so we can get started. */
+
 				/* fallthough */
 			case MC_RIGHT: DispatchRightClickEvent(w, x - w->left, y - w->top); break;
 		}