(svn r2585) - Fix [Makefile]: some small cleanups, remove warnings, and add mersenne to makefile (Luca)

Makefile

@@ -639,6 +639,7 @@ C_SOURCES += landscape.c
 C_SOURCES += main_gui.c
 C_SOURCES += map.c
 C_SOURCES += md5.c
+C_SOURCES += mersenne.c
 C_SOURCES += minilzo.c
 C_SOURCES += misc.c
 C_SOURCES += misc_cmd.c

functions.h

@@ -79,7 +79,7 @@ void ShowInfo(const char *str);
 void CDECL ShowInfoF(const char *str, ...);
 void NORETURN CDECL error(const char *str, ...);
 
-/* ttd.c */
+/* openttd.c */
 
 // **************
 // * Warning: DO NOT enable this unless you understand what it does

mersenne.c

@@ -69,4 +69,5 @@ uint32 RandomMT(void)
 
 void SeedMT(uint32 seed) {}
 
-#endif
+#endif /* MERSENNE_TWISTER */
+

npf.c

@@ -71,11 +71,13 @@ bool IsEndOfLine(TileIndex tile, Trackdir trackdir, RailType enginetype)
 	}
 };
 
+#if 0
 static uint NTPHash(uint key1, uint key2)
 {
 	/* This function uses the old hash, which is fixed on 10 bits (1024 buckets) */
 	return PATHFIND_HASH_TILE(key1);
 }
+#endif
 
 /**
  * Calculates a hash value for use in the NPF.

openttd.h

@@ -1,5 +1,5 @@
-#ifndef TTD_H
+#ifndef OPENTTD_H
-#define TTD_H
+#define OPENTTD_H
 
 #ifndef VARDEF
 #define VARDEF extern
@@ -548,4 +548,4 @@ VARDEF byte _no_scroll;
 #include "functions.h"
 #include "variables.h"
 
-#endif /* TTD_H */
+#endif /* OPENTTD_H */

strings.c

@@ -984,3 +984,4 @@ void InitializeLanguagePacks(void)
 	if (!ReadLanguagePack(def))
 		error("can't read language pack '%s'", dl->ent[def].file);
 }
+