Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-17 18:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed loading primitives from loose files.

Browse source
This commit is contained in:
leozide 2017-07-27 16:09:38 -07:00
parent b0afa61028
commit 68d9c28dc2
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/lc_library.cpp
View file

@ -647,6 +647,7 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir)
Src++;
Dst++;
}
*Dst = 0;
if (Dst - Name <= 4)
continue;
@ -1602,10 +1603,6 @@ bool lcPiecesLibrary::LoadPrimitive(lcLibraryPrimitive* Primitive)
}
else
{
char Name[LC_PIECE_NAME_LEN];
strcpy(Name, Primitive->mName);
strlwr(Name);
char FileName[LC_MAXPATH];
lcDiskFile PrimFile;
bool Found = false;
@ -1613,9 +1610,9 @@ bool lcPiecesLibrary::LoadPrimitive(lcLibraryPrimitive* Primitive)
if (mHasUnofficial)
{
if (Primitive->mSubFile)
sprintf(FileName, "unofficial/parts/%s.dat", Name);
sprintf(FileName, "unofficial/parts/%s", Primitive->mName);
else
sprintf(FileName, "unofficial/p/%s.dat", Name);
sprintf(FileName, "unofficial/p/%s", Primitive->mName);
PrimFile.SetFileName(mLibraryDir.absoluteFilePath(QLatin1String(FileName)));
Found = PrimFile.Open(QIODevice::ReadOnly);
}
@ -1623,9 +1620,9 @@ bool lcPiecesLibrary::LoadPrimitive(lcLibraryPrimitive* Primitive)
if (!Found)
{
if (Primitive->mSubFile)
sprintf(FileName, "parts/%s.dat", Name);
sprintf(FileName, "parts/%s", Primitive->mName);
else
sprintf(FileName, "p/%s.dat", Name);
sprintf(FileName, "p/%s", Primitive->mName);
PrimFile.SetFileName(mLibraryDir.absoluteFilePath(QLatin1String(FileName)));
Found = PrimFile.Open(QIODevice::ReadOnly);
}