summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-05-22 01:29:57 +0200
committerrobojumper <robojumper@gmail.com>2025-05-22 01:29:57 +0200
commitbed178f1e6fbba9ebb9eb23f182d920c3afbdaae (patch)
treedcc629b8edb0dad1e5a251bb6516a69ce6757f01 /src
parent93e5291422549a37ad8cb006ae8dd81f2dbee41a (diff)
Fx regswaps
Diffstat (limited to 'src')
-rw-r--r--src/d/d_player_mdl.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/d/d_player_mdl.cpp b/src/d/d_player_mdl.cpp
index e91aac8d..35aabf95 100644
--- a/src/d/d_player_mdl.cpp
+++ b/src/d/d_player_mdl.cpp
@@ -1804,6 +1804,7 @@ void daPlayerModelBase_c::setPosCopy3() {
poscopy3 = position;
poscopy3.y -= 100.0f;
} else if (checkActionFlags(FLG0_HANGING_LEDGE) || (getCurrentAction() >= 0x82 && getCurrentAction() <= 0x84)) {
+ // TODO this control flow is weird
const nw4r::math::MTX34 *c = mHeadMdl.getLocalMtx();
poscopy3.x = c->_03;
poscopy3.y = c->_13;
@@ -1827,8 +1828,10 @@ void daPlayerModelBase_c::setPosCopy3() {
}
f = mtx.m[1][3];
}
- poscopy3.set(v->x + position.x, v->y, v->z + position.z);
+ poscopy3.copyFrom(v);
+ poscopy3.x += position.x;
poscopy3.y += f;
+ poscopy3.z += position.z;
}
}