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

Implemented the new g3d spec

Browse Source
This commit is contained in:
mathusummut
2018-06-28 21:36:10 +02:00
parent 90556c870e
commit b1760253fd
24 changed files with 225 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,9 +218,9 @@ namespace Shared {
double getTimeDuationMinutes(int frames, int updateFps) {
int framesleft = frames;
double hours = (int) ((int) frames / (float) updateFps / 3600.0f);
framesleft = framesleft - hours * 3600 * updateFps;
framesleft = (int) (framesleft - hours * 3600 * updateFps);
double minutes = (int) ((int) framesleft / (float) updateFps / 60.0f);
framesleft = framesleft - minutes * 60 * updateFps;
framesleft = (int) (framesleft - minutes * 60 * updateFps);
double seconds = (int) ((int) framesleft / (float) updateFps);
double result = (hours * 60.0) + minutes;

8
source/shared_lib/sources/util/properties.cpp
View File

@@ -514,8 +514,8 @@ namespace Shared {
//printf("In [%s::%s - %d]defaultValueIfNotFound = [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,defaultValueIfNotFound);
return string(defaultValueIfNotFound);
} else {
//throw megaglest_runtime_error("Value not found in propertyMap: " + key + ", loaded from: " + path);
throw runtime_error("Value not found in propertyMap: " + key + ", loaded from: " + path);
//throw runtime_error("Value not found in propertyMap: " + key + ", loaded from: " + path);
return string();
}
} else {
return (it->second != "" ? it->second : (defaultValueIfNotFound != NULL ? defaultValueIfNotFound : it->second));
@@ -618,8 +618,8 @@ namespace Shared {
//printf("In [%s::%s - %d]defaultValueIfNotFound = [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,defaultValueIfNotFound);
return string(defaultValueIfNotFound);
} else {
//throw megaglest_runtime_error("Value not found in propertyMap: " + string(key) + ", loaded from: " + path);
throw runtime_error("Value not found in propertyMap: " + string(key) + ", loaded from: " + path);
//throw runtime_error("Value not found in propertyMap: " + string(key) + ", loaded from: " + path);
return string();
}
} else {
return (it->second != "" ? it->second : (defaultValueIfNotFound != NULL ? defaultValueIfNotFound : it->second));