(svn r251) -Project ready for 0.3.4 release. Updated installer, readme and fileinformation

-Fix: warning on release build of strgen

4 files changed, 40 insertions, 26 deletions

diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index cb27e7b3d..e1340e803 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -1,7 +1,7 @@
 ; Define your application name
 !define APPNAME "OpenTTD"
-!define APPNAMEANDVERSION "OpenTTD 0.3.3.0"
-!define APPVERSION "0.3.3.0"
+!define APPNAMEANDVERSION "OpenTTD 0.3.4.0"
+!define APPVERSION "0.3.4.0"
 !define INSTALLERVERSION 11
 
 BrandingText "OpenTTD Installer"
@@ -9,7 +9,7 @@ BrandingText "OpenTTD Installer"
 
 ; Version Info
 Var AddWinPrePopulate
-VIProductVersion "0.3.3.0"
+VIProductVersion "${APPVERSION}"
 VIAddVersionKey "ProductName" "OpenTTD Installer"
 VIAddVersionKey "Comments" "Installs ${APPNAMEANDVERSION}"
 VIAddVersionKey "CompanyName" "OpenTTD Developers"
@@ -97,22 +97,22 @@ Section "!OpenTTD" Section1
 
 	; Copy data files
 	SetOutPath "$INSTDIR\data\"
+  File ${PATH_ROOT}data\canalsw.grf
+  File ${PATH_ROOT}data\openttd.grf
   File ${PATH_ROOT}data\opntitle.dat
   File ${PATH_ROOT}data\signalsw.grf
-  File ${PATH_ROOT}data\openttd.grf
-  File ${PATH_ROOT}data\canalsw.grf
-  File ${PATH_ROOT}ReleasePNG\ttd.map
+  File ${PATH_ROOT}data\trkfoundw.grf
 
 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"
 
 	;Copy text files
   File ${PATH_ROOT}changelog.txt
-;  File "gpl.txt"
+  File ${PATH_ROOT}COPYING
   File ${PATH_ROOT}readme.txt
 
 	; Copy executable
-	File /oname=openttd.exe        ${PATH_ROOT}ReleasePNG\openttd.exe
+	File /oname=openttd.exe        ${PATH_ROOT}Release\openttd.exe
 	File ${PATH_ROOT}strgen\Release\strgen.exe
 
 
@@ -212,8 +212,7 @@ Section Uninstall
 	Delete "$INSTDIR\readme.txt"
 	Delete "$INSTDIR\openttd.exe"
 	Delete "$INSTDIR\strgen.exe"
-	Delete "$INSTDIR\data\ttd.map"
-	Delete "$INSTDIR\gpl.txt"
+	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\INSTALL.LOG"
 	Delete "$INSTDIR\crash.log"
 	Delete "$INSTDIR\openttd.cfg"
@@ -223,6 +222,7 @@ Section Uninstall
 	Delete "$INSTDIR\data\signalsw.grf"
 	Delete "$INSTDIR\data\openttd.grf"
 	Delete "$INSTDIR\data\canalsw.grf"
+	Delete "$INSTDIR\data\trkfoundw.grf"
 	Delete "$INSTDIR\data\trg1r.grf"
 	Delete "$INSTDIR\data\trghr.grf"
 	Delete "$INSTDIR\data\trgtr.grf"
diff --git a/readme.txt b/readme.txt
index 21e4e1259..eaa97b33e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
 Last updated:    $LastChangedDate: 2004-07-25 21:22:11 +0200 (Sun, 25 Jul 2004) $
-Release version: 0.3.3
+Release version: 0.3.4
 ------------------------------------------------------------------------
 
 
@@ -34,7 +34,7 @@ The easiest way to contact the OpenTTD team is by submitting bug reports or
 posting comments in our forums. You can also chat with us on IRC (#openttd
 on irc.freenode.net).
 
-The OpenTTD homepage is http://www.openttd.com/.
+The OpenTTD homepage is http://www.openttd.org/.
 
 You can find a forum for OpenTTD at
 http://www.tt-forums.net/index.php?c=20
@@ -152,7 +152,15 @@ MorphOS
 
 8.0) Translating:
 ---- -------------------
-See http://www.openttd.com/translating.php for up-to-date information.
+See http://www.openttd.org/translating.php for up-to-date information.
+
+The use of the online Translator service, located at http://translator.openttd.org. 
+For a username password combo you should contact the development team, either by mail, irc
+or the forums. The system is straight-forward to use, if you have any troubles, read the 
+online help located there.
+
+If for some reason the website is down for a longer period of time, the information below
+might be of help.
 
 8.1) Guidelines:
 ---- -------------------
@@ -200,26 +208,32 @@ That's all! You should now be able to select the language in the game options.
 X.X) Credits:
 ---- --------
 The OpenTTD team:
-  Ludvig Strigeus (ludde)        - OpenTTD author, main coder.
-  Serge Paquet (vurlix)          - Assistant project manager, coder and webmaster.
+  Ludvig Strigeus (ludde)        - OpenTTD author, main coder (0.1 - 0.3.3)
+  Serge Paquet (vurlix)          - Assistant project manager, coder
   Dominik Scherer (dominik81)    - Coder
   Tamas Farago (Darkvater)       - Coder
-  Owen Rudge (orudge)            - Contributor, forum host.
+  Patric Stout (TrueLight)       - Coder, SVN-repository and website host
+  Stefan Meißner (sign_de)       - Network and Console coder
+  Owen Rudge (orudge)            - Contributor, forum host
   Bjarni Corfitzen (Bjarni)      - MacOS port
+  Kerekes Miham (MiHaMiX)        - Maintainer of translator service, and host of nightlies
   Cian Duffy (MYOB)              - BeOS port / manual writing
   Christian Rosentreter (tokaiz) - MorphOS/AmigaOS port
-  Viktor Strigeus (wiggo)        - Web hosting services
-
+  
 Thanks to:
   Josef Drexler - For his great work on TTDPatch.
   Marcin Grzegorczyk - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations).
   Mike Ragsdale - OpenTTD installer
+  Celestar - for his many patches, suggestions and fixes
+  blathijs - for his many patches, suggestions and code documentation
   pasky - Many patches, newgrf support, etc.
+  Tron - relentless correcting of the code
+  mivlad - some patches
   truesatan - Some patches
-  TrueLight - Some patches
   Michael Polnick - Some patches
   Michael Blunck - Nice graphics
   George - Canal graphics
+  All Translators - For their support to make OpenTTD a truly international game
   Bug Reporters - Thanks for all bug reports.
-  Chris Sawyer - For an amazing game.
-
+  Moriarty - for the tons of (annoying) bugreports
+  Chris Sawyer - For an amazing game!.
diff --git a/strgen/strgen.c b/strgen/strgen.c
index 9e146feca..635e77a61 100644
--- a/strgen/strgen.c
+++ b/strgen/strgen.c
@@ -741,7 +741,7 @@ void write_langfile(const char *filename, int show_todo)
 	fclose(f);
 }
 
-int main(int argc, char* argv[])
+int CDECL main(int argc, char* argv[])
 {
 	char *r;
 	char buf[256];
diff --git a/ttd.rc b/ttd.rc
index 65dc355ff..3df92fd9d 100644
--- a/ttd.rc
+++ b/ttd.rc
@@ -60,8 +60,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,3,3,0
- PRODUCTVERSION 0,3,3,0
+ FILEVERSION 0,3,4,0
+ PRODUCTVERSION 0,3,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,14 +79,14 @@ BEGIN
             VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
             VALUE "CompanyName", "OpenTTD Developers\0"
             VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "0.3.3.0\0"
+            VALUE "FileVersion", "0.3.4.0\0"
             VALUE "InternalName", "openttd\0"
             VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2004. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "openttd.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "OpenTTD\0"
-            VALUE "ProductVersion", "0.3.3.0\0"
+            VALUE "ProductVersion", "0.3.4.0\0"
             VALUE "SpecialBuild", "-\0"
         END
     END