actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Commify handles negative numbers now.

Browse Source
This commit is contained in:
Kyzentun
2015-04-02 18:02:38 -06:00
parent d789ef7c6b
commit 2f1a348565
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageUtil.cpp
+9 -2
View File
@@ -334,13 +334,20 @@ RString Commify( int iNum )
RString Commify(const RString& num, const RString& sep, const RString& dot) RString Commify(const RString& num, const RString& sep, const RString& dot)
{ {
size_t num_start= 0;
size_t num_end= num.size(); size_t num_end= num.size();
size_t dot_pos= num.find(dot); size_t dot_pos= num.find(dot);
size_t dash_pos= num.find('-');
if(dot_pos != string::npos) if(dot_pos != string::npos)
{ {
num_end= dot_pos; num_end= dot_pos;
} }
size_t commies= (num_end / 3) - (!(num_end % 3)); if(dash_pos != string::npos)
{
num_start= dash_pos + 1;
}
size_t num_size= num_end - num_start;
size_t commies= (num_size / 3) - (!(num_size % 3));
if(commies < 1) if(commies < 1)
{ {
return num; return num;
@@ -349,7 +356,7 @@ RString Commify(const RString& num, const RString& sep, const RString& dot)
RString ret; RString ret;
ret.resize(commified_len); ret.resize(commified_len);
size_t dest= 0; size_t dest= 0;
size_t next_comma= (num_end % 3) + (3 * (!(num_end % 3))); size_t next_comma= (num_size % 3) + (3 * (!(num_size % 3))) + num_start;
for(size_t c= 0; c < num.size(); ++c) for(size_t c= 0; c < num.size(); ++c)
{ {
if(c == next_comma && c < num_end) if(c == next_comma && c < num_end)