21 files changed, 87 insertions, 86 deletions
diff --git a/src/3rdparty/squirrel/include/squirrel.h b/src/3rdparty/squirrel/include/squirrel.h
index adb2390fc..87e0ac0d6 100644
--- a/src/3rdparty/squirrel/include/squirrel.h
+++ b/src/3rdparty/squirrel/include/squirrel.h
@@ -1,33 +1,32 @@
 /*
-Copyright (c) 2003-2011 Alberto Demichelis
-
-This software is provided 'as-is', without any
-express or implied warranty. In no event will the
-authors be held liable for any damages arising from
-the use of this software.
-
-Permission is granted to anyone to use this software
-for any purpose, including commercial applications,
-and to alter it and redistribute it freely, subject
-to the following restrictions:
-
-		1. The origin of this software must not be
-		misrepresented; you must not claim that
-		you wrote the original software. If you
-		use this software in a product, an
-		acknowledgment in the product
-		documentation would be appreciated but is
-		not required.
-
-		2. Altered source versions must be plainly
-		marked as such, and must not be
-		misrepresented as being the original
-		software.
-
-		3. This notice may not be removed or
-		altered from any source distribution.
-
-*/
+ * Copyright (c) 2003-2011 Alberto Demichelis
+ *
+ * This software is provided 'as-is', without any
+ * express or implied warranty. In no event will the
+ * authors be held liable for any damages arising from
+ * the use of this software.
+ *
+ * Permission is granted to anyone to use this software
+ * for any purpose, including commercial applications,
+ * and to alter it and redistribute it freely, subject
+ * to the following restrictions:
+ *
+ *   1. The origin of this software must not be
+ *   misrepresented; you must not claim that
+ *   you wrote the original software. If you
+ *   use this software in a product, an
+ *   acknowledgment in the product
+ *   documentation would be appreciated but is
+ *   not required.
+ *
+ *   2. Altered source versions must be plainly
+ *   marked as such, and must not be
+ *   misrepresented as being the original
+ *   software.
+ *
+ *   3. This notice may not be removed or
+ *   altered from any source distribution.
+ */
 #ifndef _SQUIRREL_H_
 #define _SQUIRREL_H_
 
diff --git a/src/3rdparty/squirrel/squirrel/sqapi.cpp b/src/3rdparty/squirrel/squirrel/sqapi.cpp
index 04718385b..8374f7f31 100644
--- a/src/3rdparty/squirrel/squirrel/sqapi.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqapi.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
index 5281ec2ab..86a1b1185 100644
--- a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
@@ -1,8 +1,10 @@
 /*
-	see copyright notice in squirrel.h
-*/
-/* Needs to be first due to a squirrel header defining type() and type()
- * being used in some versions of the headers included by algorithm. */
+ * see copyright notice in squirrel.h
+ */
+/*
+ * Needs to be first due to a squirrel header defining type() and type()
+ * being used in some versions of the headers included by algorithm.
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqclass.cpp b/src/3rdparty/squirrel/squirrel/sqclass.cpp
index c62cfaf44..aa1bca044 100644
--- a/src/3rdparty/squirrel/squirrel/sqclass.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqclass.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqcompiler.cpp b/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
index 9c4b547e9..2cc5f3d34 100644
--- a/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqdebug.cpp b/src/3rdparty/squirrel/squirrel/sqdebug.cpp
index 69a781aed..74272e432 100644
--- a/src/3rdparty/squirrel/squirrel/sqdebug.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqdebug.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp b/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp
index 47c553abc..5415b566e 100644
--- a/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqlexer.cpp b/src/3rdparty/squirrel/squirrel/sqlexer.cpp
index d1d934920..77c487a26 100644
--- a/src/3rdparty/squirrel/squirrel/sqlexer.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqlexer.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqmem.cpp b/src/3rdparty/squirrel/squirrel/sqmem.cpp
index 4ab8db44b..5c1b3966a 100644
--- a/src/3rdparty/squirrel/squirrel/sqmem.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqmem.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqobject.cpp b/src/3rdparty/squirrel/squirrel/sqobject.cpp
index 36e72b48d..d48baca1e 100644
--- a/src/3rdparty/squirrel/squirrel/sqobject.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqobject.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqstate.cpp b/src/3rdparty/squirrel/squirrel/sqstate.cpp
index 66693097d..35878e197 100644
--- a/src/3rdparty/squirrel/squirrel/sqstate.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqstate.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
@@ -487,10 +487,10 @@ void RefTable::AllocNodes(SQUnsignedInteger size)
 //////////////////////////////////////////////////////////////////////////
 //SQStringTable
 /*
-* The following code is based on Lua 4.0 (Copyright 1994-2002 Tecgraf, PUC-Rio.)
-* http://www.lua.org/copyright.html#4
-* http://www.lua.org/source/4.0.1/src_lstring.c.html
-*/
+ * The following code is based on Lua 4.0 (Copyright 1994-2002 Tecgraf, PUC-Rio.)
+ * http://www.lua.org/copyright.html#4
+ * http://www.lua.org/source/4.0.1/src_lstring.c.html
+ */
 
 SQStringTable::SQStringTable()
 {
diff --git a/src/3rdparty/squirrel/squirrel/sqtable.cpp b/src/3rdparty/squirrel/squirrel/sqtable.cpp
index 8a54328b3..60146fe73 100644
--- a/src/3rdparty/squirrel/squirrel/sqtable.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqtable.cpp
@@ -1,6 +1,6 @@
 /*
-see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqtable.h b/src/3rdparty/squirrel/squirrel/sqtable.h
index 2b4a3d4de..52d9ba41a 100644
--- a/src/3rdparty/squirrel/squirrel/sqtable.h
+++ b/src/3rdparty/squirrel/squirrel/sqtable.h
@@ -2,10 +2,10 @@
 #ifndef _SQTABLE_H_
 #define _SQTABLE_H_
 /*
-* The following code is based on Lua 4.0 (Copyright 1994-2002 Tecgraf, PUC-Rio.)
-* http://www.lua.org/copyright.html#4
-* http://www.lua.org/source/4.0.1/src_ltable.c.html
-*/
+ * The following code is based on Lua 4.0 (Copyright 1994-2002 Tecgraf, PUC-Rio.)
+ * http://www.lua.org/copyright.html#4
+ * http://www.lua.org/source/4.0.1/src_ltable.c.html
+ */
 
 #include "sqstring.h"
 
diff --git a/src/3rdparty/squirrel/squirrel/sqvm.cpp b/src/3rdparty/squirrel/squirrel/sqvm.cpp
index 464e57c72..973002b49 100644
--- a/src/3rdparty/squirrel/squirrel/sqvm.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqvm.cpp
@@ -1,6 +1,6 @@
 /*
-	see copyright notice in squirrel.h
-*/
+ * see copyright notice in squirrel.h
+ */
 
 #include "../../../stdafx.h"
 
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 0f949c544..45a1b28dc 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -141,8 +141,8 @@ void SpriteFontCache::InitializeUnicodeGlyphMap()
 		byte key = _default_unicode_map[i].key;
 		if (key == CLRA) {
 			/* Clear the glyph. This happens if the glyph at this code point
-				* is non-standard and should be accessed by an SCC_xxx enum
-				* entry only. */
+			 * is non-standard and should be accessed by an SCC_xxx enum
+			 * entry only. */
 			this->SetUnicodeGlyph(_default_unicode_map[i].code, 0);
 		} else {
 			SpriteID sprite = base + key - ASCII_LETTERSTART;
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index e9ca7acf6..279f37652 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -208,7 +208,7 @@ static void SelectSongToPlay()
 		if (file >= 0) {
 			const char *filename = BaseMusic::GetUsedSet()->files[file].filename;
 			/* We are now checking for the existence of that file prior
-			* to add it to the list of available songs */
+			 * to add it to the list of available songs */
 			if (!StrEmpty(filename) && FioCheckFileExists(filename, BASESET_DIR)) {
 				_cur_playlist[j] = _playlists[_settings_client.music.playlist][i];
 				j++;
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
index 6b7b8c377..18f47b64a 100644
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -735,8 +735,8 @@ void DoScanNewGRFFiles(void *callback)
 	DEBUG(grf, 1, "Scan complete, found %d files", num);
 	if (num != 0 && _all_grfs != NULL) {
 		/* Sort the linked list using quicksort.
-		* For that we first have to make an array, then sort and
-		* then remake the linked list. */
+		 * For that we first have to make an array, then sort and
+		 * then remake the linked list. */
 		GRFConfig **to_sort = MallocT<GRFConfig*>(num);
 
 		uint i = 0;
diff --git a/src/saveload/game_sl.cpp b/src/saveload/game_sl.cpp
index cb3285426..325ae1c9d 100644
--- a/src/saveload/game_sl.cpp
+++ b/src/saveload/game_sl.cpp
@@ -78,7 +78,7 @@ static void Load_GSDT()
 		config->Change(_game_saveload_name, _game_saveload_version, false, _game_saveload_is_random);
 		if (!config->HasScript()) {
 			/* No version of the GameScript available that can load the data. Try to load the
-				* latest version of the GameScript instead. */
+			 * latest version of the GameScript instead. */
 			config->Change(_game_saveload_name, -1, false, _game_saveload_is_random);
 			if (!config->HasScript()) {
 				if (strcmp(_game_saveload_name, "%_dummy") != 0) {
@@ -93,7 +93,7 @@ static void Load_GSDT()
 				DEBUG(script, 0, "The latest version of that GameScript has been loaded instead, but it'll not get the savegame data as it's incompatible.");
 			}
 			/* Make sure the GameScript doesn't get the saveload data, as he was not the
-				*  writer of the saveload data in the first place */
+			 *  writer of the saveload data in the first place */
 			_game_saveload_version = -1;
 		}
 	}
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 776d96c50..717777804 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -2790,9 +2790,9 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb, boo
 			InitializeGame(256, 256, true, true); // set a mapsize of 256x256 for TTDPatch games or it might get confused
 
 			/* TTD/TTO savegames have no NewGRFs, TTDP savegame have them
-			* and if so a new NewGRF list will be made in LoadOldSaveGame.
-			* Note: this is done here because AfterLoadGame is also called
-			* for OTTD savegames which have their own NewGRF logic. */
+			 * and if so a new NewGRF list will be made in LoadOldSaveGame.
+			 * Note: this is done here because AfterLoadGame is also called
+			 * for OTTD savegames which have their own NewGRF logic. */
 			ClearGRFConfigList(&_grfconfig);
 			GamelogReset();
 			if (!LoadOldSaveGame(filename)) return SL_REINIT;
diff --git a/src/script/api/script_stationlist.hpp b/src/script/api/script_stationlist.hpp
index bc1947178..720a43639 100644
--- a/src/script/api/script_stationlist.hpp
+++ b/src/script/api/script_stationlist.hpp
@@ -202,10 +202,10 @@ public:
 class ScriptStationList_CargoWaitingFromByVia : public ScriptStationList_CargoWaiting {
 public:
 	/**
-	* @param station_id Station to query for waiting cargo.
-	* @param cargo Cargo type to query for.
-	* @param from Origin station to restrict the query with.
-	*/
+	 * @param station_id Station to query for waiting cargo.
+	 * @param cargo Cargo type to query for.
+	 * @param from Origin station to restrict the query with.
+	 */
 	ScriptStationList_CargoWaitingFromByVia(StationID station_id, CargoID cargo, StationID from);
 };
 
@@ -233,10 +233,10 @@ public:
 class ScriptStationList_CargoPlannedViaByFrom : public ScriptStationList_CargoPlanned {
 public:
 	/**
-	* @param station_id Station to query for planned flows.
-	* @param cargo Cargo type to query for.
-	* @param via Next hop to restrict the query with.
-	*/
+	 * @param station_id Station to query for planned flows.
+	 * @param cargo Cargo type to query for.
+	 * @param via Next hop to restrict the query with.
+	 */
 	ScriptStationList_CargoPlannedViaByFrom(StationID station_id, CargoID cargo, StationID via);
 };
 
@@ -266,10 +266,10 @@ public:
 class ScriptStationList_CargoPlannedFromByVia : public ScriptStationList_CargoPlanned {
 public:
 	/**
-	* @param station_id Station to query for planned flows.
-	* @param cargo Cargo type to query for.
-	* @param from Origin station to restrict the query with.
-	*/
+	 * @param station_id Station to query for planned flows.
+	 * @param cargo Cargo type to query for.
+	 * @param from Origin station to restrict the query with.
+	 */
 	ScriptStationList_CargoPlannedFromByVia(StationID station_id, CargoID cargo, StationID from);
 };
 
diff --git a/src/tgp.cpp b/src/tgp.cpp
index 7ee2f6e92..95725fc6f 100644
--- a/src/tgp.cpp
+++ b/src/tgp.cpp
@@ -335,7 +335,7 @@ static void HeightMapGenerate()
 		}
 
 		/* It is regular iteration round.
-		* Interpolate height values at odd x, even y tiles */
+		 * Interpolate height values at odd x, even y tiles */
 		for (int y = 0; y <= _height_map.size_y; y += 2 * step) {
 			for (int x = 0; x <= _height_map.size_x - 2 * step; x += 2 * step) {
 				height_t h00 = _height_map.height(x + 0 * step, y);