Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few new warnings. 

Closes #1999.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11208 4a71c877-e1ca-e34f-864e-861f7616d084
master
Christian Ohm 2010-07-15 02:39:42 +00:00 committed by Git SVN Gateway
parent e3b5c20533
commit dc9338a3b6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mapgrid.cpp
View File

@ -137,7 +137,7 @@ void gridStartIterateFiltered(int32_t x, int32_t y, uint32_t radius, PointTree::
struct ConditionTrue
{
bool test(BASE_OBJECT *obj) const
bool test(BASE_OBJECT *) const
{
return true;
}

6
src/random.cpp
View File

@ -42,17 +42,17 @@ void MersenneTwister::generate()
// Loop tripled, to avoid using %624 everywhere.
for (unsigned i = 0; i != 227; ++i)
{
int v = state[i]&0x80000000 | state[i + 1 ]&0x7FFFFFFF;
int v = (state[i]&0x80000000) | (state[i + 1 ]&0x7FFFFFFF);
state[i] = state[i + 397 ] ^ v>>1 ^ ((v&0x00000001)*0x9908B0DF);
}
for (unsigned i = 227; i != 623; ++i)
{
int v = state[i]&0x80000000 | state[i + 1 ]&0x7FFFFFFF;
int v = (state[i]&0x80000000) | (state[i + 1 ]&0x7FFFFFFF);
state[i] = state[i + 397 - 624] ^ v>>1 ^ ((v&0x00000001)*0x9908B0DF);
}
for (unsigned i = 623; i != 624; ++i) // Very short loop.
{
int v = state[i]&0x80000000 | state[i + 1 - 624]&0x7FFFFFFF;
int v = (state[i]&0x80000000) | (state[i + 1 - 624]&0x7FFFFFFF);
state[i] = state[i + 397 - 624] ^ v>>1 ^ ((v&0x00000001)*0x9908B0DF);
}
}