From 20e4f3c1200f56de05323502e5028686e40e5423 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 9 Aug 2021 22:24:20 -0500 Subject: [PATCH] wrap to remove ambiguity --- Engine/source/forest/forest.cpp | 2 +- Engine/source/ts/tsShapeConstruct.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/forest/forest.cpp b/Engine/source/forest/forest.cpp index ce4a4186c..2a7c7329a 100644 --- a/Engine/source/forest/forest.cpp +++ b/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 (basePath.isEmpty()) - basePath = levelAsset->getLevelPath(); + basePath = (Torque::Path)(levelAsset->getLevelPath()); String fileName = Torque::FS::MakeUniquePath( basePath.getPath(), basePath.getFileName(), "forest" ); mDataFileName = StringTable->insert( fileName.c_str() ); diff --git a/Engine/source/ts/tsShapeConstruct.cpp b/Engine/source/ts/tsShapeConstruct.cpp index 232f21895..4fcc54ba2 100644 --- a/Engine/source/ts/tsShapeConstruct.cpp +++ b/Engine/source/ts/tsShapeConstruct.cpp @@ -417,7 +417,7 @@ TSShapeConstructor* TSShapeConstructor::findShapeConstructorByFilename(const Fil for (S32 i = 0; i < group->size(); i++) { TSShapeConstructor* tss = dynamic_cast(group->at(i)); - FileName shapePath = tss->getShapePath(); + FileName shapePath = (FileName)(tss->getShapePath()); char buf[1024]; FileName fullShapePath = String(Platform::makeFullPathName(shapePath, buf, sizeof(buf)));