(svn r1093) -Fix: Hopefully fixed windows revision issues once and for all. Removed globalness of _openttd_revision and put all such ifdefs into one place. If server has a revision only the same revisions can join; if the server has no revision everyone can join. I reckon this should be a server-side option to allow people to join or not to join.

1 files changed, 5 insertions, 9 deletions

diff --git a/win32.c b/win32.c
index 7177d72a8..dd6e76e6b 100644
--- a/win32.c
+++ b/win32.c
@@ -15,11 +15,6 @@
 
 #define SMART_PALETTE_ANIM
 
-/* Declare the revision tag for Windows */
-#ifdef WITH_REV_HACK
-	const char _openttd_revision[] = WITH_REV_HACK;
-#endif
-
 static struct {
 	HWND main_wnd;
 	HBITMAP dib_sect;
@@ -446,6 +441,8 @@ static void RegisterWndClass()
 	}
 }
 
+extern const char _openttd_revision[];
+
 static void MakeWindow(bool full_screen)
 {
 	_fullscreen = full_screen;
@@ -504,10 +501,9 @@ static void MakeWindow(bool full_screen)
 			SetWindowPos(_wnd.main_wnd, 0, x, y, w, h, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
 		} else {
 			char Windowtitle[50] = "OpenTTD ";
-			#ifdef WITH_REV
-				// also show revision number/release in window title
-				strncat(Windowtitle, _openttd_revision, sizeof(Windowtitle)-(strlen(Windowtitle) + 1));
-			#endif
+			// also show revision number/release in window title
+			strncat(Windowtitle, _openttd_revision, sizeof(Windowtitle)-(strlen(Windowtitle) + 1));
+
 			_wnd.main_wnd = CreateWindow("TTD", Windowtitle, style, x, y, w, h, 0, 0, _inst, 0);
 			if (_wnd.main_wnd == NULL)
 				error("CreateWindow failed");