flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 00:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #17 Udjust to model string changes in xplanemp2

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-05-30 15:42:08 +01:00
parent cdd95a3a0b
commit 5548d8af2d
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
View File

@@ -158,8 +158,8 @@ namespace BlackMisc
{
QString modelName =
dirNames.join(' ') %
u' ' % objectName %
u' ' % textureName;
u' ' % objectName;
if (objectVersion == OBJ7) { modelName += u' ' % textureName; }
return std::move(modelName).trimmed();
}
@@ -514,6 +514,9 @@ namespace BlackMisc
return false;
}
}
package.planes.back().objectName = tokens[1];
package.planes.back().objectVersion = CSLPlane::OBJ8;
return true;
}
@@ -547,17 +550,8 @@ namespace BlackMisc
// Remove the last one being the obj itself
dirNames.removeLast();
QFileInfo fileInfo(fullPath);
if (! fileInfo.exists())
{
const CStatusMessage m = CStatusMessage(this).error(u"XPlane object '%1' does not exist.") << fullPath;
m_loadingMessages.push_back(m);
return false;
}
package.planes.back().dirNames = dirNames;
package.planes.back().objectName = fileInfo.completeBaseName();
package.planes.back().filePath = fullPath;
package.planes.back().objectVersion = CSLPlane::OBJ8;
if (tokens.size() >= 5)
{