TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wrap to remove ambiguity

Browse source
This commit is contained in:
AzaezelX 2021-08-09 22:24:20 -05:00
parent 1037b5d718
commit 20e4f3c120
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/forest/forest.cpp
View file

@ -348,7 +348,7 @@ void Forest::createNewFile()
//If we didn't already define a forestfile to work with, just base it off our filename //If we didn't already define a forestfile to work with, just base it off our filename
if (basePath.isEmpty()) if (basePath.isEmpty())
basePath = levelAsset->getLevelPath(); basePath = (Torque::Path)(levelAsset->getLevelPath());
String fileName = Torque::FS::MakeUniquePath( basePath.getPath(), basePath.getFileName(), "forest" ); String fileName = Torque::FS::MakeUniquePath( basePath.getPath(), basePath.getFileName(), "forest" );
mDataFileName = StringTable->insert( fileName.c_str() ); mDataFileName = StringTable->insert( fileName.c_str() );

2
Engine/source/ts/tsShapeConstruct.cpp
View file

@ -417,7 +417,7 @@ TSShapeConstructor* TSShapeConstructor::findShapeConstructorByFilename(const Fil
for (S32 i = 0; i < group->size(); i++) for (S32 i = 0; i < group->size(); i++)
{ {
TSShapeConstructor* tss = dynamic_cast<TSShapeConstructor*>(group->at(i)); TSShapeConstructor* tss = dynamic_cast<TSShapeConstructor*>(group->at(i));
FileName shapePath = tss->getShapePath(); FileName shapePath = (FileName)(tss->getShapePath());
char buf[1024]; char buf[1024];
FileName fullShapePath = String(Platform::makeFullPathName(shapePath, buf, sizeof(buf))); FileName fullShapePath = String(Platform::makeFullPathName(shapePath, buf, sizeof(buf)));