Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix 2a485c5e3b Wind computation - switch to signed integers.

Browse Source 
Silences a GCC 9 warning and the logic was faulty.

Reported by: elexis
Differential Revision: https://code.wildfiregames.com/D2180
This was SVN commit r22670.
This commit is contained in:
wraitii 2019-08-15 17:02:53 +00:00
parent e370c509a6
commit 43df94c246
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/renderer/WaterManager.cpp
View File

@ -1045,8 +1045,8 @@ void WaterManager::RecomputeWindStrength()
struct SWindPoint {
SWindPoint(size_t x, size_t y, float strength) : X(x), Y(y), windStrength(strength) {}
size_t X;
size_t Y;
ssize_t X;
ssize_t Y;
float windStrength;
};
@ -1128,7 +1128,7 @@ void WaterManager::RecomputeWindStrength()
point.X += movement[step].first;
point.Y += movement[step].second;
if (point.X < 0 || point.X >= m_MapSize || point.Y < 0 || point.Y >= m_MapSize)
if (point.X < 0 || point.X >= static_cast<ssize_t>(m_MapSize) || point.Y < 0 || point.Y >= static_cast<ssize_t>(m_MapSize))
{
onMap = false;
break;