diff --git a/ditchers/ditcher/src/settings.cpp b/ditchers/ditcher/src/settings.cpp index e714897..5535e2f 100644 --- a/ditchers/ditcher/src/settings.cpp +++ b/ditchers/ditcher/src/settings.cpp @@ -376,9 +376,9 @@ void Settings::readMaps(){ if ( !exists( dirs_path ) ) continue; for ( fs::directory_iterator itrs( dirs_path ); itrs != end_itr; ++itrs ) - if (is_directory(itrs->status()) && (itrs->path().leaf()[0] != '.') && (itrs->path().leaf()[0] != '_')){ + if (is_directory(itrs->status()) && ((itrs->path().leaf()).c_str()[0] != '.') && ((itrs->path().leaf()).c_str()[0] != '_')){ - string mname = itrs->path().leaf(); + string mname = (itrs->path().leaf()).c_str(); Map* map = new Map(mname, thesepath); maps.push_back(map); @@ -396,7 +396,7 @@ void Settings::readMaps(){ }else if (itr->path().leaf() == "map.xml"){ map->conffile = true; - TiXmlDocument doc(itr->path().file_string()); + TiXmlDocument doc(itr->path().string()); doc.LoadFile(); TiXmlElement* rootelem = doc.RootElement(); @@ -525,9 +525,9 @@ void Settings::readRobots(){ if ( !exists( dirs_path ) ) continue; for ( fs::directory_iterator itrs( dirs_path ); itrs != end_itr; ++itrs ) - if (is_directory(itrs->status()) && (itrs->path().leaf()[0] != '.') && (itrs->path().leaf()[0] != '_')){ + if (is_directory(itrs->status()) && ((itrs->path().leaf()).c_str()[0] != '.') && ((itrs->path().leaf()).c_str()[0] != '_')){ - string rname = itrs->path().leaf(); + string rname = (itrs->path().leaf()).c_str(); RobotType* robottype = new RobotType(rname, thesepath); robottype->unique = rname; robottype->name = rname; @@ -538,14 +538,14 @@ void Settings::readRobots(){ for ( fs::directory_iterator itr( dir_path ); itr != end_itr; ++itr ) if (!is_directory(itr->status())){ - string filename = itr->path().leaf(); + string filename = (itr->path().leaf()).c_str(); if (filename == "robot.png"){ imgfound = true; if (!robottype->imgs[robottype->wholePath()+"/robot.png"]) robottype->imgs[robottype->wholePath()+"/robot.png"] = new SDL_Surface*[ROTCOUNT]; }else if (filename == "robot.xml"){ - TiXmlDocument doc(itr->path().file_string()); + TiXmlDocument doc(itr->path().string()); doc.LoadFile(); TiXmlElement* rootelem = doc.RootElement(); for (TiXmlAttribute* attr = rootelem->FirstAttribute(); attr; attr = attr->Next()){ @@ -669,9 +669,9 @@ void Settings::readAIs(){ if ( !exists( dirs_path ) ) continue; for ( fs::directory_iterator itrs( dirs_path ); itrs != end_itr; ++itrs ) - if (is_directory(itrs->status()) && (itrs->path().leaf()[0] != '.') && (itrs->path().leaf()[0] != '_')){ + if (is_directory(itrs->status()) && ((itrs->path().leaf()).c_str()[0] != '.') && ((itrs->path().leaf()).c_str()[0] != '_')){ - string aidir = itrs->path().leaf(); + string aidir = (itrs->path().leaf()).c_str(); AIType* aitype = new AIType(aidir, thesepath); fs::path dir_path(itrs->path());