summaryrefslogtreecommitdiff
path: root/os/win32
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2009-08-15 14:16:09 +0000
committerglx <glx@openttd.org>2009-08-15 14:16:09 +0000
commitcd1de081c29181096763f318671c2e38e3d1019b (patch)
tree8e1209527d24d44f4e17f68b52ecbe3e61b0fd9e /os/win32
parent2ad4bf74a1a0c78138efd450582e91423c282440 (diff)
downloadopenttd-cd1de081c29181096763f318671c2e38e3d1019b.tar.xz
(svn r17186) -Change: remove UNICODE notice in windows installer
Diffstat (limited to 'os/win32')
-rw-r--r--os/win32/installer/install.nsi23
-rw-r--r--os/win32/installer/notice.ini30
2 files changed, 0 insertions, 53 deletions
diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index a607c2cf1..73358ad4d 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -71,10 +71,6 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
!insertmacro MUI_PAGE_INSTFILES
-;-----------------------------------------------------
-; New custom page to show UNICODE and MSLU information
-Page custom ShowWarningsPage
-
!define MUI_FINISHPAGE_TITLE_3LINES
!define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
!define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
@@ -134,8 +130,6 @@ Section "!OpenTTD" Section1
; Delete old files from the main dir. they are now placed in data/ and lang/
Delete "$INSTDIR\*.lng"
Delete "$INSTDIR\*.grf"
- Delete "$INSTDIR\*.obg"
- Delete "$INSTDIR\*.obs"
Delete "$INSTDIR\sample.cat"
Delete "$INSTDIR\ttd.exe"
@@ -376,23 +370,6 @@ WinNT:
ClearErrors
FunctionEnd
-;----------------------------------------------------------------------------------
-; Custom page function to show notices for running OpenTTD (only for win32 systems)
-; We have extracted this custom page as Notice in the .onInit function
-Function ShowWarningsPage
- Call GetWindowsVersion
- Pop $R0
- ; Don't show the UNICODE notice if the installer is run on Win9x systems
- StrCmp $R0 "win9x" 0 WinNT
- Abort
-WinNT:
- !insertmacro MUI_HEADER_TEXT "Installation Complete" "Important notices for OpenTTD usage."
- !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "notice.ini" "Notice"
- !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "Notice"
- ClearErrors
- !insertmacro MUI_INSTALLOPTIONS_SHOW
-FunctionEnd
-
;-------------------------------------------------------------------------------
; Determine windows version, returns "win9x" if Win9x/Me or "winnt" on the stack
Function GetWindowsVersion
diff --git a/os/win32/installer/notice.ini b/os/win32/installer/notice.ini
index 7e51c0dba..e69de29bb 100644
--- a/os/win32/installer/notice.ini
+++ b/os/win32/installer/notice.ini
@@ -1,30 +0,0 @@
-; Ini file generated by the HM NIS Edit IO designer.
-[Settings]
-NumFields=3
-CancelEnabled=0
-
-[Field 1]
-Type=Groupbox
-Text=UNICODE support
-Left=8
-Right=292
-Top=0
-Bottom=75
-
-[Field 2]
-Type=Label
-Text=This version of OpenTTD has support for UNICODE, allowing users to use non-ASCII character sets such as Russian or Japanese.\r\nSelecting such a language will result in an unusable and garbled interface. You will need to specify a font that has support for these characters in openttd.cfg, or alternatively use an appropiate grf file.\r\n\r\nFor more information please refer to the readme or the wiki.
-Left=13
-Right=284
-Top=9
-Bottom=65
-
-[Field 3]
-Type=Link
-Text=OpenTTD wiki
-Left=238
-Right=284
-Top=64
-Bottom=72
-State=http://wiki.openttd.org/index.php/Unicode
-