Merge pull request #433 from shinra-electric/silence-warning-1
Silence warnings: Change a logical || to a bitwise |
This commit is contained in:
commit
b2680af967
1 changed files with 1 additions and 1 deletions
|
@ -237,7 +237,7 @@ void SelectFixed(const Vec2i <Pos, const Vec2i &rbPos, std::vector<CUnit *> &u
|
||||||
Assert(Map.Info.IsPointOnMap(rbPos));
|
Assert(Map.Info.IsPointOnMap(rbPos));
|
||||||
Assert(units.empty());
|
Assert(units.empty());
|
||||||
units.reserve(selectMax << 1);
|
units.reserve(selectMax << 1);
|
||||||
int max = selectMax || INT_MAX;
|
int max = selectMax ? selectMax : INT_MAX;
|
||||||
|
|
||||||
for (Vec2i posIt = ltPos; posIt.y != rbPos.y + 1; ++posIt.y) {
|
for (Vec2i posIt = ltPos; posIt.y != rbPos.y + 1; ++posIt.y) {
|
||||||
for (posIt.x = ltPos.x; posIt.x != rbPos.x + 1; ++posIt.x) {
|
for (posIt.x = ltPos.x; posIt.x != rbPos.x + 1; ++posIt.x) {
|
||||||
|
|
Loading…
Reference in a new issue