dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp-nrt

Browse Source 
# Conflicts:
#	src/console_cmds.cpp
#	src/script/api/script_order.cpp
#	src/station_cmd.cpp
#	src/statusbar_gui.cpp
#	src/town_gui.cpp
This commit is contained in:
Jonathan G Rennison
2019-08-24 11:00:41 +01:00
parent 04ef407ddf dabccf70b4
commit 6562937899
33 changed files with 525 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/fileio.cpp
View File

@@ -565,18 +565,6 @@ bool AppendPathSeparator(char *buf, const char *last)
return true;
}
/**
* Find the first directory in a tar archive.
* @param tarname the name of the tar archive to look in.
* @param subdir the subdirectory to look in.
*/
const char *FioTarFirstDir(const char *tarname, Subdirectory subdir)
{
TarList::iterator it = _tar_list[subdir].find(tarname);
if (it == _tar_list[subdir].end()) return nullptr;
return (*it).second.dirname;
}
static void TarAddLink(const std::string &srcParam, const std::string &destParam, Subdirectory subdir)
{
std::string src = srcParam;
@@ -598,11 +586,6 @@ static void TarAddLink(const std::string &srcParam, const std::string &destParam
}
}
void FioTarAddLink(const char *src, const char *dest, Subdirectory subdir)
{
TarAddLink(src, dest, subdir);
}
/**
* Simplify filenames from tars.
* Replace '/' by #PATHSEPCHAR, and force 'name' to lowercase.