Skip to content

Commit e287081

Browse files
committed
fix(VMover): fix MoverLerpType enum value mismatch
1 parent 215c6f8 commit e287081

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

include/zenkit/vobs/Trigger.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ namespace zenkit {
4444
};
4545

4646
enum class MoverLerpType : uint32_t {
47-
CURVE = 0,
48-
LINEAR = 1,
47+
LINEAR = 0,
48+
CURVE = 1,
4949

5050
// Deprecated entries.
5151
curve ZKREM("renamed to MoverLerpType::CURVE") = CURVE,

tests/TestVobsG1.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ TEST_SUITE("vobs") {
440440
CHECK_FALSE(vob.auto_link);
441441
CHECK_FALSE(vob.auto_rotate);
442442
CHECK_EQ(vob.speed, 0.00200023991f);
443-
CHECK_EQ(vob.lerp_mode, zenkit::MoverLerpType::CURVE);
443+
CHECK_EQ(vob.lerp_mode, zenkit::MoverLerpType::LINEAR);
444444
CHECK_EQ(vob.speed_mode, zenkit::MoverSpeedType::SLOW_START_END);
445445
CHECK_EQ(vob.keyframes, G1_MOVER_KEYFRAMES);
446446
CHECK_EQ(vob.sfx_open_start, "GATE_START");

tests/TestVobsG2.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ TEST_SUITE("vobs") {
545545
CHECK_FALSE(vob.auto_link);
546546
CHECK_FALSE(vob.auto_rotate);
547547
CHECK_EQ(vob.speed, 0.0500000007f);
548-
CHECK_EQ(vob.lerp_mode, zenkit::MoverLerpType::CURVE);
548+
CHECK_EQ(vob.lerp_mode, zenkit::MoverLerpType::LINEAR);
549549
CHECK_EQ(vob.speed_mode, zenkit::MoverSpeedType::SLOW_START_END);
550550
CHECK_EQ(vob.keyframes, G1_MOVER_KEYFRAMES);
551551
CHECK_EQ(vob.sfx_open_start, "GATE_START");

0 commit comments

Comments
 (0)