From efc2702491dde25a05945b713ba0fbdf9bd41d0f Mon Sep 17 00:00:00 2001 From: darkvater Date: Sun, 2 Jan 2005 21:52:21 +0000 Subject: (svn r1325) -Fixed eol-style properties on new files. Please before adding a new file to svn use: "svn propset svn:eol-style native "!! -Fix: the level land icon no longer flashes (was palette colour) --- data/openttd.grf | Bin 23016 -> 23016 bytes docs/Readme_OS2.txt | 236 +++++++++++++++++----------------- docs/Readme_Windows_MSVC6.0.txt | 178 ++++++++++++------------- docs/directmusic.txt | 38 +++--- docs/textcolor.txt | 76 +++++------ os/os2/build_lang.cmd | 16 +-- os/os2/dedicated.cmd | 2 +- os/win32/installer/InstallChoices.ini | 76 +++++------ 8 files changed, 311 insertions(+), 311 deletions(-) diff --git a/data/openttd.grf b/data/openttd.grf index ff0051b12..3cf6c6c48 100644 Binary files a/data/openttd.grf and b/data/openttd.grf differ diff --git a/docs/Readme_OS2.txt b/docs/Readme_OS2.txt index b50159134..d58acdfbc 100644 --- a/docs/Readme_OS2.txt +++ b/docs/Readme_OS2.txt @@ -1,118 +1,118 @@ -OpenTTD: OS/2 version -===================== - -OpenTTD has been ported to work on OS/2 4.x or later (including -eComStation). The game should work as well as it does on Windows -or other platforms: the main issues you may encounter are graphics -card problems, but that is really the fault of SDL. - -========================= -USING OPENTTD FOR OS/2 -========================= - -LIBRARIES REQUIRED FOR END USERS --------------------------------- - -SDL.DLL (SDL 1.2.7) and FSLib.dll are required to use this program: -these can be downloaded from the Files section at -http://sourceforge.net/projects/openttd/ - see "os2-useful.zip". -(Note that a newer version of SDL is now available at -ftp://ftp.netlabs.org/pub/sdl/sdl-dev-os2-2004-12-22.zip which may -help solve some problems). - -Note that to actually play the game, I have found in my own -experience that a version of the Scitech Display Drivers or its later -incarnation (see www.scitech.com) are necessary for it to work. If -you have trouble with your native drivers, try the Scitech drivers -and see if they help the problem. - -KNOWN ISSUES ------------- - -- If an error occurs during loading, the OS/2 error message window - is not always displayed. - -A NOTE ABOUT MUSIC ------------------- - -OpenTTD includes a music driver which uses the MCI MIDI system. Unfortunately, -due to the lack of proper MIDI hardware myself, I have been unable to test it, -but during testing, I found that when MIDI was enabled, I got no sound -effects. I therefore decided to DISABLE music by default. - -To enable music, start OpenTTD with the command line: - - openttd -m os2 - -If I hear enough responses that both music and sound work together (it might -just be my system), I'll have the defaults changed. - -A NOTE ABOUT DEDICATED MULTIPLAYER SERVERS ------------------------------------------- - -To start a dedicated multiplayer server, you should run the dedicated.cmd -file. This enables OpenTTD to open up a VIO console window to display -its output and gather any necessary input. Running "openttd -D" -directly will result in the console not being displayed. You may -still pass any other parameters ('-D' is already passed) to -dedicated.cmd. - -========================= -BUILDING THE OS/2 VERSION -========================= - -Compiler --------- - -Open Watcom 1.3 was used to build OpenTTD (earlier versions will -NOT work). See http://www.openwatcom.org/ to download it. It may -also be possible to build OpenTTD under OS/2: I attempted this -before using Open Watcom, but found the tools available for OS/2 -at the time to be a bit more tricky to get working. - -Due to complexities in my set-up, I actually used the Win32 version -of Open Watcom to initially compile OpenTTD for OS/2. There should -be no reason of course why the OS/2 version cannot be used. - -Libraries Required ------------------- - -The following libraries are required. To build zlib and libpng, I -simply added the required files (watch out for sample programs, etc) -to an IDE project file and built a library. Do not use the makefiles -provided, they are not designed for Watcom (apart from SDL): - -- zlib - http://www.zlib.org/ - contains a makefile for OS/2, but is out - of date and uses EMX - -- libpng - http://www.libpng.org/ - contains an EMX/gcc makefile - -- SDL for OS/2 - For 0.3.5, I used ftp://ftp.netlabs.org/pub/sdl/SDL-1.2.7-src-20040908a.zip - - take SDL.dll and SDL.lib from the src/ directory. Note that 20041222 is - out now, which is recommended for stability updates. - -If you do not wish to build the libraries yourself, pre-built versions -can be downloaded from the Files section at -http://sourceforge.net/projects/openttd/ - see "os2-useful.zip". - -Compiling ---------- - -To compile, open the os/os2/openttd.wpj file in the IDE and first build -the strgen.exe target. This will build the .lng file generator, and will -also attempt to build all the language files (plus the table\strings.h -file which is required for openttd.exe to be built). Once strgen.exe and -the language files are built successfully, you can build the openttd.exe -target. - -Contact Information -------------------- - -If you have any questions regarding OS/2 issues, please contact me -(owen@owenrudge.net) and I'll try to help you out. For general OpenTTD -issues, see the Contacting section of readme.txt. - -- Owen Rudge, 26th December 2004 \ No newline at end of file +OpenTTD: OS/2 version +===================== + +OpenTTD has been ported to work on OS/2 4.x or later (including +eComStation). The game should work as well as it does on Windows +or other platforms: the main issues you may encounter are graphics +card problems, but that is really the fault of SDL. + +========================= +USING OPENTTD FOR OS/2 +========================= + +LIBRARIES REQUIRED FOR END USERS +-------------------------------- + +SDL.DLL (SDL 1.2.7) and FSLib.dll are required to use this program: +these can be downloaded from the Files section at +http://sourceforge.net/projects/openttd/ - see "os2-useful.zip". +(Note that a newer version of SDL is now available at +ftp://ftp.netlabs.org/pub/sdl/sdl-dev-os2-2004-12-22.zip which may +help solve some problems). + +Note that to actually play the game, I have found in my own +experience that a version of the Scitech Display Drivers or its later +incarnation (see www.scitech.com) are necessary for it to work. If +you have trouble with your native drivers, try the Scitech drivers +and see if they help the problem. + +KNOWN ISSUES +------------ + +- If an error occurs during loading, the OS/2 error message window + is not always displayed. + +A NOTE ABOUT MUSIC +------------------ + +OpenTTD includes a music driver which uses the MCI MIDI system. Unfortunately, +due to the lack of proper MIDI hardware myself, I have been unable to test it, +but during testing, I found that when MIDI was enabled, I got no sound +effects. I therefore decided to DISABLE music by default. + +To enable music, start OpenTTD with the command line: + + openttd -m os2 + +If I hear enough responses that both music and sound work together (it might +just be my system), I'll have the defaults changed. + +A NOTE ABOUT DEDICATED MULTIPLAYER SERVERS +------------------------------------------ + +To start a dedicated multiplayer server, you should run the dedicated.cmd +file. This enables OpenTTD to open up a VIO console window to display +its output and gather any necessary input. Running "openttd -D" +directly will result in the console not being displayed. You may +still pass any other parameters ('-D' is already passed) to +dedicated.cmd. + +========================= +BUILDING THE OS/2 VERSION +========================= + +Compiler +-------- + +Open Watcom 1.3 was used to build OpenTTD (earlier versions will +NOT work). See http://www.openwatcom.org/ to download it. It may +also be possible to build OpenTTD under OS/2: I attempted this +before using Open Watcom, but found the tools available for OS/2 +at the time to be a bit more tricky to get working. + +Due to complexities in my set-up, I actually used the Win32 version +of Open Watcom to initially compile OpenTTD for OS/2. There should +be no reason of course why the OS/2 version cannot be used. + +Libraries Required +------------------ + +The following libraries are required. To build zlib and libpng, I +simply added the required files (watch out for sample programs, etc) +to an IDE project file and built a library. Do not use the makefiles +provided, they are not designed for Watcom (apart from SDL): + +- zlib + http://www.zlib.org/ - contains a makefile for OS/2, but is out + of date and uses EMX + +- libpng + http://www.libpng.org/ - contains an EMX/gcc makefile + +- SDL for OS/2 + For 0.3.5, I used ftp://ftp.netlabs.org/pub/sdl/SDL-1.2.7-src-20040908a.zip - + take SDL.dll and SDL.lib from the src/ directory. Note that 20041222 is + out now, which is recommended for stability updates. + +If you do not wish to build the libraries yourself, pre-built versions +can be downloaded from the Files section at +http://sourceforge.net/projects/openttd/ - see "os2-useful.zip". + +Compiling +--------- + +To compile, open the os/os2/openttd.wpj file in the IDE and first build +the strgen.exe target. This will build the .lng file generator, and will +also attempt to build all the language files (plus the table\strings.h +file which is required for openttd.exe to be built). Once strgen.exe and +the language files are built successfully, you can build the openttd.exe +target. + +Contact Information +------------------- + +If you have any questions regarding OS/2 issues, please contact me +(owen@owenrudge.net) and I'll try to help you out. For general OpenTTD +issues, see the Contacting section of readme.txt. + +- Owen Rudge, 26th December 2004 diff --git a/docs/Readme_Windows_MSVC6.0.txt b/docs/Readme_Windows_MSVC6.0.txt index 6321a15c8..3e2adfa14 100644 --- a/docs/Readme_Windows_MSVC6.0.txt +++ b/docs/Readme_Windows_MSVC6.0.txt @@ -1,89 +1,89 @@ -Compilung OpenTTD using MS VC6.0 - - -Step 1 ------------------- -Downloaded: -Useful.zip http://sourceforge.net/project/showfiles.php?group_id=103924&package_id=114307&release_id=228633 -SDL.zip http://www.libsdl.org/release/SDL-1.2.7-win32.zip -DirectX7.0 SDK http://www.tt-forums.net/download.php?id=15989 - (or alternatively the latest DirectX SDK from Microsoft) -afxres.h http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H - - -Step 2 ------------------- -Put the newly downloaded files in the VC lib and include directories -(Where D:\program files\ is your local location of VC) - - -* zconf.h [useful.zip] -* zlib.h [useful.zip] -* afxres.h -in - D:\Program Files\Microsoft Visual Studio\VC98\Include - -* zlibstat.lib [usefull.zip] -* SDL.lib [SDL.zip -* libpng.lib [usefull.zip] -in - D:\Program Files\Microsoft Visual Studio\VC98\Lib - -You can also make custum directories, for libraries (.lib) and includes/header files (.h) and -add it to the VC paths via: -Tools -> Options -> Directories -> show directories for: -a) include files (the include dir: D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include ) -b) library files (the lib dir, D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib ) - - -Step 3: DirextX SDK ------------------- -(This should work with the latest DirectX SDK as well.) -The installation with DirectX 7 was odd, so you'd better use the version available via the forum, see also -the download link on top. - -Copy the DirectX 7 SDK files, leaving the directory stucture intact, to the directory: - D:\Program Files\Microsoft Visual Studio\VC98\ -thus resulting in - D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include and - D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib - -Step 3.1 - -Add these two folders to the search path of VC. -In VC6.0: Tools -> Options -> Directories -> show directories for: -a) include files (the include dir: D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include ) -b) libraru files (the lib dir, D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib ) - - -Step 4 ------------------ -Copy the following files from Transport Tycoon Deluxe to the data folder - sample.cat - trg1r.grf - trgcr.grf - trghr.grf - trgir.grf - trgtr.grf - -(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. Those filenames have to be uppercase to be detected correctly. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.) - -Step 5 ------------------ -Compile ... - - -Step 6 ------------------ - -Now it should work, it worked for me :) - -Go ahead and make that patch! - -Happy Hacking! - - - ------------------- -written by Dribbel - +Compilung OpenTTD using MS VC6.0 + + +Step 1 +------------------ +Downloaded: +Useful.zip http://sourceforge.net/project/showfiles.php?group_id=103924&package_id=114307&release_id=228633 +SDL.zip http://www.libsdl.org/release/SDL-1.2.7-win32.zip +DirectX7.0 SDK http://www.tt-forums.net/download.php?id=15989 + (or alternatively the latest DirectX SDK from Microsoft) +afxres.h http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H + + +Step 2 +------------------ +Put the newly downloaded files in the VC lib and include directories +(Where D:\program files\ is your local location of VC) + + +* zconf.h [useful.zip] +* zlib.h [useful.zip] +* afxres.h +in + D:\Program Files\Microsoft Visual Studio\VC98\Include + +* zlibstat.lib [usefull.zip] +* SDL.lib [SDL.zip +* libpng.lib [usefull.zip] +in + D:\Program Files\Microsoft Visual Studio\VC98\Lib + +You can also make custum directories, for libraries (.lib) and includes/header files (.h) and +add it to the VC paths via: +Tools -> Options -> Directories -> show directories for: +a) include files (the include dir: D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include ) +b) library files (the lib dir, D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib ) + + +Step 3: DirextX SDK +------------------ +(This should work with the latest DirectX SDK as well.) +The installation with DirectX 7 was odd, so you'd better use the version available via the forum, see also +the download link on top. + +Copy the DirectX 7 SDK files, leaving the directory stucture intact, to the directory: + D:\Program Files\Microsoft Visual Studio\VC98\ +thus resulting in + D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include and + D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib + +Step 3.1 + +Add these two folders to the search path of VC. +In VC6.0: Tools -> Options -> Directories -> show directories for: +a) include files (the include dir: D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include ) +b) libraru files (the lib dir, D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib ) + + +Step 4 +----------------- +Copy the following files from Transport Tycoon Deluxe to the data folder + sample.cat + trg1r.grf + trgcr.grf + trghr.grf + trgir.grf + trgtr.grf + +(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. Those filenames have to be uppercase to be detected correctly. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.) + +Step 5 +----------------- +Compile ... + + +Step 6 +----------------- + +Now it should work, it worked for me :) + +Go ahead and make that patch! + +Happy Hacking! + + + +------------------ +written by Dribbel + diff --git a/docs/directmusic.txt b/docs/directmusic.txt index f65ba1c33..65fa59d07 100644 --- a/docs/directmusic.txt +++ b/docs/directmusic.txt @@ -1,20 +1,20 @@ -Notes about DirectMusic driver for Win32 ----------------------------------------- - -If compiling under MinGW32, you require the DirectX 7.0 files for MinGW32, available from -http://alleg.sourceforge.net/files/dx70_mgw.zip. - -If compiling under MSVC 6.0, you require the equivalent for MSVC, available from -http://alleg.sourceforge.net/files/dx70_min.zip. MSVC 7.0/7.1 include header files that -are recent enough. - -If you do not want to compile the DirectMusic driver, undefine WIN32_ENABLE_DIRECTMUSIC_SUPPORT -in stdafx.h. - -Bugs, etc ---------- - -- The volume control doesn't work properly. I'll fix this soon. - -Owen Rudge +Notes about DirectMusic driver for Win32 +---------------------------------------- + +If compiling under MinGW32, you require the DirectX 7.0 files for MinGW32, available from +http://alleg.sourceforge.net/files/dx70_mgw.zip. + +If compiling under MSVC 6.0, you require the equivalent for MSVC, available from +http://alleg.sourceforge.net/files/dx70_min.zip. MSVC 7.0/7.1 include header files that +are recent enough. + +If you do not want to compile the DirectMusic driver, undefine WIN32_ENABLE_DIRECTMUSIC_SUPPORT +in stdafx.h. + +Bugs, etc +--------- + +- The volume control doesn't work properly. I'll fix this soon. + +Owen Rudge 14th March 2004 \ No newline at end of file diff --git a/docs/textcolor.txt b/docs/textcolor.txt index 9d4dd9487..1a9a74b42 100644 --- a/docs/textcolor.txt +++ b/docs/textcolor.txt @@ -1,38 +1,38 @@ -0,9,10,2,3,13,9,9,0,10,4,15,6,11,14,1 -dark blue=0 =0 -pale_green=1 =9 -pink=2 =10 -yellow=3 =2 -red=4 =3 -light blue=5 =13 -green=6 =9 -dark green=7 =9 -blue=8 =0 -cream=9 =10 -mauve=10 =4 -purple=11 =15 -orange=12 =6 -brown=13 =11 -grey=14 =14 -white=15 =1 - - - =blue=0 - =white=1 - =yellow=2 - =red=3 - =blue=4 - =grey=5 - =orange=6 - =green=7 - =light yellow=8 - =light green=9 - =cream=10 - =brown=11 - =white=12 - =light blue=13 - =dark grey=14 - =purple=15 - =black=16 - =dark green=17=not good - =dark grey=21 +0,9,10,2,3,13,9,9,0,10,4,15,6,11,14,1 +dark blue=0 =0 +pale_green=1 =9 +pink=2 =10 +yellow=3 =2 +red=4 =3 +light blue=5 =13 +green=6 =9 +dark green=7 =9 +blue=8 =0 +cream=9 =10 +mauve=10 =4 +purple=11 =15 +orange=12 =6 +brown=13 =11 +grey=14 =14 +white=15 =1 + + + =blue=0 + =white=1 + =yellow=2 + =red=3 + =blue=4 + =grey=5 + =orange=6 + =green=7 + =light yellow=8 + =light green=9 + =cream=10 + =brown=11 + =white=12 + =light blue=13 + =dark grey=14 + =purple=15 + =black=16 + =dark green=17=not good + =dark grey=21 diff --git a/os/os2/build_lang.cmd b/os/os2/build_lang.cmd index 074f283f0..57d3e9943 100644 --- a/os/os2/build_lang.cmd +++ b/os/os2/build_lang.cmd @@ -1,8 +1,8 @@ -rem -rem Building language files... -rem -cd .. -strgen\strgen -for %%f in (lang\*.txt) do strgen\strgen %%f -cd strgen - +rem +rem Building language files... +rem +cd .. +strgen\strgen +for %%f in (lang\*.txt) do strgen\strgen %%f +cd strgen + diff --git a/os/os2/dedicated.cmd b/os/os2/dedicated.cmd index f8e04646a..f4eb52499 100644 --- a/os/os2/dedicated.cmd +++ b/os/os2/dedicated.cmd @@ -1 +1 @@ -start /n /win openttd.exe -D %1 %2 %3 %4 %5 %6 %7 %8 %9 +start /n /win openttd.exe -D %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/os/win32/installer/InstallChoices.ini b/os/win32/installer/InstallChoices.ini index 2afae0388..811b339d5 100644 --- a/os/win32/installer/InstallChoices.ini +++ b/os/win32/installer/InstallChoices.ini @@ -1,38 +1,38 @@ -; Ini file generated by the HM NIS Edit IO designer. -[Settings] -NumFields=4 - -[Field 1] -Type=Button -Text=Instant Install -Flags=NOTIFY -Left=0 -Right=58 -Top=0 -Bottom=15 - -[Field 2] -Type=Button -Text=Advanced Install -Flags=NOTIFY -Left=0 -Right=58 -Top=19 -Bottom=35 - -[Field 3] -Type=Label -Text=Install OpenTTD instantly and quickly, no questions asked -Left=62 -Right=245 -Top=3 -Bottom=11 - -[Field 4] -Type=Label -Text=In case you want to change location, options, Start Menu location, etc -Left=62 -Right=283 -Top=23 -Bottom=31 - +; Ini file generated by the HM NIS Edit IO designer. +[Settings] +NumFields=4 + +[Field 1] +Type=Button +Text=Instant Install +Flags=NOTIFY +Left=0 +Right=58 +Top=0 +Bottom=15 + +[Field 2] +Type=Button +Text=Advanced Install +Flags=NOTIFY +Left=0 +Right=58 +Top=19 +Bottom=35 + +[Field 3] +Type=Label +Text=Install OpenTTD instantly and quickly, no questions asked +Left=62 +Right=245 +Top=3 +Bottom=11 + +[Field 4] +Type=Label +Text=In case you want to change location, options, Start Menu location, etc +Left=62 +Right=283 +Top=23 +Bottom=31 + -- cgit v1.2.3-70-g09d2