mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-13 11:54:00 +02:00
Code Issues Projects Releases Wiki Activity

- msvc compiler warning cleanup

Browse Source
This commit is contained in:
SoftCoder
2013-12-22 23:58:12 -08:00
parent bcaad53fbe
commit e0c2a388d4
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/shared_lib/sources/util/conversion.cpp
View File

@@ -217,11 +217,11 @@ string formatNumber(uint64 f) {
string getTimeDuationString(int frames, int updateFps) {
int framesleft = frames;
int hours = (int) frames / (float)updateFps / 3600.0;
int hours = (int)((int) frames / (float)updateFps / 3600.0f);
framesleft = framesleft - hours * 3600 * updateFps;
int minutes = (int) framesleft / (float)updateFps / 60.0;
int minutes = (int)((int) framesleft / (float)updateFps / 60.0f);
framesleft = framesleft - minutes * 60 * updateFps;
int seconds = (int) framesleft / (float)updateFps;
int seconds = (int)((int) framesleft / (float)updateFps);
//framesleft=framesleft-seconds*GameConstants::updateFps;
string hourstr = intToStr(hours);

2
source/shared_lib/sources/util/string_utils.cpp
View File

@@ -88,7 +88,7 @@ namespace Shared { namespace Util {
char* ConvertToUTF8(const char* s) {
if (NULL != s && *s != '\0')
return ConvertToUTF8(s, strlen(s));
return ConvertToUTF8(s, (Shared::Platform::uint32)strlen(s));
char* ret = new char[1];
//LOG_ASSERT(NULL != ret);
assert(NULL != ret);