edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-13 03:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #363 from H-M-H/dummy_input

Browse source 
classmembers shall start with m_ !
This commit is contained in:
heinrich5991 2015-11-09 21:12:13 +00:00
parent 201782dbfc 50c80a1cfb
commit db0e61d9ef
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/client.h
View file

@ -42,7 +42,7 @@ public:
int m_LocalIDs[2]; int m_LocalIDs[2];
char m_aNews[NEWS_SIZE]; char m_aNews[NEWS_SIZE];
CNetObj_PlayerInput DummyInput; CNetObj_PlayerInput m_DummyInput;
bool m_DummySendConnInfo; bool m_DummySendConnInfo;

24
src/engine/client/client.cpp
View file

@ -326,7 +326,7 @@ CClient::CClient() : m_DemoPlayer(&m_SnapshotDelta)
m_Fire = 0; m_Fire = 0;
mem_zero(&m_aInputs, sizeof(m_aInputs)); mem_zero(&m_aInputs, sizeof(m_aInputs));
mem_zero(&DummyInput, sizeof(DummyInput)); mem_zero(&m_DummyInput, sizeof(m_DummyInput));
mem_zero(&HammerInput, sizeof(HammerInput)); mem_zero(&HammerInput, sizeof(HammerInput));
HammerInput.m_Fire = 0; HammerInput.m_Fire = 0;
@ -510,16 +510,16 @@ void CClient::SendInput()
if(m_LastDummy != (bool)g_Config.m_ClDummy) if(m_LastDummy != (bool)g_Config.m_ClDummy)
{ {
mem_copy(&DummyInput, &m_aInputs[!g_Config.m_ClDummy][(m_CurrentInput[!g_Config.m_ClDummy]+200-1)%200], sizeof(DummyInput)); mem_copy(&m_DummyInput, &m_aInputs[!g_Config.m_ClDummy][(m_CurrentInput[!g_Config.m_ClDummy]+200-1)%200], sizeof(m_DummyInput));
m_LastDummy = g_Config.m_ClDummy; m_LastDummy = g_Config.m_ClDummy;
if (g_Config.m_ClDummyResetOnSwitch) if (g_Config.m_ClDummyResetOnSwitch)
{ {
DummyInput.m_Jump = 0; m_DummyInput.m_Jump = 0;
DummyInput.m_Hook = 0; m_DummyInput.m_Hook = 0;
if(DummyInput.m_Fire & 1) if(m_DummyInput.m_Fire & 1)
DummyInput.m_Fire++; m_DummyInput.m_Fire++;
DummyInput.m_Direction = 0; m_DummyInput.m_Direction = 0;
GameClient()->ResetDummyInput(); GameClient()->ResetDummyInput();
} }
} }
@ -535,22 +535,22 @@ void CClient::SendInput()
{ {
if(m_Fire != 0) if(m_Fire != 0)
{ {
DummyInput.m_Fire = HammerInput.m_Fire; m_DummyInput.m_Fire = HammerInput.m_Fire;
m_Fire = 0; m_Fire = 0;
} }
if(!Size && (!DummyInput.m_Direction && !DummyInput.m_Jump && !DummyInput.m_Hook)) if(!Size && (!m_DummyInput.m_Direction && !m_DummyInput.m_Jump && !m_DummyInput.m_Hook))
return; return;
// pack input // pack input
CMsgPacker Msg(NETMSG_INPUT); CMsgPacker Msg(NETMSG_INPUT);
Msg.AddInt(m_AckGameTick[!g_Config.m_ClDummy]); Msg.AddInt(m_AckGameTick[!g_Config.m_ClDummy]);
Msg.AddInt(m_PredTick[!g_Config.m_ClDummy]); Msg.AddInt(m_PredTick[!g_Config.m_ClDummy]);
Msg.AddInt(sizeof(DummyInput)); Msg.AddInt(sizeof(m_DummyInput));
// pack it // pack it
for(unsigned int i = 0; i < sizeof(DummyInput)/4; i++) for(unsigned int i = 0; i < sizeof(m_DummyInput)/4; i++)
Msg.AddInt(((int*) &DummyInput)[i]); Msg.AddInt(((int*) &m_DummyInput)[i]);
SendMsgExY(&Msg, MSGFLAG_FLUSH, true, !g_Config.m_ClDummy); SendMsgExY(&Msg, MSGFLAG_FLUSH, true, !g_Config.m_ClDummy);
} }

2
src/game/client/components/controls.cpp
View file

@ -264,7 +264,7 @@ int CControls::SnapInput(int *pData)
// dummy copy moves // dummy copy moves
if(g_Config.m_ClDummyCopyMoves) if(g_Config.m_ClDummyCopyMoves)
{ {
CNetObj_PlayerInput *DummyInput = &Client()->DummyInput; CNetObj_PlayerInput *DummyInput = &Client()->m_DummyInput;
DummyInput->m_Direction = m_InputData[g_Config.m_ClDummy].m_Direction; DummyInput->m_Direction = m_InputData[g_Config.m_ClDummy].m_Direction;
DummyInput->m_Hook = m_InputData[g_Config.m_ClDummy].m_Hook; DummyInput->m_Hook = m_InputData[g_Config.m_ClDummy].m_Hook;
DummyInput->m_Jump = m_InputData[g_Config.m_ClDummy].m_Jump; DummyInput->m_Jump = m_InputData[g_Config.m_ClDummy].m_Jump;