Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/dusk/action_bindings.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ enum class ActionBinds {
CALL_MIDNA,
OPEN_DUSKLIGHT_MENU,
TURBO_SPEED_BUTTON,
LOAD_LAST_STATE,
COUNT,
};

Expand Down
3 changes: 2 additions & 1 deletion include/dusk/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,13 @@ struct UserSettings {
ConfigVar<bool> enableAdvancedSettings;
} backend;

// Arrays of size 4 for 4 ports
// Arrays of size 5 for 4 ports
struct {
std::array<ActionBindConfigVar, 4> firstPersonCamera;
std::array<ActionBindConfigVar, 4> callMidna;
std::array<ActionBindConfigVar, 4> openDusklightMenu;
std::array<ActionBindConfigVar, 4> turboSpeedButton;
std::array<ActionBindConfigVar, 4> loadLastState;
} actionBindings;
};

Expand Down
1 change: 1 addition & 0 deletions src/dusk/action_bindings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ActionBindsMap& getActionBinds() {
{ActionBinds::CALL_MIDNA, {&getSettings().actionBindings.callMidna, "Call Midna"}},
{ActionBinds::OPEN_DUSKLIGHT_MENU, {&getSettings().actionBindings.openDusklightMenu, "Open Dusklight Menu"}},
{ActionBinds::TURBO_SPEED_BUTTON, {&getSettings().actionBindings.turboSpeedButton, "Turbo Speed Button"}},
{ActionBinds::LOAD_LAST_STATE, {&getSettings().actionBindings.loadLastState, "Load Last State"}},
};
return actionBinds;
}
Expand Down
19 changes: 19 additions & 0 deletions src/dusk/imgui/ImGuiStateShare.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include <zstd.h>
#include <dusk/autosave.h>

#include "dusk/action_bindings.h"

namespace dusk {

using json = nlohmann::json;
Expand Down Expand Up @@ -418,7 +420,24 @@ void ImGuiStateShare::draw(bool& open) {
ImGui::End();
}

void ImGuiStateShare::loadLastState() {
if (!m_loaded) {
loadStatesFile();
}
if (m_states.empty()) {
return;
}
const size_t lastIdx = m_states.size() - 1;
applyEncodedState(m_states[lastIdx].encoded, m_states[lastIdx].name);
}

void ImGuiMenuTools::ShowStateShare() {
if ((dusk::IsGameLaunched || !dusk::getTransientSettings().stateShareLoadActive) &&
!getSettings().game.speedrunMode
&& dusk::isActionBound(dusk::ActionBinds::LOAD_LAST_STATE, 0) &&
dusk::getActionBindTrig(dusk::ActionBinds::LOAD_LAST_STATE, 0)) {
m_stateShare.loadLastState();
}
if (!getSettings().backend.enableAdvancedSettings ||
!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F8, m_showStateShare))
{
Expand Down
1 change: 1 addition & 0 deletions src/dusk/imgui/ImGuiStateShare.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ struct SavedStateEntry {
class ImGuiStateShare {
public:
void draw(bool& open);
void loadLastState();

private:
std::string encodeCurrentState();
Expand Down
10 changes: 10 additions & 0 deletions src/dusk/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,12 @@ UserSettings g_userSettings = {
ActionBindConfigVar{"actionBindings.turboButton_port2", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.turboButton_port3", PAD_NATIVE_BUTTON_INVALID},
},
.loadLastState {
ActionBindConfigVar{"actionBindings.loadLastState_port0", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.loadLastState_port1", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.loadLastState_port2", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.loadLastState_port3", PAD_NATIVE_BUTTON_INVALID},
},
}
};

Expand Down Expand Up @@ -313,6 +319,10 @@ void registerSettings() {
Register(g_userSettings.actionBindings.turboSpeedButton[1]);
Register(g_userSettings.actionBindings.turboSpeedButton[2]);
Register(g_userSettings.actionBindings.turboSpeedButton[3]);
Register(g_userSettings.actionBindings.loadLastState[0]);
Register(g_userSettings.actionBindings.loadLastState[1]);
Register(g_userSettings.actionBindings.loadLastState[2]);
Register(g_userSettings.actionBindings.loadLastState[3]);
}

// Transient settings
Expand Down
Loading