@@ -28,28 +28,22 @@ void Gekko::SyncSystem::Init(u8 num_players, u32 input_size)
28
28
29
29
void Gekko::SyncSystem::AddLocalInput (Handle player, u8* input)
30
30
{
31
- // valid handles start from 1 while the input buffers index starts at 0.
32
- i32 plyr = player - 1 ;
33
-
34
31
// drop inputs from incorrect handles
35
- if (plyr >= _num_players || plyr < 0 ) {
32
+ if (player >= _num_players || player < 0 ) {
36
33
return ;
37
34
}
38
35
39
- _input_buffers[plyr ].AddLocalInput (_current_frame, input);
36
+ _input_buffers[player ].AddLocalInput (_current_frame, input);
40
37
}
41
38
42
39
void Gekko::SyncSystem::AddRemoteInput (Handle player, u8* input, Frame frame)
43
40
{
44
- // valid handles start from 1 while the input buffers index starts at 0.
45
- i32 plyr = player - 1 ;
46
-
47
41
// drop inputs from incorrect handles
48
- if (plyr >= _num_players || plyr < 0 ) {
42
+ if (player >= _num_players || player < 0 ) {
49
43
return ;
50
44
}
51
45
52
- _input_buffers[plyr ].AddInput (frame, input);
46
+ _input_buffers[player ].AddInput (frame, input);
53
47
}
54
48
55
49
void Gekko::SyncSystem::IncrementFrame ()
@@ -95,7 +89,7 @@ bool Gekko::SyncSystem::GetLocalInputs(std::vector<Handle>& handles, std::unique
95
89
inputs.reset ();
96
90
std::unique_ptr<u8[]> all_input (new u8[_input_size * handles.size ()]);
97
91
for (u8 i = 0 ; i < handles.size (); i++) {
98
- auto inp = _input_buffers[handles[i] - 1 ].GetInput (frame, true );
92
+ auto inp = _input_buffers[handles[i]].GetInput (frame, true );
99
93
100
94
if (inp->frame == GameInput::NULL_FRAME) {
101
95
return false ;
@@ -109,17 +103,17 @@ bool Gekko::SyncSystem::GetLocalInputs(std::vector<Handle>& handles, std::unique
109
103
110
104
void Gekko::SyncSystem::SetLocalDelay (Handle player, u8 delay)
111
105
{
112
- _input_buffers[player - 1 ].SetDelay (delay);
106
+ _input_buffers[player].SetDelay (delay);
113
107
}
114
108
115
109
u8 Gekko::SyncSystem::GetLocalDelay (Handle player)
116
110
{
117
- return _input_buffers[player - 1 ].GetDelay ();
111
+ return _input_buffers[player].GetDelay ();
118
112
}
119
113
120
114
void Gekko::SyncSystem::SetInputPredictionWindow (Handle player, u8 input_window)
121
115
{
122
- _input_buffers[player - 1 ].SetInputPredictionWindow (input_window);
116
+ _input_buffers[player].SetInputPredictionWindow (input_window);
123
117
}
124
118
125
119
Frame Gekko::SyncSystem::GetCurrentFrame ()
@@ -157,10 +151,8 @@ Frame Gekko::SyncSystem::GetMinReceivedFrame()
157
151
158
152
Frame Gekko::SyncSystem::GetLastReceivedFrom (Handle player)
159
153
{
160
- u32 plyr = player - 1 ;
161
-
162
- if (plyr >= 0 && plyr < _num_players) {
163
- return _input_buffers[plyr].GetLastReceivedFrame ();
154
+ if (player >= 0 && player < _num_players) {
155
+ return _input_buffers[player].GetLastReceivedFrame ();
164
156
}
165
157
166
158
return GameInput::NULL_FRAME;
0 commit comments