From d66488ad263976b10626f9c8782be4f1cdec858b Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Thu, 31 Dec 2009 06:37:57 +0000 Subject: [PATCH] unix netplay should actually work now fceu-server is required; maybe we should start packaging this with fceu? --- src/drivers/sdl/config.cpp | 10 +++++----- src/drivers/sdl/unix-netplay.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp index 60a52486..ac9f270f 100644 --- a/src/drivers/sdl/config.cpp +++ b/src/drivers/sdl/config.cpp @@ -166,14 +166,14 @@ InitConfig() config->addOption("SDL.SpecialFX", 0); // network play options - netplay is broken - /* - config->addOption('n', "net", "SDL.NetworkServer", ""); + config->addOption("server", "SDL.NetworkIsServer", 0); + config->addOption('n', "net", "SDL.NetworkIP", ""); config->addOption('u', "user", "SDL.NetworkUsername", ""); config->addOption('w', "pass", "SDL.NetworkPassword", ""); config->addOption('k', "netkey", "SDL.NetworkGameKey", ""); - config->addOption( 0, "port", "SDL.NetworkPort", 4046); - config->addOption('l', "players", "SDL.NetworkNumPlayers", 1); - */ + config->addOption("port", "SDL.NetworkPort", 4046); + config->addOption("players", "SDL.NetworkPlayers", 1); + // input configuration options config->addOption("input1", "SDL.Input.0", "GamePad.0"); config->addOption("input2", "SDL.Input.1", "GamePad.1"); diff --git a/src/drivers/sdl/unix-netplay.cpp b/src/drivers/sdl/unix-netplay.cpp index d646f781..f86c4e78 100644 --- a/src/drivers/sdl/unix-netplay.cpp +++ b/src/drivers/sdl/unix-netplay.cpp @@ -94,7 +94,7 @@ FCEUD_NetworkConnect(void) // get any required configuration variables int port, localPlayers; std::string server, username, password, key; - g_config->getOption("SDL.NetworkServer", &server); + g_config->getOption("SDL.NetworkIP", &server); g_config->getOption("SDL.NetworkUsername", &username); g_config->getOption("SDL.NetworkPassword", &password); g_config->getOption("SDL.NetworkGameKey", &key);