mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-12 11:24:04 +02:00
Code Issues Projects Releases Wiki Activity

don't use std::pow here

Browse Source
This commit is contained in:
jacob1
2017-07-29 11:26:53 -04:00
parent 2a829c2394
commit 8fe3ca0f5c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/GameSave.cpp
View File

@@ -2380,7 +2380,7 @@ void GameSave::ConvertBsonToJson(bson_iterator *iter, Json::Value *j, int depth)
(*j)["links"].append(bson_iterator_int(&arrayiter)); (*j)["links"].append(bson_iterator_int(&arrayiter));
} }
length2++; length2++;
if (length > (int)(40 / std::pow(depth+1, 2)) || length2 > 50) if (length > (int)(40 / ((depth+1) * (depth+1))) || length2 > 50)
break; break;
} }
} }
@@ -2446,7 +2446,7 @@ void GameSave::ConvertJsonToBson(bson *b, Json::Value j, int depth)
} }
if (!j[member][i].isObject()) if (!j[member][i].isObject())
continue; continue;
if (depth > 4 || length > (int)(40 / std::pow(depth+1, 2))) if (depth > 4 || length > (int)(40 / ((depth+1) * (depth+1))))
{ {
std::set<int> nestedSaveIDs = GetNestedSaveIDs(j[member][i]); std::set<int> nestedSaveIDs = GetNestedSaveIDs(j[member][i]);
saveIDs.insert(nestedSaveIDs.begin(), nestedSaveIDs.end()); saveIDs.insert(nestedSaveIDs.begin(), nestedSaveIDs.end());