diff options
Diffstat (limited to 'src/GameTick.cpp')
| -rw-r--r-- | src/GameTick.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/GameTick.cpp b/src/GameTick.cpp index bdba3b6..634db76 100644 --- a/src/GameTick.cpp +++ b/src/GameTick.cpp @@ -1154,7 +1154,7 @@ void Game::Tick() && j != 1 && blocksimple.LineCheck2(person[i].playercoords, person[i].pathtarget, &blah, move, cityrotation[person[i].whichblockx][person[i].whichblocky]) == -1 && blocksimple.LineCheck2(person[i].playercoords, person[i].pathtarget, &blah, move, cityrotation[l][m]) == -1) { person[i].lastdistancevictim = sqrlen(person[i].pathtarget - person[person[i].killtarget].playercoords); - leastdistance - sqrlen(person[i].playercoords - person[i].pathtarget); + leastdistance = sqrlen(person[i].playercoords - person[i].pathtarget); closesttarget=j; finaltarget=person[i].pathtarget; person[i].whichblockx=l; @@ -2291,7 +2291,8 @@ void Game::Tick() if (sprites.type[i] == grenadesprite && sqrlen(sprites.velocity[i]) > 20) { for (int j = 0; j < numpeople; ++j) { - if (j == 0 && sprites.brightness[i] > 0.9f || !person[j].existing) + if ((j == 0 && sprites.brightness[i] > 0.9f) + || !person[j].existing) continue; auto hitstruct = person[j].BulletCollideWithPlayer(j, sprites.oldlocation[i], sprites.location[i]); if (!hitstruct.collision) @@ -2359,7 +2360,7 @@ void Game::Tick() // Explode if (sprites.type[i] == grenadesprite - && (sprites.brightness[i] <= 0 || impact && sprites.size[i] > 1)) { + && (sprites.brightness[i] <= 0 || (impact && sprites.size[i] > 1))) { sprites.brightness[i] = 0; sprites.MakeSprite(smokesprite, 1, 1, 1, 1, sprites.location[i], facing*0, 60); sprites.MakeSprite(muzzleflashsprite, 1, 1, 1, 1, sprites.location[i], facing*0, 9); |