mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-26 23:49:03 +02:00
Code Issues Projects Releases Wiki Activity

- bugfixes for loading XML and not dropping newlines

Browse Source 
- started work on trying to save lua state (global variables only)
This commit is contained in:
Mark Vejvoda
2012-03-15 20:48:27 +00:00
parent 5cd0a788d2
commit 510ee7dfff
4 changed files with 131 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/shared_lib/sources/xml/xml_parser.cpp
View File

@@ -272,9 +272,9 @@ XmlNode *XmlIoRapid::load(const string &path, std::map<string,string> mapTagRepl
try {
#if defined(WIN32) && !defined(__MINGW32__)
FILE *fp = _wfopen(utf8_decode(path).c_str(), L"rb");
ifstream xmlFile(fp);
ifstream xmlFile(fp,ios::binary);
#else
ifstream xmlFile(path.c_str());
ifstream xmlFile(path.c_str(),ios::binary);
#endif
if(xmlFile.is_open() == false) {
throw runtime_error("Can not open file: [" + path + "]");
@@ -282,10 +282,15 @@ XmlNode *XmlIoRapid::load(const string &path, std::map<string,string> mapTagRepl
// read file into input_xml
string inputXml = "";
string line = "";
while(getline(xmlFile,line)) {
inputXml += line;
}
const int bufsize = 32 * 1024;
char buff[bufsize]="";
while(xmlFile) {
xmlFile.read(buff,bufsize);
if(buff[0] != '\0') {
inputXml += buff;
}
}
// make a safe-to-modify copy of input_xml
// (you should never modify the contents of an std::string directly)
vector<char> buffer(inputXml.begin(), inputXml.end());
@@ -356,10 +361,10 @@ void XmlIoRapid::save(const string &path, const XmlNode *node){
// // xml_no_indent now contains non-indented XML
#if defined(WIN32) && !defined(__MINGW32__)
FILE *fp = _wfopen(utf8_decode(path).c_str(), L"wt");
FILE *fp = _wfopen(utf8_decode(path).c_str(), L"wb");
ofstream xmlFile(fp);
#else
ofstream xmlFile(path.c_str());
ofstream xmlFile(path.c_str(),ios::binary);
#endif
if(xmlFile.is_open() == false) {
throw runtime_error("Can not open file: [" + path + "]");