summaryrefslogtreecommitdiff
path: root/src/ini_load.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-08-24 13:38:26 +0000
committerrubidium <rubidium@openttd.org>2011-08-24 13:38:26 +0000
commit05300a00b1c82b1c411b38fb024a6decfefce4f8 (patch)
treef13b4b5eb198dac31d5de390bd0041f0fa8e4746 /src/ini_load.cpp
parent5f06d5067f861031dedd8de0ce0d21cd6f70a9a7 (diff)
downloadopenttd-05300a00b1c82b1c411b38fb024a6decfefce4f8.tar.xz
(svn r22824) -Codechange: pass sub directory to ini loading
Diffstat (limited to 'src/ini_load.cpp')
-rw-r--r--src/ini_load.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ini_load.cpp b/src/ini_load.cpp
index ae59f6c83..6a2087303 100644
--- a/src/ini_load.cpp
+++ b/src/ini_load.cpp
@@ -204,9 +204,10 @@ void IniLoadFile::RemoveGroup(const char *name)
/**
* Load the Ini file's data from the disk.
* @param filename the file to load.
+ * @param subdir the sub directory to load the file from.
* @pre nothing has been loaded yet.
*/
-void IniLoadFile::LoadFromDisk(const char *filename)
+void IniLoadFile::LoadFromDisk(const char *filename, Subdirectory subdir)
{
assert(this->last_group == &this->group);
@@ -218,7 +219,7 @@ void IniLoadFile::LoadFromDisk(const char *filename)
uint comment_alloc = 0;
size_t end;
- FILE *in = this->OpenFile(filename, &end);
+ FILE *in = this->OpenFile(filename, subdir, &end);
if (in == NULL) return;
end += ftell(in);