aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/fullpipe/motion.cpp8
-rw-r--r--engines/fullpipe/motion.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 978ef3ac48..20b710d7df 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -188,8 +188,8 @@ MessageQueue *MctlCompound::doWalkTo(StaticANIObject *subj, int xpos, int ypos,
MctlLadder::MctlLadder() {
_ladder_field_18 = 0;
_objId = 0;
- _ladder_field_1C = 0;
- _ladder_field_10 = 0;
+ _height = 0;
+ _ladderY = 0;
_ladder_field_14 = 0;
_ladder_field_20 = 0;
@@ -206,12 +206,12 @@ int MctlLadder::collisionDetection(StaticANIObject *man) {
double delta;
- if ((double)(man->_oy - _ladder_field_10) / (double)_ladder_field_1C < 0.0)
+ if ((double)(man->_oy - _ladderY) / (double)_height < 0.0)
delta = -0.5;
else
delta = 0.5;
- int res = (int)((double)(man->_oy - _ladder_field_10) / (double)_ladder_field_1C + delta);
+ int res = (int)((double)(man->_oy - _ladderY) / (double)_height + delta);
if (res < 0)
return 0;
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 5988b71d15..5842b296da 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -180,10 +180,10 @@ struct MctlLadderMovement {
class MctlLadder : public MotionController {
public:
int _objId;
- int _ladder_field_10;
+ int _ladderY;
int _ladder_field_14;
int _ladder_field_18;
- int _ladder_field_1C;
+ int _height;
int _ladder_field_20;
int _ladder_field_24;
Common::List<MctlLadderMovement *> _movements;