Minor changes here and there:

- Cosmetic changes
- 'Engrish fix'
- Initialization of some vars
- Remove some not needed includes
This commit is contained in:
Spp
2011-10-18 14:59:23 +02:00
parent b5e8a192b1
commit e3f8588a22
21 changed files with 142 additions and 143 deletions

View File

@@ -17,7 +17,6 @@
*/
#include "Util.h"
#include "utf8.h"
#ifdef USE_SFMT_FOR_RNG
#include "SFMT.h"
@@ -162,13 +161,13 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText, bool hoursOnly)
std::ostringstream ss;
if (days)
ss << days << (shortText ? "d " : " Day(s) ");
ss << days << (shortText ? "d" : " Day(s) ");
if (hours || hoursOnly)
ss << hours << (shortText ? "h " : " Hour(s) ");
ss << hours << (shortText ? "h" : " Hour(s) ");
if (!hoursOnly)
{
if (minutes)
ss << minutes << (shortText ? "m " : " Minute(s) ");
ss << minutes << (shortText ? "m" : " Minute(s) ");
if (secs || (!days && !hours && !minutes) )
ss << secs << (shortText ? "s" : " Second(s).");
}