diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-01-10 15:26:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-10 15:26:36 -0500 |
commit | 9f974ea8189c255ff3ab8fcad6ae310a5e50d296 (patch) | |
tree | 865bd949208a7dad04a4eb45e9f353588df589d6 /src/input_common/drivers/tas_input.cpp | |
parent | fda0e7e9899e1a023f3dea76079ffa9cce0e5d89 (diff) | |
parent | 115bf204484d5ac058e7edaf5139974b22aa6f7e (diff) |
Merge pull request #9565 from MonsterDruide1/tas-multiplayer-lengths
TAS: Show all script lengths for multiplayer
Diffstat (limited to 'src/input_common/drivers/tas_input.cpp')
-rw-r--r-- | src/input_common/drivers/tas_input.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/input_common/drivers/tas_input.cpp b/src/input_common/drivers/tas_input.cpp index f3ade90da..f3cb14c56 100644 --- a/src/input_common/drivers/tas_input.cpp +++ b/src/input_common/drivers/tas_input.cpp @@ -156,10 +156,12 @@ void Tas::RecordInput(u64 buttons, TasAnalog left_axis, TasAnalog right_axis) { }; } -std::tuple<TasState, size_t, size_t> Tas::GetStatus() const { +std::tuple<TasState, size_t, std::array<size_t, PLAYER_NUMBER>> Tas::GetStatus() const { TasState state; + std::array<size_t, PLAYER_NUMBER> lengths{0}; if (is_recording) { - return {TasState::Recording, 0, record_commands.size()}; + lengths[0] = record_commands.size(); + return {TasState::Recording, record_commands.size(), lengths}; } if (is_running) { @@ -168,7 +170,11 @@ std::tuple<TasState, size_t, size_t> Tas::GetStatus() const { state = TasState::Stopped; } - return {state, current_command, script_length}; + for (size_t i = 0; i < PLAYER_NUMBER; i++) { + lengths[i] = commands[i].size(); + } + + return {state, current_command, lengths}; } void Tas::UpdateThread() { |