archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

NetPlay: Use std::array for the pad mappings

Browse source
This commit is contained in:
Lioncash 2015-08-16 00:08:09 -04:00
parent e3ffb2dd16
commit b1af2a6bbc
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Core/NetPlayClient.h
View file

@ -121,8 +121,8 @@ protected:
u32 m_current_game; u32 m_current_game;
PadMapping m_pad_map[4]; PadMappingArray m_pad_map;
PadMapping m_wiimote_map[4]; PadMappingArray m_wiimote_map;
bool m_is_recording; bool m_is_recording;

4
Source/Core/Core/NetPlayProto.h
View file

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <array>
#include <vector> #include <vector>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_Device.h"
@ -77,8 +78,9 @@ enum
using NetWiimote = std::vector<u8>; using NetWiimote = std::vector<u8>;
using MessageId = u8; using MessageId = u8;
using PlayerId = u8; using PlayerId = u8;
using PadMapping = s8;
using FrameNum = u32; using FrameNum = u32;
using PadMapping = s8;
using PadMappingArray = std::array<PadMapping, 4>;
namespace NetPlay namespace NetPlay
{ {

5
Source/Core/Core/NetPlayServer.cpp
View file

@ -74,8 +74,9 @@ NetPlayServer::NetPlayServer(const u16 port, bool traversal, const std::string&
PanicAlertT("Enet Didn't Initialize"); PanicAlertT("Enet Didn't Initialize");
} }
memset(m_pad_map, -1, sizeof(m_pad_map)); m_pad_map.fill(-1);
memset(m_wiimote_map, -1, sizeof(m_wiimote_map)); m_wiimote_map.fill(-1);
if (traversal) if (traversal)
{ {
if (!EnsureTraversalClient(centralServer, centralPort)) if (!EnsureTraversalClient(centralServer, centralPort))

4
Source/Core/Core/NetPlayServer.h
View file

@ -95,8 +95,8 @@ private:
bool m_update_pings; bool m_update_pings;
u32 m_current_game; u32 m_current_game;
unsigned int m_target_buffer_size; unsigned int m_target_buffer_size;
PadMapping m_pad_map[4]; PadMappingArray m_pad_map;
PadMapping m_wiimote_map[4]; PadMappingArray m_wiimote_map;
std::map<PlayerId, Client> m_players; std::map<PlayerId, Client> m_players;