From ed6f169d97bf819154fc6b209ebc49e737fa06db Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Mon, 23 May 2016 09:51:50 -0700 Subject: [PATCH] - attempt to see if this helps deal with oos when fog of war off --- data/glest_game | 2 +- source/glest_game/ai/ai.cpp | 3 ++- source/shared_lib/sources/graphics/pixmap.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/glest_game b/data/glest_game index 7a96907c..a1e6be21 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 7a96907c89f5db8317b8e090737b404acdfc876e +Subproject commit a1e6be21823b1c597129e3c81f4301177c32fba7 diff --git a/source/glest_game/ai/ai.cpp b/source/glest_game/ai/ai.cpp index 8682c4d2..21b5937d 100644 --- a/source/glest_game/ai/ai.cpp +++ b/source/glest_game/ai/ai.cpp @@ -451,7 +451,8 @@ float Ai::getRatioOfClass(UnitClass uc,UnitClass *additionalUnitClassToExcludeFr return 0; } else { - return static_cast(getCountOfClass(uc,additionalUnitClassToExcludeFromCount)) / aiInterface->getMyUnitCount(); + //return static_cast(getCountOfClass(uc,additionalUnitClassToExcludeFromCount)) / aiInterface->getMyUnitCount(); + return truncateDecimal(static_cast(getCountOfClass(uc,additionalUnitClassToExcludeFromCount)) / aiInterface->getMyUnitCount(),6); } } diff --git a/source/shared_lib/sources/graphics/pixmap.cpp b/source/shared_lib/sources/graphics/pixmap.cpp index bf64573a..3df59cd3 100644 --- a/source/shared_lib/sources/graphics/pixmap.cpp +++ b/source/shared_lib/sources/graphics/pixmap.cpp @@ -1145,7 +1145,8 @@ float Pixmap2D::getPixelf(int x, int y) const { snprintf(szBuf,8096,"Invalid pixmap index: " MG_SIZE_T_SPECIFIER " for [%s], h = %d, w = %d, components = %d x = %d y = %d\n",index,path.c_str(),h,w,components,x,y); throw megaglest_runtime_error(szBuf); } - return pixels[index] / 255.f; + float result = pixels[index] / 255.f; + return truncateDecimal(result,6); } float Pixmap2D::getComponentf(int x, int y, int component) const {