diff options
author | Peter Kohaut | 2016-10-04 18:59:25 +0200 |
---|---|---|
committer | Peter Kohaut | 2016-10-04 18:59:25 +0200 |
commit | 5d1e1131dc48f65de2f7c00bef3989df8d0d809f (patch) | |
tree | 3e4c1a46b1c2dc846a9eeb13dc37f89ade93dc49 /engines/bladerunner/actor_walk.cpp | |
parent | 2b835eb14dd5974b89e860066140ee35243f1c9a (diff) | |
download | scummvm-rg350-5d1e1131dc48f65de2f7c00bef3989df8d0d809f.tar.gz scummvm-rg350-5d1e1131dc48f65de2f7c00bef3989df8d0d809f.tar.bz2 scummvm-rg350-5d1e1131dc48f65de2f7c00bef3989df8d0d809f.zip |
BLADERUNNER: code formatting
Diffstat (limited to 'engines/bladerunner/actor_walk.cpp')
-rw-r--r-- | engines/bladerunner/actor_walk.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/engines/bladerunner/actor_walk.cpp b/engines/bladerunner/actor_walk.cpp index 717422f60d..556f7b9afa 100644 --- a/engines/bladerunner/actor_walk.cpp +++ b/engines/bladerunner/actor_walk.cpp @@ -177,7 +177,6 @@ bool ActorWalk::isXYZEmpty(float x, float y, float z, int actorId) { } int ActorWalk::findU1(int actorId, const Vector3 &to, int dist, Vector3 *out) { - float cos, sin; bool inWalkbox; int facingFound = -1; @@ -190,10 +189,8 @@ int ActorWalk::findU1(int actorId, const Vector3 &to, int dist, Vector3 *out) { out->z = 0.0f; for (int facing = 0; facing < 1024; facing += 128) { - sin = sin_1024(facing); - cos = cos_1024(facing); - x = to.x + sin * dist; - z = to.z + cos * dist; + x = to.x + sin_1024(facing) * dist; + z = to.z + cos_1024(facing) * dist; float dist2 = distance(x, z, _vm->_actors[actorId]->getX(), _vm->_actors[actorId]->getZ()); if (distFound == -1.0f || distFound > dist2) { @@ -206,19 +203,15 @@ int ActorWalk::findU1(int actorId, const Vector3 &to, int dist, Vector3 *out) { int v24 = facingFound; int v25 = -1024; while (v25 < 0) { - sin = sin_1024(v24); - cos = cos_1024(v24); - x = to.x + sin * dist; - z = to.z + cos * dist; + x = to.x + sin_1024(v24) * dist; + z = to.z + cos_1024(v24) * dist; if (!_vm->_sceneObjects->existsOnXZ(actorId, x, z, true, true) && _vm->_scene->_set->findWalkbox(x, z) >= 0) { break; } - sin = sin_1024(v23); - cos = cos_1024(v23); - x = to.x + sin * dist; - z = to.z + cos * dist; + x = to.x + sin_1024(v23) * dist; + z = to.z + cos_1024(v23) * dist; if (!_vm->_sceneObjects->existsOnXZ(actorId, x, z, true, true) && _vm->_scene->_set->findWalkbox(x, z) >= 0) { break; |