Changeset - r22819:ce8daaafe7ab
COPYING
Show inline comments
 
This is the license which applies to OpenTTD with the exception of some
 
3rd party modules. See readme.txt for details
 
3rd party modules. See README.md for details
 

	
 

	
 
                    GNU GENERAL PUBLIC LICENSE
Makefile.bundle.in
Show inline comments
 
@@ -69,7 +69,7 @@ endif
 
	$(Q)cp "$(BIN_DIR)/baseset/opntitle.dat"  "$(BASESET_DIR)/"
 
	$(Q)cp "$(BIN_DIR)/baseset/"*.obm         "$(BASESET_DIR)/"
 
	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
 
	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
 
	$(Q)cp "$(ROOT_DIR)/README.md"           "$(BUNDLE_DIR)/"
 
	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 
	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
 
	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
 
@@ -88,7 +88,7 @@ ifdef MENU_DIR
 
	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 
endif
 
ifeq ($(TTD), openttd.exe)
 
	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 
	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/README.md" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 
ifeq ($(OS), DOS)
 
	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
 
ifndef STRIP
 
@@ -159,7 +159,7 @@ bundle_dmg: bundle
 
bundle_exe: all
 
	@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
 
	$(Q)mkdir -p "$(BUNDLES_DIR)"
 
	$(Q)unix2dos "$(ROOT_DIR)/docs/"*.txt "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
 
	$(Q)unix2dos "$(ROOT_DIR)/docs/"*.txt "$(ROOT_DIR)/README.md" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
 
	$(Q)cd $(ROOT_DIR)/os/windows/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
 
	$(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
 

	
 
@@ -188,7 +188,7 @@ endif
 
	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
 
ifndef DO_NOT_INSTALL_DOCS
 
	$(Q)install -d "$(INSTALL_DOC_DIR)"
 
	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/known-bugs.txt" "$(INSTALL_DOC_DIR)"
 
	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/README.md" "$(BUNDLE_DIR)/known-bugs.txt" "$(INSTALL_DOC_DIR)"
 
endif
 
ifndef DO_NOT_INSTALL_CHANGELOG
 
	$(Q)install -d "$(INSTALL_DOC_DIR)"
docs/Readme_Windows_MSVC.txt
Show inline comments
 
@@ -76,7 +76,7 @@ list, above all others, otherwise compil
 

	
 
3) TTD GRAPHICS FILES
 
---------------------
 
See section 4.1 of readme.txt for the required 3rdparty files and how to install them.
 
See section 4.1 of README.md for the required 3rdparty files and how to install them.
 

	
 

	
 
4) COMPILING
os/windows/installer/install.nsi
Show inline comments
 
@@ -89,7 +89,7 @@ Page custom SelectCDEnter SelectCDExit "
 
!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for more information"
 
!define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}"
 
!define MUI_FINISHPAGE_NOREBOOTSUPPORT
 
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt"
 
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.md"
 
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
 
!define MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT DisableBack
 

	
 
@@ -139,7 +139,7 @@ Section "!OpenTTD" Section1
 
	; Copy the scripts
 
	SetOutPath "$INSTDIR\scripts\"
 
	File ${PATH_ROOT}bin\scripts\*.*
 
	Push "$INSTDIR\scripts\readme.txt"
 
	Push "$INSTDIR\scripts\README.md"
 
	Call unix2dos
 

	
 
	; Copy some documention files
 
@@ -158,8 +158,8 @@ Section "!OpenTTD" Section1
 
	File ${PATH_ROOT}COPYING
 
	Push "$INSTDIR\COPYING"
 
	Call unix2dos
 
	File ${PATH_ROOT}readme.txt
 
	Push "$INSTDIR\readme.txt"
 
	File ${PATH_ROOT}README.md
 
	Push "$INSTDIR\README.md"
 
	Call unix2dos
 
	File ${PATH_ROOT}known-bugs.txt
 
	Push "$INSTDIR\known-bugs.txt"
 
@@ -213,13 +213,13 @@ Section "!OpenTTD" Section1
 
	CreateDirectory "$SMPROGRAMS\$SHORTCUTS"
 
	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\OpenTTD.lnk" "$INSTDIR\openttd.exe"
 
	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Uninstall.lnk" "$INSTDIR\uninstall.exe"
 
	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Readme.lnk" "$INSTDIR\Readme.txt"
 
	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Readme.lnk" "$INSTDIR\README.md"
 
	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Changelog.lnk" "$INSTDIR\Changelog.txt"
 
	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Known-bugs.lnk" "$INSTDIR\known-bugs.txt"
 
	CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Docs"
 
	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Docs\Multiplayer.lnk" "$INSTDIR\docs\multiplayer.txt"
 
	CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Scripts"
 
	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Scripts\Readme.lnk" "$INSTDIR\scripts\readme.txt"
 
	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Scripts\Readme.lnk" "$INSTDIR\scripts\README.md"
 
	!insertmacro MUI_STARTMENU_WRITE_END
 
SectionEnd
 

	
 
@@ -387,7 +387,7 @@ Section "Uninstall"
 

	
 
	; Clean up OpenTTD dir
 
	Delete "$INSTDIR\changelog.txt"
 
	Delete "$INSTDIR\readme.txt"
 
	Delete "$INSTDIR\README.md"
 
	Delete "$INSTDIR\known-bugs.txt"
 
	Delete "$INSTDIR\openttd.exe"
 
	Delete "$INSTDIR\COPYING"
projects/openttd_vs100.vcxproj
Show inline comments
 
@@ -1286,7 +1286,7 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
  <ItemGroup>
 
    <ProjectReference Include="langs_vs100.vcxproj">
projects/openttd_vs100.vcxproj.filters
Show inline comments
 
@@ -3045,6 +3045,6 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
</Project>
projects/openttd_vs100.vcxproj.filters.in
Show inline comments
 
@@ -8,6 +8,6 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
</Project>
projects/openttd_vs100.vcxproj.in
Show inline comments
 
@@ -307,7 +307,7 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
  <ItemGroup>
 
    <ProjectReference Include="langs_vs100.vcxproj">
projects/openttd_vs140.vcxproj
Show inline comments
 
@@ -1307,7 +1307,7 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
	<None Include="..\README.md" />
 
  </ItemGroup>
 
  <ItemGroup>
 
    <ProjectReference Include="langs_vs140.vcxproj">
projects/openttd_vs140.vcxproj.filters
Show inline comments
 
@@ -3045,6 +3045,6 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
</Project>
projects/openttd_vs140.vcxproj.filters.in
Show inline comments
 
@@ -8,6 +8,6 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
</Project>
projects/openttd_vs140.vcxproj.in
Show inline comments
 
@@ -328,7 +328,7 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
  <ItemGroup>
 
    <ProjectReference Include="langs_vs140.vcxproj">
projects/openttd_vs141.vcxproj
Show inline comments
 
@@ -1307,7 +1307,7 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
  <ItemGroup>
 
    <ProjectReference Include="langs_vs141.vcxproj">
projects/openttd_vs141.vcxproj.filters
Show inline comments
 
@@ -3045,6 +3045,6 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
</Project>
projects/openttd_vs141.vcxproj.filters.in
Show inline comments
 
@@ -8,6 +8,6 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
</Project>
projects/openttd_vs141.vcxproj.in
Show inline comments
 
@@ -328,7 +328,7 @@
 
  </ItemGroup>
 
  <ItemGroup>
 
    <None Include="..\media\openttd.ico" />
 
    <None Include="..\readme.txt" />
 
    <None Include="..\README.md" />
 
  </ItemGroup>
 
  <ItemGroup>
 
    <ProjectReference Include="langs_vs141.vcxproj">
projects/openttd_vs80.vcproj
Show inline comments
 
@@ -4488,7 +4488,7 @@
 
			>
 
		</File>
 
		<File
 
			RelativePath=".\..\readme.txt"
 
			RelativePath=".\..\README.md"
 
			>
 
		</File>
 
	</Files>
projects/openttd_vs80.vcproj.in
Show inline comments
 
@@ -437,7 +437,7 @@
 
			>
 
		</File>
 
		<File
 
			RelativePath=".\..\readme.txt"
 
			RelativePath=".\..\README.md"
 
			>
 
		</File>
 
	</Files>
projects/openttd_vs90.vcproj
Show inline comments
 
@@ -4485,7 +4485,7 @@
 
			>
 
		</File>
 
		<File
 
			RelativePath=".\..\readme.txt"
 
			RelativePath=".\..\README.md"
 
			>
 
		</File>
 
	</Files>
projects/openttd_vs90.vcproj.in
Show inline comments
 
@@ -434,7 +434,7 @@
 
			>
 
		</File>
 
		<File
 
			RelativePath=".\..\readme.txt"
 
			RelativePath=".\..\README.md"
 
			>
 
		</File>
 
	</Files>
src/bootstrap_gui.cpp
Show inline comments
 
@@ -264,6 +264,6 @@ bool HandleBootstrap()
 

	
 
	/* Failure to get enough working to get a graphics set. */
 
failure:
 
	usererror("Failed to find a graphics set. Please acquire a graphics set for OpenTTD. See section 4.1 of readme.txt.");
 
	usererror("Failed to find a graphics set. Please acquire a graphics set for OpenTTD. See section 4.1 of README.md.");
 
	return false;
 
}
src/gfxinit.cpp
Show inline comments
 
@@ -139,7 +139,7 @@ void CheckExternalFiles()
 

	
 
	if (used_set->GetNumInvalid() != 0) {
 
		/* Not all files were loaded successfully, see which ones */
 
		add_pos += seprintf(add_pos, last, "Trying to load graphics set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of readme.txt.\n\nThe following files are corrupted or missing:\n", used_set->name);
 
		add_pos += seprintf(add_pos, last, "Trying to load graphics set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of README.md.\n\nThe following files are corrupted or missing:\n", used_set->name);
 
		for (uint i = 0; i < GraphicsSet::NUM_FILES; i++) {
 
			MD5File::ChecksumResult res = GraphicsSet::CheckMD5(&used_set->files[i], BASESET_DIR);
 
			if (res != MD5File::CR_MATCH) add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", used_set->files[i].filename, res == MD5File::CR_MISMATCH ? "corrupt" : "missing", used_set->files[i].missing_warning);
 
@@ -149,7 +149,7 @@ void CheckExternalFiles()
 

	
 
	const SoundsSet *sounds_set = BaseSounds::GetUsedSet();
 
	if (sounds_set->GetNumInvalid() != 0) {
 
		add_pos += seprintf(add_pos, last, "Trying to load sound set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of readme.txt.\n\nThe following files are corrupted or missing:\n", sounds_set->name);
 
		add_pos += seprintf(add_pos, last, "Trying to load sound set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of README.md.\n\nThe following files are corrupted or missing:\n", sounds_set->name);
 

	
 
		assert_compile(SoundsSet::NUM_FILES == 1);
 
		/* No need to loop each file, as long as there is only a single
src/openttd.cpp
Show inline comments
 
@@ -815,7 +815,7 @@ int openttd_main(int argc, char *argv[])
 
	if (sounds_set == NULL && BaseSounds::ini_set != NULL) sounds_set = stredup(BaseSounds::ini_set);
 
	if (!BaseSounds::SetSet(sounds_set)) {
 
		if (StrEmpty(sounds_set) || !BaseSounds::SetSet(NULL)) {
 
			usererror("Failed to find a sounds set. Please acquire a sounds set for OpenTTD. See section 4.1 of readme.txt.");
 
			usererror("Failed to find a sounds set. Please acquire a sounds set for OpenTTD. See section 4.1 of README.md.");
 
		} else {
 
			ErrorMessageData msg(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND);
 
			msg.SetDParamStr(0, sounds_set);
 
@@ -828,7 +828,7 @@ int openttd_main(int argc, char *argv[])
 
	if (music_set == NULL && BaseMusic::ini_set != NULL) music_set = stredup(BaseMusic::ini_set);
 
	if (!BaseMusic::SetSet(music_set)) {
 
		if (StrEmpty(music_set) || !BaseMusic::SetSet(NULL)) {
 
			usererror("Failed to find a music set. Please acquire a music set for OpenTTD. See section 4.1 of readme.txt.");
 
			usererror("Failed to find a music set. Please acquire a music set for OpenTTD. See section 4.1 of README.md.");
 
		} else {
 
			ErrorMessageData msg(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND);
 
			msg.SetDParamStr(0, music_set);
0 comments (0 inline, 0 general)