(svn r1271) -Fix: set eol-style to native on missing files

-Added known_bugs file with open bugs on SF..should be included with installer -Updated installer for 0.3.5
2004-12-24 00:00:10 +00:00 · 2004-12-24 00:00:10 +00:00 · de597eb7d2
parent 7d18544b04
commit de597eb7d2
4 changed files with 617 additions and 575 deletions
--- a/known-bugs.txt
+++ b/known-bugs.txt
@ -0,0 +1,68 @@
+README
+------------------------------------------------------------------------
+All bugs listed below are marked as known. Please do not submit any bugs 
+that are the same as these. If you do, don't act surprised, because
+we WILL flame you!!
+
+There is an experimental AI included in the game which you can enable
+from the "Configure Patches" window. All bugs related to this AI should
+go to: http://www.tt-forums.net/viewtopic.php?t=9576
+
+Of course if you have more knowledge about any of these bugs, have more
+specifics, we welcome you to report them. React to the given bug indicated
+by the number below on http://sourceforge.net/tracker/?group_id=103924&atid=636365
+If the the bug-report is closed, it has been fixed, which then can be verified
+in the latest SVN version.
+
+Bugs for 0.3.5
+------------------------------------------------------------------------
+URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
+-1085486      Subsidies: Only count when station is in right suburb
+-1084797      building stretch leaves gap
+-1084789      delivered cargo bug
+-1083941      Train gui crash assertion error
+-1083717      graphical glitch
+-1083710      Reverse train in depot crashes OpenTTD
+-1074623      bus pathfinding inadequacies
+-1074610      overtaking at signals bug
+-1065168      accept iron ore doesn't produce steel
+-1060686      changing (load) order doesn't take effect immediately
+-1053339      depot/station looping
+-1050990      Buying trains sometimes accounted for incorrectly
+-1040119      Flood and wagons in depot
+-1034778      train breaksdown, when breaks set to none
+-1033300      signal bug
+-1030918      Negative city population
+-1030502      Buying up a company isn't complete
+-1024703      Infinite access of A: when saving and no disk in drive
+-997251       Realistic acceleration: Trains don't slow down in curves
+-996503       Sound volume bug
+-992677       BeOS MIDI does not initialise on newer BeOS releases
+-985475       Different kinds of signals in same tile? [Bug]
+-980271       Realistic acceleration bug / Lev4 Chimaera becomes useless
+-978372       Inconsistent stopping.
+-968036       Ship blocked at the edge
+
+Minor Bugs for 0.3.5
+------------------------------------------------------------------------
+URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
+-1090495      Bridges and straight lakesides
+-1087407      wrong message in history
+-1084620      Minor bug considering buses/trucks
+-1034310      color mauve in diagrams
+-1031451      Catchment area shows when buying sign.
+-1031184      Smoke visible through tunnel
+-1030661      It's possible to build a tunnel under oil wells
+-1009171      Canals and locks at sea level cause flooding
+-998902       Annoying out-of-date message
+-993516       Canal + bouy -> wrong graphics.
+-987891       Large UFO destruction bug
+-987884       farm fences
+-987883       Aircraft landing/taking off
+-987880       company league table updating
+-985927       many carriages in depot
+-985924       aircraft taxi speed
+-980276       Overflow in factory directory
+-976824       transmitter base
+-941694       Clipping problems stations/vehicles on slopes
+-936997       Stationname too long to fit in trainwindow bug
--- a/langs.vcproj
+++ b/langs.vcproj
@ -193,17 +193,6 @@
 					Outputs="lang\italian.lng"/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath=".\lang\latvian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating latvian language file"
-					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;"
-					Outputs="lang\latvian.lng"/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath=".\lang\norwegian.txt">
 			<FileConfiguration
@ -264,18 +253,6 @@
 					Outputs="lang\romanian.lng"/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath=".\lang\russian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating russian language file"
-					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
-"
-					Outputs="lang\russian.lng"/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath=".\lang\slovak.txt">
 			<FileConfiguration
@ -312,18 +289,6 @@
 					Outputs="lang\swedish.lng"/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath=".\lang\turkish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating turkish language file"
-					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
-"
-					Outputs="lang\turkish.lng"/>
-			</FileConfiguration>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@ -1,8 +1,8 @@
 ; Define your application name
 !define APPNAME "OpenTTD"
-!define APPNAMEANDVERSION "OpenTTD 0.3.4.0"
-!define APPVERSION "0.3.4.0"
-!define INSTALLERVERSION 12 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPNAMEANDVERSION "OpenTTD 0.3.5.0"
+!define APPVERSION "0.3.5.0"
+!define INSTALLERVERSION 13 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!

 BrandingText "OpenTTD Installer"

@ -24,7 +24,7 @@ Name "${APPNAMEANDVERSION}"
 ; NOTE: Keep trailing backslash!
 InstallDir "$PROGRAMFILES\OpenTTD\"
 InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Install Folder"
-OutFile "openttd-${APPVERSION}.exe"
+OutFile "openttd-${APPVERSION}-win32.exe"

 ShowInstDetails show
 ShowUninstDetails show
@ -110,9 +110,10 @@ Section "!OpenTTD" Section1
  File ${PATH_ROOT}changelog.txt
  File ${PATH_ROOT}COPYING
  File ${PATH_ROOT}readme.txt
+  File ${PATH_ROOT}known-bugs.txt

 	; Copy executable
-	File /oname=openttd.exe        ${PATH_ROOT}Release\openttd.exe
+	File /oname=OpenTTD.exe        ${PATH_ROOT}Release\openttd.exe
 	File ${PATH_ROOT}strgen\Release\strgen.exe


@ -124,16 +125,16 @@ Section "!OpenTTD" Section1


 	;Creates the Registry Entries
-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Comments" "Visit http://www.openttd.com"
+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Comments" "Visit http://www.openttd.org"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayIcon" "$INSTDIR\setup.ico"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayName" "OpenTTD ${APPVERSION}"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayVersion" "${APPVERSION}"
-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "HelpLink" "http://www.openttd.com"
+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "HelpLink" "http://www.openttd.org"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Install Folder" "$INSTDIR"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Publisher" "OpenTTD"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Shortcut Folder" "$SHORTCUTS"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "UninstallString" "$INSTDIR\uninstall.exe"
-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "URLInfoAbout" "http://www.openttd.com"
+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "URLInfoAbout" "http://www.openttd.org"
 	;This key sets the Version DWORD that patches will check against
 	WriteRegDWORD HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Version" ${INSTALLERVERSION}

@ -144,6 +145,7 @@ Section "!OpenTTD" Section1
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Uninstall.lnk" "$INSTDIR\uninstall.exe"
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Readme.lnk" "$INSTDIR\Readme.txt"
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Changelog.lnk" "$INSTDIR\Changelog.txt"
+	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Known-bugs.lnk" "$INSTDIR\known-bugs.txt"
 	!insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd

@ -206,16 +208,19 @@ Section Uninstall
 	Delete "$SMPROGRAMS\$SHORTCUTS\Uninstall.lnk"
 	Delete "$SMPROGRAMS\$SHORTCUTS\Readme.lnk"
 	Delete "$SMPROGRAMS\$SHORTCUTS\Changelog.lnk"
+	Delete "$SMPROGRAMS\$SHORTCUTS\Known-bugs.lnk"

 	; Clean up OpenTTD dir
 	Delete "$INSTDIR\changelog.txt"
 	Delete "$INSTDIR\readme.txt"
+	Delete "$INSTDIR\known-bugs.txt"
 	Delete "$INSTDIR\openttd.exe"
 	Delete "$INSTDIR\strgen.exe"
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\INSTALL.LOG"
 	Delete "$INSTDIR\crash.log"
 	Delete "$INSTDIR\openttd.cfg"
+	Delete "$INSTDIR\save\autosave\network*.tmp" ; temporary network file

 	; Data files
 	Delete "$INSTDIR\data\opntitle.dat"
@ -248,6 +253,9 @@ SectionEnd

 Function SelectCD
 	SectionGetFlags ${Section2} $0
+	IntOp $1 $0 & 0x80 ; bit 7 set by upgrade, no need to copy files
+	IntCmp $1 1 DoneCD ;upgrade doesn't need copy files
+	
 	IntOp $0 $0 & 1
 	IntCmp $0 1 NoAbort
 		Abort
@ -269,7 +277,7 @@ TruFinish:
 	ClearErrors
 	WriteINIStr $R0 "Field 2" "State" $CDDRIVE
 	WriteINIStr $R0 "Field 3" "Text" $AddWinPrePopulate
-
+DoneCD:
 	InstallOptions::dialog $R0
 	Pop $R1
 FunctionEnd
@ -326,6 +334,7 @@ WelcomeToSetup:
 	ReadRegStr $OLDVERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayVersion"
 	;Gets the older version then displays it in a message box
 	MessageBox MB_OK|MB_ICONINFORMATION "Welcome to ${APPNAMEANDVERSION} Setup.$\n$\nThis will allow you to upgrade from version $OLDVERSION."
+	SectionSetFlags ${Section2} 0x80 ; set bit 7
 	Goto FinishCallback

 VersionsAreEqual:
--- a/os2.c
+++ b/os2.c