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

Move some code from NetPlayClient.h to NetPlayProto.h, and only include that outside of NetPlay.

This commit is contained in:
Rachel Bryk 2013-09-07 00:27:35 -04:00
parent 2bc44f98c3
commit 33fb1b562f
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/BootManager.cpp
View File

@ -34,7 +34,7 @@
#include "Host.h" #include "Host.h"
#include "VideoBackendBase.h" #include "VideoBackendBase.h"
#include "Movie.h" #include "Movie.h"
#include "NetPlayClient.h" #include "NetPlayProto.h"
namespace BootManager namespace BootManager
{ {

2
Source/Core/Core/Src/HW/SI.cpp
View File

@ -7,7 +7,7 @@
#include "../ConfigManager.h" #include "../ConfigManager.h"
#include "../CoreTiming.h" #include "../CoreTiming.h"
#include "../Movie.h" #include "../Movie.h"
#include "../NetPlayClient.h" #include "../NetPlayProto.h"
#include "SystemTimers.h" #include "SystemTimers.h"
#include "ProcessorInterface.h" #include "ProcessorInterface.h"

2
Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp
View File

@ -6,7 +6,7 @@
#include "WII_IPC_HLE.h" #include "WII_IPC_HLE.h"
#include "WII_IPC_HLE_Device.h" #include "WII_IPC_HLE_Device.h"
// No Wii socket support while using NetPlay or TAS // No Wii socket support while using NetPlay or TAS
#include "NetPlayClient.h" #include "NetPlayProto.h"
#include "Movie.h" #include "Movie.h"
using WII_IPC_HLE_Interface::ECommandType; using WII_IPC_HLE_Interface::ECommandType;

2
Source/Core/Core/Src/Movie.cpp
View File

@ -24,7 +24,7 @@
#include "../../Common/Src/NandPaths.h" #include "../../Common/Src/NandPaths.h"
#include "polarssl/md5.h" #include "polarssl/md5.h"
#include "scmrev.h" #include "scmrev.h"
#include "NetPlayClient.h" #include "NetPlayProto.h"
// The chunk to allocate movie data in multiples of. // The chunk to allocate movie data in multiples of.
#define DTM_BASE_LENGTH (1024) #define DTM_BASE_LENGTH (1024)

8
Source/Core/Core/Src/NetPlayClient.h
View File

@ -22,8 +22,6 @@
#include "FifoQueue.h" #include "FifoQueue.h"
const int NETPLAY_INITIAL_GCTIME = 1272737767;
class NetPad class NetPad
{ {
public: public:
@ -51,8 +49,6 @@ public:
virtual bool IsRecording() = 0; virtual bool IsRecording() = 0;
}; };
extern NetSettings g_NetPlaySettings;
class Player class Player
{ {
public: public:
@ -131,10 +127,6 @@ private:
std::map<PlayerId, Player> m_players; std::map<PlayerId, Player> m_players;
}; };
namespace NetPlay {
bool IsNetPlayRunning();
};
void NetPlay_Enable(NetPlayClient* const np); void NetPlay_Enable(NetPlayClient* const np);
void NetPlay_Disable(); void NetPlay_Disable();

8
Source/Core/Core/Src/NetPlayProto.h
View File

@ -18,6 +18,8 @@ struct NetSettings
TEXIDevices m_EXIDevice[2]; TEXIDevices m_EXIDevice[2];
}; };
extern NetSettings g_NetPlaySettings;
struct Rpt : public std::vector<u8> struct Rpt : public std::vector<u8>
{ {
u16 channel; u16 channel;
@ -27,6 +29,8 @@ typedef std::vector<Rpt> NetWiimote;
#define NETPLAY_VERSION "Dolphin NetPlay 2013-09-03" #define NETPLAY_VERSION "Dolphin NetPlay 2013-09-03"
const int NETPLAY_INITIAL_GCTIME = 1272737767;
// messages // messages
enum enum
{ {
@ -67,4 +71,8 @@ enum
CON_ERR_VERSION_MISMATCH CON_ERR_VERSION_MISMATCH
}; };
namespace NetPlay {
bool IsNetPlayRunning();
};
#endif #endif

2
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -30,7 +30,7 @@
#include "HotkeyDlg.h" #include "HotkeyDlg.h"
#include "Main.h" #include "Main.h"
#include "VideoBackendBase.h" #include "VideoBackendBase.h"
#include "NetPlayClient.h" #include "NetPlayProto.h"
#define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize)