Merge remote-tracking branch 'origin/main' into 26-04-04-config

This commit is contained in:
PJB3005
2026-04-05 00:12:17 +02:00
50 changed files with 1094 additions and 364 deletions
+3 -5
View File
@@ -54,8 +54,6 @@
#include "res/Object/Alink.h"
#include <cstring>
#include "dusk/settings.hpp"
static int daAlink_Create(fopAc_ac_c* i_this);
static int daAlink_Delete(daAlink_c* i_this);
static int daAlink_Execute(daAlink_c* i_this);
@@ -7512,7 +7510,7 @@ void daAlink_c::setBlendMoveAnime(f32 i_morf) {
BOOL sp24 = checkEventRun();
BOOL sp20 = checkBootsMoveAnime(1);
#if TARGET_PC
if (dusk::settings::enhancements::FastIronBoots.getValue()) {
if (dusk::settings::game::enableFastIronBoots) {
sp20 = FALSE;
}
#endif
@@ -9477,7 +9475,7 @@ void daAlink_c::setStickData() {
mHeavySpeedMultiplier = mpHIO->mItem.mIronBoots.m.mInputFactor;
}
#if TARGET_PC
if (dusk::settings::enhancements::FastIronBoots.getValue()) {
if (dusk::settings::game::enableFastIronBoots) {
mHeavySpeedMultiplier = 1.0f;
}
#endif
@@ -9489,7 +9487,7 @@ void daAlink_c::setStickData() {
mHeavySpeedMultiplier = mpHIO->mItem.mIronBoots.m.mWaterInputFactor;
}
#if TARGET_PC
if (dusk::settings::enhancements::FastIronBoots.getValue()) {
if (dusk::settings::game::enableFastIronBoots) {
mHeavySpeedMultiplier = 1.0f;
}
#endif