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

Fix Com_TEAM not copying parameter properly and some minor code issues

Browse source
This commit is contained in:
Jordy Ruiz 2019-02-21 18:34:34 +01:00
parent b6f086dfea
commit 81f8a03be7
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/game/client/components/chat.cpp
View file

@ -413,7 +413,6 @@ void CChat::EnableMode(int Mode, const char* pText)
if(pText) // optional text to initalize with if(pText) // optional text to initalize with
{ {
dbg_msg("chat", "EnableMode(pText = %s)", pText);
m_Input.Set(pText); m_Input.Set(pText);
m_Input.SetCursorOffset(str_length(pText)); m_Input.SetCursorOffset(str_length(pText));
m_InputUpdate = true; m_InputUpdate = true;
@ -1188,7 +1187,7 @@ void CChat::Com_Team(CChat *pChatData, const char* pCommand)
{ {
// save the parameter in a buffer before EnableMode clears it // save the parameter in a buffer before EnableMode clears it
pBuf = (char*)mem_alloc(str_length(pParameter) + 1, 1); pBuf = (char*)mem_alloc(str_length(pParameter) + 1, 1);
str_copy(pBuf, pParameter, sizeof(pBuf)); str_copy(pBuf, pParameter, str_length(pParameter) + 1);
} }
pChatData->EnableMode(CHAT_TEAM, pBuf); pChatData->EnableMode(CHAT_TEAM, pBuf);
mem_free(pBuf); mem_free(pBuf);
@ -1262,13 +1261,13 @@ void CChat::Com_Befriend(CChat *pChatData, const char* pCommand)
// CChatCommands methods // CChatCommands methods
CChat::CChatCommands::CChatCommands(CChatCommand apCommands[], int Count) : m_apCommands(apCommands), m_Count(Count), m_SelectedCommand(0x0) { } CChat::CChatCommands::CChatCommands(CChatCommand apCommands[], int Count) : m_apCommands(apCommands), m_Count(Count), m_pSelectedCommand(0x0) { }
CChat::CChatCommands::~CChatCommands() { } CChat::CChatCommands::~CChatCommands() { }
// selection // selection
void CChat::CChatCommands::Reset() void CChat::CChatCommands::Reset()
{ {
m_SelectedCommand = 0x0; m_pSelectedCommand = 0x0;
} }
// Example: /whisper command will match "/whi", "/whisper" and "/whisper tee" // Example: /whisper command will match "/whi", "/whisper" and "/whisper tee"
@ -1288,9 +1287,9 @@ void CChat::CChatCommands::Filter(const char* pLine)
if(!GetSelectedCommand() || GetSelectedCommand()->m_aFiltered) if(!GetSelectedCommand() || GetSelectedCommand()->m_aFiltered)
{ {
if(CountActiveCommands() > 0) if(CountActiveCommands() > 0)
m_SelectedCommand = &m_apCommands[GetActiveIndex(0)]; // default to first command m_pSelectedCommand = &m_apCommands[GetActiveIndex(0)]; // default to first command
else else
m_SelectedCommand = 0x0; m_pSelectedCommand = 0x0;
} }
} }
@ -1310,7 +1309,7 @@ const CChat::CChatCommand* CChat::CChatCommands::GetCommand(int index) const
const CChat::CChatCommand* CChat::CChatCommands::GetSelectedCommand() const const CChat::CChatCommand* CChat::CChatCommands::GetSelectedCommand() const
{ {
return m_SelectedCommand; return m_pSelectedCommand;
} }
void CChat::CChatCommands::SelectPreviousCommand() void CChat::CChatCommands::SelectPreviousCommand()
@ -1320,8 +1319,11 @@ void CChat::CChatCommands::SelectPreviousCommand()
{ {
if(m_apCommands[i].m_aFiltered) if(m_apCommands[i].m_aFiltered)
continue; continue;
if(&m_apCommands[i] == m_SelectedCommand) if(&m_apCommands[i] == m_pSelectedCommand)
m_SelectedCommand = LastCommand; {
m_pSelectedCommand = LastCommand;
return;
}
LastCommand = &m_apCommands[i]; LastCommand = &m_apCommands[i];
} }
} }
@ -1335,10 +1337,10 @@ void CChat::CChatCommands::SelectNextCommand()
continue; continue;
if(FoundSelected) if(FoundSelected)
{ {
m_SelectedCommand = &m_apCommands[i]; m_pSelectedCommand = &m_apCommands[i];
return; return;
} }
if(&m_apCommands[i] == m_SelectedCommand) if(&m_apCommands[i] == m_pSelectedCommand)
FoundSelected = true; FoundSelected = true;
} }
} }

2
src/game/client/components/chat.h
View file

@ -86,7 +86,7 @@ class CChat : public CComponent
{ {
CChatCommand *m_apCommands; CChatCommand *m_apCommands;
int m_Count; int m_Count;
CChatCommand *m_SelectedCommand; CChatCommand *m_pSelectedCommand;
private: private:
int GetActiveIndex(int index) const; int GetActiveIndex(int index) const;