mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-02 18:36:48 +02:00
Code Issues Projects Releases Wiki Activity

- cleaned up more compiler warnings

Browse Source 
- added unsigned 64 bit type for windows
This commit is contained in:
Mark Vejvoda
2010-10-21 15:55:12 +00:00
parent c6a4e53151
commit 45a26a4597
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_map_editor/map.cpp
View File

@@ -142,8 +142,8 @@ void Map::pirateChangeHeight(int x, int y, int height, int radius) {
// round off the corners
int ti, tj;
if (abs(i - x) == abs(j - y)) {
ti = (i - x) * 0.707 + x + 0.5;
tj = (j - y) * 0.707 + y + 0.5;
ti = (int)((i - x) * 0.707 + x + 0.5);
tj = (int)((j - y) * 0.707 + y + 0.5);
} else {
ti = i;
tj = j;
@@ -154,7 +154,7 @@ void Map::pirateChangeHeight(int x, int y, int height, int radius) {
//gradient[indexI][indexJ] = 0;
} else {
// assume outside the map bounds is height 10
gradient[indexI][indexJ] = (10.0 - goalAlt) / radius;
gradient[indexI][indexJ] = (10.0f - (float)goalAlt) / (float)radius;
}
//std::cout << "gradient[" << indexI << "][" << indexJ << "] = " << gradient[indexI][indexJ] << std::endl;
//std::cout << "derived from height " << cells[ti][tj].height << " at " << ti << " " << tj << std::endl;