Explorar el Código

wrap to remove ambiguity

AzaezelX hace 4 años
padre
commit
20e4f3c120
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. 1 1
      Engine/source/forest/forest.cpp
  2. 1 1
      Engine/source/ts/tsShapeConstruct.cpp

+ 1 - 1
Engine/source/forest/forest.cpp

@@ -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() );

+ 1 - 1
Engine/source/ts/tsShapeConstruct.cpp

@@ -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)));