mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 17:42:29 +01:00
Code Issues Releases Wiki Activity

Fix #6141: CSS50.dat is never loaded (#7357)

Browse Source
This commit is contained in:
woj1993
2018-04-13 12:29:31 +02:00
committed by Ted John
parent 4c676e6000
commit 4b372120f1
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -10,6 +10,7 @@
- Fix: [#3596] Saving parks, landscapes and tracks with a period in the filenames don't get their extension. - Fix: [#3596] Saving parks, landscapes and tracks with a period in the filenames don't get their extension.
- Fix: [#5210] Default system dialog not accessible from saving landscape window. - Fix: [#5210] Default system dialog not accessible from saving landscape window.
- Fix: [#6134] Scenarios incorrectly categorised when using Polish version of RCT2. - Fix: [#6134] Scenarios incorrectly categorised when using Polish version of RCT2.
- Fix: [#6141] CSS50.dat is never loaded.
- Fix: [#7176] Mechanics sometimes fall down from rides. - Fix: [#7176] Mechanics sometimes fall down from rides.
- Fix: [#7303] Visual glitch with virtual floor near map edges. - Fix: [#7303] Visual glitch with virtual floor near map edges.
- Fix: [#7327] Abstract scenery and stations don't get fully See-Through when hiding them (original bug). - Fix: [#7327] Abstract scenery and stations don't get fully See-Through when hiding them (original bug).

12
src/openrct2/Context.cpp
View File

@@ -274,8 +274,16 @@ namespace OpenRCT2
std::string result; std::string result;
if (pathId == PATH_ID_CSS50) if (pathId == PATH_ID_CSS50)
{ {
auto dataPath = _env->GetDirectoryPath(DIRBASE::RCT1, DIRID::DATA); if (!(_env->GetDirectoryPath(DIRBASE::RCT1).empty()))
result = Path::Combine(dataPath, "css17.dat"); {
auto dataPath = _env->GetDirectoryPath(DIRBASE::RCT1, DIRID::DATA);
result = Path::Combine(dataPath, "css17.dat");
}
else
{
auto dataPath = _env->GetDirectoryPath(DIRBASE::RCT2, DIRID::DATA);
result = Path::Combine(dataPath, "css50.dat");
}
} }
else if (pathId >= 0 && pathId < PATH_ID_END) else if (pathId >= 0 && pathId < PATH_ID_END)
{ {