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

Enable the username prompt on client side

Browse source
This commit is contained in:
Learath2 2017-03-02 18:16:50 +03:00
parent b7cbaedea0
commit adfd6ca644
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/game/client/components/console.cpp
View file

@ -9,6 +9,7 @@
#include <base/system.h> #include <base/system.h>
#include <engine/serverbrowser.h>
#include <engine/shared/ringbuffer.h> #include <engine/shared/ringbuffer.h>
#include <engine/shared/config.h> #include <engine/shared/config.h>
#include <engine/graphics.h> #include <engine/graphics.h>
@ -47,6 +48,8 @@ CGameConsole::CInstance::CInstance(int Type)
m_CompletionRenderOffset = 0.0f; m_CompletionRenderOffset = 0.0f;
m_ReverseTAB = false; m_ReverseTAB = false;
m_aUser[0] = '\0';
m_IsCommand = false; m_IsCommand = false;
} }
@ -76,7 +79,18 @@ void CGameConsole::CInstance::ExecuteLine(const char *pLine)
if(m_pGameConsole->Client()->RconAuthed()) if(m_pGameConsole->Client()->RconAuthed())
m_pGameConsole->Client()->Rcon(pLine); m_pGameConsole->Client()->Rcon(pLine);
else else
m_pGameConsole->Client()->RconAuth("", pLine); {
CServerInfo pServerInfo;
m_pGameConsole->Client()->GetServerInfo(&pServerInfo);
if(!m_aUser[0] && IsDDNet(&pServerInfo))
str_copy(m_aUser, pLine, sizeof m_aUser);
else
{
m_pGameConsole->Client()->RconAuth(m_aUser, pLine);
m_aUser[0] = '\0';
}
}
} }
} }
@ -459,6 +473,9 @@ void CGameConsole::OnRender()
Info.m_pCurrentCmd = pConsole->m_aCompletionBuffer; Info.m_pCurrentCmd = pConsole->m_aCompletionBuffer;
TextRender()->SetCursor(&Info.m_Cursor, x+Info.m_Offset, y+RowHeight+2.0f, FontSize, TEXTFLAG_RENDER); TextRender()->SetCursor(&Info.m_Cursor, x+Info.m_Offset, y+RowHeight+2.0f, FontSize, TEXTFLAG_RENDER);
CServerInfo pServerInfo;
Client()->GetServerInfo(&pServerInfo);
// render prompt // render prompt
CTextCursor Cursor; CTextCursor Cursor;
TextRender()->SetCursor(&Cursor, x, y, FontSize, TEXTFLAG_RENDER); TextRender()->SetCursor(&Cursor, x, y, FontSize, TEXTFLAG_RENDER);
@ -470,7 +487,17 @@ void CGameConsole::OnRender()
if(Client()->RconAuthed()) if(Client()->RconAuthed())
pPrompt = "rcon> "; pPrompt = "rcon> ";
else else
pPrompt = "ENTER PASSWORD> "; {
if(IsDDNet(&pServerInfo))
{
if(!pConsole->m_aUser[0])
pPrompt = "Enter Username> ";
else
pPrompt = "Enter Password> ";
}
else
pPrompt = "ENTER PASSWORD> ";
}
} }
else else
pPrompt = "NOT CONNECTED> "; pPrompt = "NOT CONNECTED> ";
@ -495,7 +522,7 @@ void CGameConsole::OnRender()
//hide rcon password //hide rcon password
char aInputString[512]; char aInputString[512];
str_copy(aInputString, pConsole->m_Input.GetString(Editing), sizeof(aInputString)); str_copy(aInputString, pConsole->m_Input.GetString(Editing), sizeof(aInputString));
if(m_ConsoleType == CONSOLETYPE_REMOTE && Client()->State() == IClient::STATE_ONLINE && !Client()->RconAuthed()) if(m_ConsoleType == CONSOLETYPE_REMOTE && Client()->State() == IClient::STATE_ONLINE && !Client()->RconAuthed() && (pConsole->m_aUser[0] || !IsDDNet(&pServerInfo)))
{ {
for(int i = 0; i < pConsole->m_Input.GetLength(Editing); ++i) for(int i = 0; i < pConsole->m_Input.GetLength(Editing); ++i)
aInputString[i] = '*'; aInputString[i] = '*';

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

@ -43,6 +43,8 @@ class CGameConsole : public CComponent
float m_CompletionRenderOffset; float m_CompletionRenderOffset;
bool m_ReverseTAB; bool m_ReverseTAB;
char m_aUser[32];
bool m_IsCommand; bool m_IsCommand;
char m_aCommandName[IConsole::TEMPCMD_NAME_LENGTH]; char m_aCommandName[IConsole::TEMPCMD_NAME_LENGTH];
char m_aCommandHelp[IConsole::TEMPCMD_HELP_LENGTH]; char m_aCommandHelp[IConsole::TEMPCMD_HELP_LENGTH];