ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Should fix netplay for bSNES as well.

This commit is contained in:
Themaister 2011-06-26 15:32:24 +02:00
parent 7c538274b4
commit 7cf01318cb
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netplay.c
View File

@ -96,10 +96,7 @@ struct netplay
void input_poll_net(void) void input_poll_net(void)
{ {
if (!netplay_should_skip(g_extern.netplay) && netplay_can_poll(g_extern.netplay)) if (!netplay_should_skip(g_extern.netplay) && netplay_can_poll(g_extern.netplay))
{
netplay_callbacks(g_extern.netplay)->poll_cb();
netplay_poll(g_extern.netplay); netplay_poll(g_extern.netplay);
}
} }
void video_frame_net(const uint16_t *data, unsigned width, unsigned height) void video_frame_net(const uint16_t *data, unsigned width, unsigned height)
@ -243,7 +240,7 @@ static bool init_socket(netplay_t *handle, const char *server, uint16_t port)
{ {
#ifdef _WIN32 #ifdef _WIN32
WSADATA wsaData; WSADATA wsaData;
if (WSAStartup(MAKEWORD(2,2), &wsaData) != 0) if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0)
{ {
WSACleanup(); WSACleanup();
return false; return false;
@ -470,7 +467,7 @@ static bool get_self_input_state(netplay_t *handle)
if (handle->frame_count > 0) // First frame we always give zero input since relying on input from first frame screws up when we use -F 0. if (handle->frame_count > 0) // First frame we always give zero input since relying on input from first frame screws up when we use -F 0.
{ {
snes_input_state_t cb = handle->cbs.state_cb; snes_input_state_t cb = handle->cbs.state_cb;
for (int i = 0; i <= 11; i++) for (unsigned i = 0; i <= 11; i++)
{ {
int16_t tmp = cb(g_settings.input.netplay_client_swap_input ? 0 : !handle->port, SNES_DEVICE_JOYPAD, 0, i); int16_t tmp = cb(g_settings.input.netplay_client_swap_input ? 0 : !handle->port, SNES_DEVICE_JOYPAD, 0, i);
state |= tmp ? 1 << i : 0; state |= tmp ? 1 << i : 0;
@ -659,6 +656,8 @@ void netplay_pre_frame(netplay_t *handle)
{ {
psnes_serialize(handle->buffer[handle->self_ptr].state, handle->state_size); psnes_serialize(handle->buffer[handle->self_ptr].state, handle->state_size);
handle->can_poll = true; handle->can_poll = true;
input_poll_net();
} }
// Here we check if we have new input and replay from recorded input. // Here we check if we have new input and replay from recorded input.

1
netplay.h
View File

@ -34,7 +34,6 @@ struct snes_callbacks
{ {
snes_video_refresh_t frame_cb; snes_video_refresh_t frame_cb;
snes_audio_sample_t sample_cb; snes_audio_sample_t sample_cb;
snes_input_poll_t poll_cb;
snes_input_state_t state_cb; snes_input_state_t state_cb;
}; };

4
ssnes.c
View File

@ -905,7 +905,6 @@ static void init_netplay(void)
struct snes_callbacks cbs = { struct snes_callbacks cbs = {
.frame_cb = video_frame, .frame_cb = video_frame,
.sample_cb = audio_sample, .sample_cb = audio_sample,
.poll_cb = input_poll,
.state_cb = input_state .state_cb = input_state
}; };
@ -1510,14 +1509,13 @@ int main(int argc, char *argv[])
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
psnes_set_video_refresh(g_extern.netplay ? video_frame_net : video_frame); psnes_set_video_refresh(g_extern.netplay ? video_frame_net : video_frame);
psnes_set_audio_sample(g_extern.netplay ? audio_sample_net : audio_sample); psnes_set_audio_sample(g_extern.netplay ? audio_sample_net : audio_sample);
psnes_set_input_poll(g_extern.netplay ? input_poll_net : input_poll);
psnes_set_input_state(g_extern.netplay ? input_state_net : input_state); psnes_set_input_state(g_extern.netplay ? input_state_net : input_state);
#else #else
psnes_set_video_refresh(video_frame); psnes_set_video_refresh(video_frame);
psnes_set_audio_sample(audio_sample); psnes_set_audio_sample(audio_sample);
psnes_set_input_poll(input_poll);
psnes_set_input_state(input_state); psnes_set_input_state(input_state);
#endif #endif
psnes_set_input_poll(input_poll);
init_controllers(); init_controllers();