mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Bad path parsing for multiple search paths for palette in command line programs.
This commit is contained in:
mfeemster 2016-02-09 15:53:55 -08:00
parent f10e4e610a
commit a345e2d5e1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/EmberCommon/EmberCommon.h
View File

@ -39,7 +39,7 @@ public:
if (stage == 0 || stage == 1) if (stage == 0 || stage == 1)
{ {
if (m_LastStage != stage) if (m_LastStage != stage)
cout << endl; cout << "\n";
cout << "\r" << string(m_S.length() * 2, ' ');//Clear what was previously here, * 2 just to be safe because the end parts of previous strings might be longer. cout << "\r" << string(m_S.length() * 2, ' ');//Clear what was previously here, * 2 just to be safe because the end parts of previous strings might be longer.
m_SS.str("");//Begin new output. m_SS.str("");//Begin new output.
@ -88,13 +88,13 @@ static bool ParseEmberFile(XmlToEmber<T>& parser, const string& filename, vector
{ {
if (!parser.Parse(filename.c_str(), embers, useDefaults)) if (!parser.Parse(filename.c_str(), embers, useDefaults))
{ {
cout << "Error parsing flame file " << filename << ", returning without executing." << endl; cout << "Error parsing flame file " << filename << ", returning without executing.\n";
return false; return false;
} }
if (embers.empty()) if (embers.empty())
{ {
cout << "Error: No data present in file " << filename << ". Aborting." << endl; cout << "Error: No data present in file " << filename << ". Aborting.\n";
return false; return false;
} }
@ -114,11 +114,11 @@ static bool InitPaletteList(const string& filename)
PaletteList<T> paletteList;//Even though this is local, the members are static so they will remain. PaletteList<T> paletteList;//Even though this is local, the members are static so they will remain.
static vector<string> paths = static vector<string> paths =
{ {
"./" "./",
#ifndef WIN32 #ifndef WIN32
"~/.fractorium" "~/.fractorium",
"~/.config/fractorium" "~/.config/fractorium",
"/usr/share/fractorium" "/usr/share/fractorium",
"/usr/local/share/fractorium" "/usr/local/share/fractorium"
#endif #endif
}; };
@ -130,8 +130,8 @@ static bool InitPaletteList(const string& filename)
if (!added || !paletteList.Size()) if (!added || !paletteList.Size())
{ {
cout << "Error parsing palette file " << filename << ". Reason: " << endl; cout << "Error parsing palette file " << filename << ". Reason: \n";
cout << paletteList.ErrorReportString() << endl << "Returning without executing." << endl; cout << paletteList.ErrorReportString() << "\nReturning without executing.\n";
return false; return false;
} }
@ -526,4 +526,4 @@ static size_t VerifyStrips(size_t height, size_t strips,
/// <summary> /// <summary>
/// Simple macro to print a string if the --verbose options has been specified. /// Simple macro to print a string if the --verbose options has been specified.
/// </summary> /// </summary>
#define VerbosePrint(s) if (opt.Verbose()) cout << s << endl #define VerbosePrint(s) if (opt.Verbose()) cout << s << "\n"