Skip to content

Commit c22a891

Browse files
committed
refactor: Update for latest MK7-Memory changes
1 parent 8663743 commit c22a891

8 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/base/features/item/item_rain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace base
3434
auto const item = *std::next(item_rain.items.begin(), utils::random_u32(item_rain.items.size()));
3535

3636
// Generate a random position
37-
auto const speed_offset = item_rain.speed.enabled ? (unit->m_vehicle->m_up * unit->m_vehicle->m_forward_speed * item_rain.speed.value) : sead::Vector3f::zero;
37+
auto const speed_offset = item_rain.speed.enabled ? (unit->m_vehicle->m_angle->m_up * unit->m_vehicle->m_forward_speed * item_rain.speed.value) : sead::Vector3f::zero;
3838
auto const width_offset = [item_rain]()
3939
{
4040
switch (item_rain.shape)

src/base/features/item/item_usage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ namespace base
5151
status_flags.accident_1 = false;
5252

5353
if (item_usage.toggles.at(type::Recover))
54-
status_flags.jugem_recover = status_flags.jugem_recover_ai = status_flags.battle_restart = false;
54+
status_flags.jugem_recover = status_flags.jugem_recover_ai_oob = status_flags.battle_restart = false;
5555

5656
if (item_usage.toggles.at(type::Vanish))
5757
status_flags.vanish_start = false;

src/base/features/kart/future_fly.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ namespace base
2828

2929
// Allow pitch rotation
3030
auto const pitch = veh->m_cpad_y * future_fly.pitch_limit;
31-
veh->m_front_pitch = sead::Vector3f{ pitch * veh->m_up.x, future_fly.pitch_keep ? pitch * veh->m_up.y : veh->m_front_pitch.y, pitch * veh->m_up.z };
31+
veh->m_front_pitch = sead::Vector3f{ pitch * veh->m_angle->m_up.x, future_fly.pitch_keep ? pitch * veh->m_angle->m_up.y : veh->m_front_pitch.y, pitch * veh->m_angle->m_up.z };
3232

3333
// Allow movement
3434
if (veh->m_controls.accelerate_forwards || veh->m_controls.accelerate_backwards)
35-
*veh->m_position += veh->m_up * (!veh->m_controls.accelerate_backwards ? future_fly.speed_forward : -future_fly.speed_backward);
35+
*veh->m_position += veh->m_angle->m_up * (!veh->m_controls.accelerate_backwards ? future_fly.speed_forward : -future_fly.speed_backward);
3636
}
3737
}
3838
}

src/base/features/network/disable_killer_lag.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace base
99
void features::network::disable_killer_lag(Kart::NetData *_this)
1010
{
1111
if (g_menu->m_disable_killer_lag_entry->IsActivated())
12-
if (_this->status_flags.killer)
13-
_this->status_flags.jugem_recover = true;
12+
if (_this->m_status_flags.killer)
13+
_this->m_status_flags.jugem_recover = true;
1414
}
1515
}

src/base/features/network/invisibility.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ namespace base
2020
switch (invisibility.mode)
2121
{
2222
case decltype(invisibility.mode)::Position:
23-
_this->position = sead::Vector3<s16>(MAX, MAX, MAX);
24-
_this->velocity = _this->angular_velocity = sead::Vector3<s16>(0, 0, 0);
25-
_this->turning_speed = _this->forward_speed = _this->drift_steering = _this->directional_speed = 0;
23+
_this->m_position = sead::Vector3<s16>(MAX, MAX, MAX);
24+
_this->m_velocity = _this->m_angular_velocity = sead::Vector3<s16>(0, 0, 0);
25+
_this->m_turning_speed = _this->m_forward_speed = _this->m_drift_steering = _this->m_directional_speed = 0;
2626
break;
2727
case decltype(invisibility.mode)::Velocity:
28-
_this->velocity = sead::Vector3<s16>(0, MAX, 0);
28+
_this->m_velocity = sead::Vector3<s16>(0, MAX, 0);
2929
break;
3030
}
3131
}

src/base/features/network/kart_warp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ namespace base
99
void features::network::kart_warp(Kart::NetData *_this)
1010
{
1111
if (g_menu->m_kart_warp_entry->IsActivated())
12-
_this->kart_data.warp ^= true;
12+
_this->m_kart_data.warp ^= true;
1313
}
1414
}

src/base/features/network/protections.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ namespace base
5050
{
5151
auto const &protections = g_settings.m_options.network.protections;
5252

53-
if (protections.kart.accident_type && _this->accident_type >= Kart::VehicleReact::EAcdType::MAX)
53+
if (protections.kart.accident_type && _this->m_accident_type >= Kart::VehicleReact::EAcdType::MAX)
5454
return true;
5555

56-
if (protections.kart.respawn_point && _this->respawn_point >= Field::GetJugemPointAccessor()->m_entries.size())
56+
if (protections.kart.respawn_point && _this->m_respawn_point_id >= Field::GetJugemPointAccessor()->m_entries.size())
5757
return true;
5858
}
5959

vendor/mk7-memory

0 commit comments

Comments
 (0)