diff --git a/engines/myst3/movie.cpp b/engines/myst3/movie.cpp index ae913cadc52..0f310793fe3 100644 --- a/engines/myst3/movie.cpp +++ b/engines/myst3/movie.cpp @@ -202,8 +202,8 @@ void Movie::setEndFrame(int32 v) { _endFrame = adjustFrameForRate(v, true); } -void Movie::pause(bool pause) { - _bink.pauseVideo(pause); +void Movie::pause(bool p) { + _bink.pauseVideo(p); } Movie::~Movie() { diff --git a/engines/stark/resources/floor.cpp b/engines/stark/resources/floor.cpp index b7db3bd81e5..0e5cb99200a 100644 --- a/engines/stark/resources/floor.cpp +++ b/engines/stark/resources/floor.cpp @@ -287,8 +287,8 @@ bool FloorEdge::intersectsSegment(const Floor *floor, const Math::Line3d &segmen return edgeSement.intersectLine2d(segment, nullptr, false); } -void FloorEdge::enable(bool enable) { - _enabled = enable; +void FloorEdge::enable(bool e) { + _enabled = e; } bool FloorEdge::isEnabled() const { diff --git a/engines/stark/resources/floorface.cpp b/engines/stark/resources/floorface.cpp index 7f357201e54..2c7b93f9db4 100644 --- a/engines/stark/resources/floorface.cpp +++ b/engines/stark/resources/floorface.cpp @@ -174,9 +174,9 @@ bool FloorFace::hasVertices() const { return _indices[0] != 0 || _indices[1] != 0 || _indices[2] != 0; } -void FloorFace::enable(bool enable) { +void FloorFace::enable(bool e) { for (uint i = 0; i < _edges.size(); i++) { - _edges[i]->enable(enable); + _edges[i]->enable(e); } } diff --git a/math/ray.cpp b/math/ray.cpp index 9b05befa293..bff6ca51bda 100644 --- a/math/ray.cpp +++ b/math/ray.cpp @@ -29,9 +29,9 @@ namespace Math { Ray::Ray() { } -Ray::Ray(const Vector3d &origin, const Vector3d &direction) : +Ray::Ray(const Vector3d &origin, const Vector3d &dir) : _origin(origin), - _direction(direction) { + _direction(dir) { } void Ray::transform(const Matrix4 &matrix) {