The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-27 08:15:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

NetPlayProto: Minor cleanup

Browse Source
This commit is contained in:
Lioncash 2015-08-16 00:00:59 -04:00
parent b8a35f6996
commit e3ffb2dd16
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/NetPlayProto.h
View File

@ -8,6 +8,8 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_Device.h"
#define NETPLAY_VERSION "Dolphin NetPlay 2015-06-24"
struct NetSettings struct NetSettings
{ {
bool m_CPUthread; bool m_CPUthread;
@ -25,18 +27,13 @@ struct NetSettings
}; };
extern NetSettings g_NetPlaySettings; extern NetSettings g_NetPlaySettings;
extern u64 g_netplay_initial_gctime;
struct Rpt : public std::vector<u8> struct Rpt : public std::vector<u8>
{ {
u16 channel; u16 channel;
}; };
typedef std::vector<u8> NetWiimote;
#define NETPLAY_VERSION "Dolphin NetPlay 2015-06-24"
extern u64 g_netplay_initial_gctime;
// messages // messages
enum enum
{ {
@ -70,11 +67,6 @@ enum
NP_MSG_SYNC_GC_SRAM = 0xF0, NP_MSG_SYNC_GC_SRAM = 0xF0,
}; };
typedef u8 MessageId;
typedef u8 PlayerId;
typedef s8 PadMapping;
typedef u32 FrameNum;
enum enum
{ {
CON_ERR_SERVER_FULL = 1, CON_ERR_SERVER_FULL = 1,
@ -82,6 +74,12 @@ enum
CON_ERR_VERSION_MISMATCH = 3 CON_ERR_VERSION_MISMATCH = 3
}; };
using NetWiimote = std::vector<u8>;
using MessageId = u8;
using PlayerId = u8;
using PadMapping = s8;
using FrameNum = u32;
namespace NetPlay namespace NetPlay
{ {
bool IsNetPlayRunning(); bool IsNetPlayRunning();