diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-08-16 00:00:59 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-08-16 00:00:59 -0400 |
| commit | e3ffb2dd16c58c5ca2aa49cea25449c0d81ea456 (patch) | |
| tree | fea43cf6d4efae672411c3008b716b9db44cc02b /Source/Core | |
| parent | b8a35f69962d5b5bcb7150f8587dae13021157c3 (diff) | |
NetPlayProto: Minor cleanup
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/NetPlayProto.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index e3572dd212..9434204621 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -8,6 +8,8 @@ #include "Common/CommonTypes.h" #include "Core/HW/EXI_Device.h" +#define NETPLAY_VERSION "Dolphin NetPlay 2015-06-24" + struct NetSettings { bool m_CPUthread; @@ -25,18 +27,13 @@ struct NetSettings }; extern NetSettings g_NetPlaySettings; +extern u64 g_netplay_initial_gctime; struct Rpt : public std::vector<u8> { u16 channel; }; -typedef std::vector<u8> NetWiimote; - -#define NETPLAY_VERSION "Dolphin NetPlay 2015-06-24" - -extern u64 g_netplay_initial_gctime; - // messages enum { @@ -70,11 +67,6 @@ enum NP_MSG_SYNC_GC_SRAM = 0xF0, }; -typedef u8 MessageId; -typedef u8 PlayerId; -typedef s8 PadMapping; -typedef u32 FrameNum; - enum { CON_ERR_SERVER_FULL = 1, @@ -82,6 +74,12 @@ enum CON_ERR_VERSION_MISMATCH = 3 }; +using NetWiimote = std::vector<u8>; +using MessageId = u8; +using PlayerId = u8; +using PadMapping = s8; +using FrameNum = u32; + namespace NetPlay { bool IsNetPlayRunning(); |