(svn r17247) -Change: move '3rd party' MD5 implementation also to the 3rdparty directory.

13 files changed, 39 insertions, 27 deletions

diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 6590524cd..a42c1db8a 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -596,10 +596,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\md5.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\misc.cpp"
 				>
 			</File>
@@ -1116,10 +1112,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\md5.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\mixer.h"
 				>
 			</File>
@@ -2329,6 +2321,18 @@
 			</File>
 		</Filter>
 		<Filter
+			Name="MD5"
+			>
+			<File
+				RelativePath=".\..\src\3rdparty\md5\md5.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\md5\md5.h"
+				>
+			</File>
+		</Filter>
+		<Filter
 			Name="MiniLZO"
 			>
 			<File
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 5433539e5..cd2d44590 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -593,10 +593,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\md5.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\misc.cpp"
 				>
 			</File>
@@ -1113,10 +1109,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\md5.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\mixer.h"
 				>
 			</File>
@@ -2326,6 +2318,18 @@
 			</File>
 		</Filter>
 		<Filter
+			Name="MD5"
+			>
+			<File
+				RelativePath=".\..\src\3rdparty\md5\md5.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\md5\md5.h"
+				>
+			</File>
+		</Filter>
+		<Filter
 			Name="MiniLZO"
 			>
 			<File
diff --git a/readme.txt b/readme.txt
index 9c514c056..e040dbc1a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -502,6 +502,7 @@ Thanks to:
   Richard Kempton (RichK67)      - Additional airports, initial TGP implementation
   Alberto Demichelis             - Squirrel scripting language
   Markus F.X.J. Oberhumer        - MiniLZO for loading old savegames
+  L. Peter Deutsch               - MD5 implementation
   Michael Blunck                 - For revolutionizing TTD with awesome graphics
   George                         - Canal graphics
   David Dallaston (Pikka)        - Tram tracks
diff --git a/source.list b/source.list
index f2e1d964e..87cd51c2d 100644
--- a/source.list
+++ b/source.list
@@ -34,7 +34,6 @@ highscore.cpp
 ini.cpp
 landscape.cpp
 map.cpp
-md5.cpp
 misc.cpp
 mixer.cpp
 music.cpp
@@ -207,7 +206,6 @@ landscape_type.h
 livery.h
 map_func.h
 map_type.h
-md5.h
 mixer.h
 music.h
 namegen_func.h
@@ -531,6 +529,10 @@ table/unicode.h
 table/unmovable_land.h
 table/water_land.h
 
+# MD5
+3rdparty/md5/md5.cpp
+3rdparty/md5/md5.h
+
 # MiniLZO
 3rdparty/minilzo/lzoconf.h
 3rdparty/minilzo/lzodefs.h
diff --git a/src/md5.cpp b/src/3rdparty/md5/md5.cpp
index 6e8580fa7..00e31b845 100644
--- a/src/md5.cpp
+++ b/src/3rdparty/md5/md5.cpp
@@ -56,9 +56,9 @@
   1999-05-03 lpd Original version.
  */
 
-#include "stdafx.h"
-#include "core/bitmath_func.hpp"
-#include "core/endian_func.hpp"
+#include "../../stdafx.h"
+#include "../../core/bitmath_func.hpp"
+#include "../../core/endian_func.hpp"
 #include "md5.h"
 
 #define T_MASK ((uint32)~0)
diff --git a/src/md5.h b/src/3rdparty/md5/md5.h
index a3c4a6d9f..a3c4a6d9f 100644
--- a/src/md5.h
+++ b/src/3rdparty/md5/md5.h
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index 64008d539..d0bd1d5c1 100644
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -334,7 +334,7 @@ char *AIScanner::GetAIConsoleList(char *p, const char *last)
 
 #if defined(ENABLE_NETWORK)
 #include "../network/network_content.h"
-#include "../md5.h"
+#include "../3rdparty/md5/md5.h"
 #include "../tar_type.h"
 
 /** Helper for creating a MD5sum of all files within of an AI. */
diff --git a/src/fios.cpp b/src/fios.cpp
index bee76a1d6..7328e884b 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -523,7 +523,7 @@ void FiosGetHeightmapList(SaveLoadDialogMode mode)
 #if defined(ENABLE_NETWORK)
 #include "core/smallvec_type.hpp"
 #include "network/network_content.h"
-#include "md5.h"
+#include "3rdparty/md5/md5.h"
 
 /** Basic data to distinguish a scenario. Used in the server list window */
 struct ScenarioIdentifier {
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 1f8bf089f..32ed06386 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -8,7 +8,7 @@
 #include "fileio_func.h"
 #include "fios.h"
 #include "newgrf.h"
-#include "md5.h"
+#include "3rdparty/md5/md5.h"
 #include "fontcache.h"
 #include "gfx_func.h"
 #include "settings_type.h"
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index c77a5e03b..9a57442a9 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -381,6 +381,7 @@ struct AboutWindow : public Window {
 			"",
 			"  Alberto Demichelis - Squirrel scripting language © 2003-2008",
 			"  Markus F.X.J. Oberhumer - (Mini)LZO for loading old savegames © 1996-2008",
+			"  L. Peter Deutsch - MD5 implementation © 1999, 2000, 2002",
 			"  Michael Blunck - Pre-Signals and Semaphores © 2003",
 			"  George - Canal/Lock graphics © 2003-2004",
 			"  David Dallaston - Tram tracks",
diff --git a/src/network/network.cpp b/src/network/network.cpp
index bbf26f74d..413075c65 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -22,7 +22,7 @@
 #include "core/host.h"
 #include "network_gui.h"
 #include "../console_func.h"
-#include "../md5.h"
+#include "../3rdparty/md5/md5.h"
 #include "../core/random_func.hpp"
 #include "../window_func.h"
 #include "../string_func.h"
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 7b6e99207..1beebb866 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -14,7 +14,7 @@
 #include "../command_func.h"
 #include "../console_func.h"
 #include "../fileio_func.h"
-#include "../md5.h"
+#include "../3rdparty/md5/md5.h"
 #include "../strings_func.h"
 #include "../window_func.h"
 #include "../string_func.h"
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
index b752200e7..029531c1a 100644
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -4,7 +4,7 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "md5.h"
+#include "3rdparty/md5/md5.h"
 #include "newgrf.h"
 #include "string_func.h"
 #include "gamelog.h"