MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make fortplan use Filesystem::getcwd()

develop
lethosor 2015-01-05 17:37:41 -05:00
parent d932c76242
commit cd64fb84b7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/fortplan.cpp
Unescape Escape View File

@ -1,6 +1,7 @@
#include "buildingplan-lib.h" #include "buildingplan-lib.h"
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include "modules/Filesystem.h"
DFHACK_PLUGIN("fortplan"); DFHACK_PLUGIN("fortplan");
#define PLUGIN_VERSION 0.15 #define PLUGIN_VERSION 0.15
@ -113,11 +114,6 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
return CR_OK; return CR_OK;
} }
std::string get_working_path()
{
char temp[MAXPATHLEN];
return ( getcwd(temp, MAXPATHLEN) ? std::string( temp ) : std::string("") );
}
std::vector<std::vector<std::string>> tokenizeFile(std::string filename) { std::vector<std::vector<std::string>> tokenizeFile(std::string filename) {
std::ifstream infile(filename.c_str()); std::ifstream infile(filename.c_str());
@ -164,7 +160,7 @@ command_result fortplan(color_ostream &out, vector<string> & params) {
DFHack::Gui::getCursorCoords(startCursor.x, startCursor.y, startCursor.z); DFHack::Gui::getCursorCoords(startCursor.x, startCursor.y, startCursor.z);
userCursor = startCursor; userCursor = startCursor;
std::string cwd = get_working_path(); std::string cwd = Filesystem::getcwd();
std::string filename = cwd+"/"+params[0]; std::string filename = cwd+"/"+params[0];
con.print("Loading file '%s'...\n",filename.c_str()); con.print("Loading file '%s'...\n",filename.c_str());
try { try {
@ -376,4 +372,4 @@ command_result fortplan(color_ostream &out, vector<string> & params) {
} }
return CR_OK; return CR_OK;
} }