From baa3f5188649db6606fafc3dbbc035477d473cbb Mon Sep 17 00:00:00 2001 From: Jason Hooks Date: Wed, 28 Dec 2011 14:48:28 -0500 Subject: [PATCH] Trying to fix errors --- components/nif/data.hpp | 4 ++-- components/nifogre/ogre_nif_loader.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/nif/data.hpp b/components/nif/data.hpp index 898dd2283..892e98003 100644 --- a/components/nif/data.hpp +++ b/components/nif/data.hpp @@ -451,10 +451,10 @@ public: std::vector getInitialVertices(){ return initialVertices; } - std::vector> getRelevantData(){ + std::vector > getRelevantData(){ return relevantData; } - std::vector> getRelevantTimes(){ + std::vector > getRelevantTimes(){ return relevantTimes; } std::vector > getAdditionalVertices(){ diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp index 62074f2f9..a19f5df89 100644 --- a/components/nifogre/ogre_nif_loader.cpp +++ b/components/nifogre/ogre_nif_loader.cpp @@ -1006,7 +1006,7 @@ void NIFLoader::handleNode(Nif::Node *node, int flags, std::cout << "Outputting " << cut << "\n"; - std::ofstream File("Indices" + cut + ".txt"); + std::ofstream file(("Indices" + cut + ".txt").c_str()); /*if(File.is_open()) std::cout << "We could open\n"; @@ -1021,11 +1021,11 @@ void NIFLoader::handleNode(Nif::Node *node, int flags, replace(text.begin(), text.end(), '\n', '/'); text.erase(std::remove(text.begin(), text.end(), '\r'), text.end()); - File << "Time: " << textiter->time << "|" << text << "\n"; + file << "Time: " << textiter->time << "|" << text << "\n"; textmappings[text] = textiter->time; } - File.close(); + file.close(); } } @@ -1112,7 +1112,7 @@ void NIFLoader::handleNode(Nif::Node *node, int flags, } else if(nodename.length() >= triname.length()) { - std::transform(nodename.begin(), nodename.end(), nodename.begin(), std::tolower); + std::transform(nodename.begin(), nodename.end(), nodename.begin(), ::tolower); if(triname == nodename.substr(0, triname.length())) handleNiTriShape(dynamic_cast(node), flags, bounds, original, boneSequence); }