Merge from Master.

This commit is contained in:
Steve 2016-03-06 19:07:43 +00:00
parent 33f2359812
commit 244e5d6dd9
1 changed files with 6 additions and 6 deletions

View File

@ -89,22 +89,22 @@ static void loadMissions(StarSystem *starSystem)
{ {
name[i] = tolower(name[i]); name[i] = tolower(name[i]);
} }
sprintf(path, "data/missions/%s", name); sprintf(path, "data/missions/%s", name);
filenames = getFileList(path, &count); filenames = getFileList(path, &count);
for (i = 0 ; i < count ; i++) for (i = 0 ; i < count ; i++)
{ {
sprintf(path, "data/missions/%s/%s", name, filenames[i]); sprintf(path, "data/missions/%s/%s", name, filenames[i]);
mission = loadMissionMeta(path); mission = loadMissionMeta(path);
tail->next = mission; tail->next = mission;
tail = mission; tail = mission;
free(filenames[i]); free(filenames[i]);
} }
free(filenames); free(filenames);
} }