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

added reasons to vote in general and show reason in vote hud. Closes #219

Browse source
This commit is contained in:
oy 2011-03-25 10:26:59 +01:00
parent 8ad3def65e
commit a4580d451f
7 changed files with 67 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
datasrc/network.py
View file

@ -267,7 +267,8 @@ Messages = [
NetMessage("Sv_VoteSet", [ NetMessage("Sv_VoteSet", [
NetIntRange("m_Timeout", 0, 60), NetIntRange("m_Timeout", 0, 60),
NetStringStrict("m_pDescription") NetStringStrict("m_pDescription"),
NetStringStrict("m_pReason"),
]), ]),
NetMessage("Sv_VoteStatus", [ NetMessage("Sv_VoteStatus", [
@ -324,5 +325,6 @@ Messages = [
NetMessage("Cl_CallVote", [ NetMessage("Cl_CallVote", [
NetStringStrict("m_Type"), NetStringStrict("m_Type"),
NetStringStrict("m_Value"), NetStringStrict("m_Value"),
NetStringStrict("m_Reason"),
]), ]),
] ]

34
src/game/client/components/hud.cpp
View file

@ -293,34 +293,40 @@ void CHud::RenderVoting()
Graphics()->TextureSet(-1); Graphics()->TextureSet(-1);
Graphics()->QuadsBegin(); Graphics()->QuadsBegin();
Graphics()->SetColor(0,0,0,0.40f); Graphics()->SetColor(0,0,0,0.40f);
RenderTools()->DrawRoundRect(-10, 60-2, 100+10+4+5, 28, 5.0f); RenderTools()->DrawRoundRect(-10, 60-2, 100+10+4+5, 46, 5.0f);
Graphics()->QuadsEnd(); Graphics()->QuadsEnd();
TextRender()->TextColor(1,1,1,1); TextRender()->TextColor(1,1,1,1);
char Buf[512];
str_format(Buf, sizeof(Buf), Localize("%ds left"), m_pClient->m_pVoting->SecondsLeft());
float tw = TextRender()->TextWidth(0x0, 6, Buf, -1);
CTextCursor Cursor; CTextCursor Cursor;
TextRender()->SetCursor(&Cursor, 5.0f, 60.0f, 6.0f, TEXTFLAG_RENDER|TEXTFLAG_STOP_AT_END); char aBuf[512];
Cursor.m_LineWidth = 100-tw; str_format(aBuf, sizeof(aBuf), Localize("%ds left"), m_pClient->m_pVoting->SecondsLeft());
float tw = TextRender()->TextWidth(0x0, 6, aBuf, -1);
TextRender()->SetCursor(&Cursor, 5.0f+100.0f-tw, 60.0f, 6.0f, TEXTFLAG_RENDER);
TextRender()->TextEx(&Cursor, aBuf, -1);
TextRender()->SetCursor(&Cursor, 5.0f, 60.0f, 6.0f, TEXTFLAG_RENDER);
Cursor.m_LineWidth = 100.0f-tw;
Cursor.m_MaxLines = 3;
TextRender()->TextEx(&Cursor, m_pClient->m_pVoting->VoteDescription(), -1); TextRender()->TextEx(&Cursor, m_pClient->m_pVoting->VoteDescription(), -1);
TextRender()->Text(0x0, 5+100-tw, 60, 6, Buf, -1); // reason
str_format(aBuf, sizeof(aBuf), "%s %s", Localize("Reason:"), m_pClient->m_pVoting->VoteReason());
TextRender()->SetCursor(&Cursor, 5.0f, 79.0f, 6.0f, TEXTFLAG_RENDER|TEXTFLAG_STOP_AT_END);
Cursor.m_LineWidth = 100.0f;
TextRender()->TextEx(&Cursor, aBuf, -1);
CUIRect Base = {5, 88, 100, 4};
CUIRect Base = {5, 70, 100, 4};
m_pClient->m_pVoting->RenderBars(Base, false); m_pClient->m_pVoting->RenderBars(Base, false);
const char *pYesKey = m_pClient->m_pBinds->GetKey("vote yes"); const char *pYesKey = m_pClient->m_pBinds->GetKey("vote yes");
const char *pNoKey = m_pClient->m_pBinds->GetKey("vote no"); const char *pNoKey = m_pClient->m_pBinds->GetKey("vote no");
str_format(Buf, sizeof(Buf), "%s - %s", pYesKey, Localize("Vote yes")); str_format(aBuf, sizeof(aBuf), "%s - %s", pYesKey, Localize("Vote yes"));
Base.y += Base.h+1; Base.y += Base.h+1;
UI()->DoLabel(&Base, Buf, 6.0f, -1); UI()->DoLabel(&Base, aBuf, 6.0f, -1);
str_format(Buf, sizeof(Buf), "%s - %s", Localize("Vote no"), pNoKey); str_format(aBuf, sizeof(aBuf), "%s - %s", Localize("Vote no"), pNoKey);
UI()->DoLabel(&Base, Buf, 6.0f, 1); UI()->DoLabel(&Base, aBuf, 6.0f, 1);
} }
void CHud::RenderCursor() void CHud::RenderCursor()

42
src/game/client/components/menus_ingame.cpp
View file

@ -323,11 +323,6 @@ void CMenus::RenderServerInfo(CUIRect MainView)
TextRender()->Text(0, Motd.x+x, Motd.y+y, 16, m_pClient->m_pMotd->m_aServerMotd, (int)Motd.w); TextRender()->Text(0, Motd.x+x, Motd.y+y, 16, m_pClient->m_pMotd->m_aServerMotd, (int)Motd.w);
} }
static const char *FormatCommand(const char *pCmd)
{
return pCmd;
}
void CMenus::RenderServerControlServer(CUIRect MainView) void CMenus::RenderServerControlServer(CUIRect MainView)
{ {
int NumOptions = 0; int NumOptions = 0;
@ -344,7 +339,7 @@ void CMenus::RenderServerControlServer(CUIRect MainView)
CListboxItem Item = UiDoListboxNextItem(pOption); CListboxItem Item = UiDoListboxNextItem(pOption);
if(Item.m_Visible) if(Item.m_Visible)
UI()->DoLabelScaled(&Item.m_Rect, FormatCommand(pOption->m_aDescription), 16.0f, -1); UI()->DoLabelScaled(&Item.m_Rect, pOption->m_aDescription, 16.0f, -1);
} }
m_CallvoteSelectedOption = UiDoListboxEnd(&s_ScrollValue, 0); m_CallvoteSelectedOption = UiDoListboxEnd(&s_ScrollValue, 0);
@ -440,13 +435,7 @@ void CMenus::RenderServerControl(CUIRect MainView)
if(DoButton_Menu(&s_CallVoteButton, Localize("Call vote"), 0, &Button)) if(DoButton_Menu(&s_CallVoteButton, Localize("Call vote"), 0, &Button))
{ {
if(s_ControlPage == 0) if(s_ControlPage == 0)
{ m_pClient->m_pVoting->CallvoteOption(m_CallvoteSelectedOption, m_aCallvoteReason);
//
m_pClient->m_pVoting->CallvoteOption(m_CallvoteSelectedOption);
/*
if(callvote_selectedmap >= 0 && callvote_selectedmap < gameclient.maplist->num())
gameclient.voting->callvote_map(gameclient.maplist->name(callvote_selectedmap));*/
}
else if(s_ControlPage == 1) else if(s_ControlPage == 1)
{ {
if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS && if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&
@ -460,19 +449,16 @@ void CMenus::RenderServerControl(CUIRect MainView)
} }
// render kick reason // render kick reason
if(s_ControlPage == 1) CUIRect Reason;
{ Bottom.VSplitRight(40.0f, &Bottom, 0);
CUIRect Reason; Bottom.VSplitRight(160.0f, &Bottom, &Reason);
Bottom.VSplitRight(40.0f, &Bottom, 0); Reason.HSplitTop(5.0f, 0, &Reason);
Bottom.VSplitRight(160.0f, &Bottom, &Reason); const char *pLabel = Localize("Reason:");
Reason.HSplitTop(5.0f, 0, &Reason); UI()->DoLabelScaled(&Reason, pLabel, 14.0f, -1);
const char *pLabel = Localize("Reason:"); float w = TextRender()->TextWidth(0, 14.0f, pLabel, -1);
UI()->DoLabelScaled(&Reason, pLabel, 14.0f, -1); Reason.VSplitLeft(w+10.0f, 0, &Reason);
float w = TextRender()->TextWidth(0, 14.0f, pLabel, -1); static float s_Offset = 0.0f;
Reason.VSplitLeft(w+10.0f, 0, &Reason); DoEditBox(&m_aCallvoteReason, &Reason, m_aCallvoteReason, sizeof(m_aCallvoteReason), 14.0f, &s_Offset, false, CUI::CORNER_ALL);
static float s_Offset = 0.0f;
DoEditBox(&m_aCallvoteReason, &Reason, m_aCallvoteReason, sizeof(m_aCallvoteReason), 14.0f, &s_Offset, false, CUI::CORNER_ALL);
}
// force vote button (only available when authed in rcon) // force vote button (only available when authed in rcon)
if(Client()->RconAuthed()) if(Client()->RconAuthed())
@ -483,9 +469,7 @@ void CMenus::RenderServerControl(CUIRect MainView)
if(DoButton_Menu(&s_ForceVoteButton, Localize("Force vote"), 0, &Button)) if(DoButton_Menu(&s_ForceVoteButton, Localize("Force vote"), 0, &Button))
{ {
if(s_ControlPage == 0) if(s_ControlPage == 0)
{ m_pClient->m_pVoting->ForcevoteOption(m_CallvoteSelectedOption, m_aCallvoteReason);
m_pClient->m_pVoting->ForcevoteOption(m_CallvoteSelectedOption);
}
else if(s_ControlPage == 1) else if(s_ControlPage == 1)
{ {
if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS && if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&

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

@ -5,13 +5,12 @@
#include <game/generated/protocol.h> #include <game/generated/protocol.h>
#include <base/vmath.h> #include <base/vmath.h>
#include <game/client/render.h> #include <game/client/render.h>
//#include <game/client/gameclient.h>
#include "voting.h" #include "voting.h"
void CVoting::ConCallvote(IConsole::IResult *pResult, void *pUserData) void CVoting::ConCallvote(IConsole::IResult *pResult, void *pUserData)
{ {
CVoting *pSelf = (CVoting*)pUserData; CVoting *pSelf = (CVoting*)pUserData;
pSelf->Callvote(pResult->GetString(0), pResult->GetString(1)); pSelf->Callvote(pResult->GetString(0), pResult->GetString(1), pResult->NumArguments() > 2 ? pResult->GetString(2) : "");
} }
void CVoting::ConVote(IConsole::IResult *pResult, void *pUserData) void CVoting::ConVote(IConsole::IResult *pResult, void *pUserData)
@ -23,32 +22,30 @@ void CVoting::ConVote(IConsole::IResult *pResult, void *pUserData)
pSelf->Vote(-1); pSelf->Vote(-1);
} }
void CVoting::Callvote(const char *pType, const char *pValue) void CVoting::Callvote(const char *pType, const char *pValue, const char *pReason)
{ {
CNetMsg_Cl_CallVote Msg = {0}; CNetMsg_Cl_CallVote Msg = {0};
Msg.m_Type = pType; Msg.m_Type = pType;
Msg.m_Value = pValue; Msg.m_Value = pValue;
Msg.m_Reason = pReason;
Client()->SendPackMsg(&Msg, MSGFLAG_VITAL); Client()->SendPackMsg(&Msg, MSGFLAG_VITAL);
} }
void CVoting::CallvoteKick(int ClientID, const char *pReason) void CVoting::CallvoteKick(int ClientID, const char *pReason)
{ {
char aBuf[32]; char aBuf[32];
if(pReason[0]) str_format(aBuf, sizeof(aBuf), "%d", ClientID);
str_format(aBuf, sizeof(aBuf), "%d %s", ClientID, pReason); Callvote("kick", aBuf, pReason);
else
str_format(aBuf, sizeof(aBuf), "%d", ClientID);
Callvote("kick", aBuf);
} }
void CVoting::CallvoteOption(int OptionId) void CVoting::CallvoteOption(int OptionId, const char *pReason)
{ {
CVoteOption *pOption = m_pFirst; CVoteOption *pOption = m_pFirst;
while(pOption && OptionId >= 0) while(pOption && OptionId >= 0)
{ {
if(OptionId == 0) if(OptionId == 0)
{ {
Callvote("option", pOption->m_aDescription); Callvote("option", pOption->m_aDescription, pReason);
break; break;
} }
@ -57,6 +54,7 @@ void CVoting::CallvoteOption(int OptionId)
} }
} }
// TODO: fix these two
void CVoting::ForcevoteKick(int ClientID, const char *pReason) void CVoting::ForcevoteKick(int ClientID, const char *pReason)
{ {
char aBuf[32]; char aBuf[32];
@ -67,7 +65,7 @@ void CVoting::ForcevoteKick(int ClientID, const char *pReason)
Client()->Rcon(aBuf); Client()->Rcon(aBuf);
} }
void CVoting::ForcevoteOption(int OptionId) void CVoting::ForcevoteOption(int OptionId, const char *pReason)
{ {
CVoteOption *pOption = m_pFirst; CVoteOption *pOption = m_pFirst;
while(pOption && OptionId >= 0) while(pOption && OptionId >= 0)
@ -108,13 +106,14 @@ void CVoting::OnReset()
{ {
m_Closetime = 0; m_Closetime = 0;
m_aDescription[0] = 0; m_aDescription[0] = 0;
m_aReason[0] = 0;
m_Yes = m_No = m_Pass = m_Total = 0; m_Yes = m_No = m_Pass = m_Total = 0;
m_Voted = 0; m_Voted = 0;
} }
void CVoting::OnConsoleInit() void CVoting::OnConsoleInit()
{ {
Console()->Register("callvote", "sr", CFGFLAG_CLIENT, ConCallvote, this, "Call vote"); Console()->Register("callvote", "ss?r", CFGFLAG_CLIENT, ConCallvote, this, "Call vote");
Console()->Register("vote", "r", CFGFLAG_CLIENT, ConVote, this, "Vote yes/no"); Console()->Register("vote", "r", CFGFLAG_CLIENT, ConVote, this, "Vote yes/no");
} }
@ -127,6 +126,7 @@ void CVoting::OnMessage(int MsgType, void *pRawMsg)
{ {
OnReset(); OnReset();
str_copy(m_aDescription, pMsg->m_pDescription, sizeof(m_aDescription)); str_copy(m_aDescription, pMsg->m_pDescription, sizeof(m_aDescription));
str_copy(m_aReason, pMsg->m_pReason, sizeof(m_aReason));
m_Closetime = time_get() + time_freq() * pMsg->m_Timeout; m_Closetime = time_get() + time_freq() * pMsg->m_Timeout;
} }
else else

11
src/game/client/components/voting.h
View file

@ -15,10 +15,12 @@ class CVoting : public CComponent
int64 m_Closetime; int64 m_Closetime;
char m_aDescription[64]; char m_aDescription[64];
char m_aReason[16];
int m_Voted; int m_Voted;
int m_Yes, m_No, m_Pass, m_Total;
void ClearOptions(); void ClearOptions();
void Callvote(const char *pType, const char *pValue); void Callvote(const char *pType, const char *pValue, const char *pReason);
public: public:
@ -41,9 +43,9 @@ public:
void RenderBars(CUIRect Bars, bool Text); void RenderBars(CUIRect Bars, bool Text);
void CallvoteKick(int ClientID, const char *pReason); void CallvoteKick(int ClientID, const char *pReason);
void CallvoteOption(int Option); void CallvoteOption(int Option, const char *pReason);
void ForcevoteKick(int ClientID, const char *pReason); void ForcevoteKick(int ClientID, const char *pReason);
void ForcevoteOption(int Option); void ForcevoteOption(int Option, const char *pReason);
void Vote(int v); // -1 = no, 1 = yes void Vote(int v); // -1 = no, 1 = yes
@ -51,8 +53,7 @@ public:
bool IsVoting() { return m_Closetime != 0; } bool IsVoting() { return m_Closetime != 0; }
int TakenChoice() const { return m_Voted; } int TakenChoice() const { return m_Voted; }
const char *VoteDescription() const { return m_aDescription; } const char *VoteDescription() const { return m_aDescription; }
const char *VoteReason() const { return m_aReason; }
int m_Yes, m_No, m_Pass, m_Total;
}; };
#endif #endif

26
src/game/server/gamecontext.cpp
View file

@ -275,7 +275,7 @@ void CGameContext::SendBroadcast(const char *pText, int ClientID)
} }
// //
void CGameContext::StartVote(const char *pDesc, const char *pCommand) void CGameContext::StartVote(const char *pDesc, const char *pCommand, const char *pReason)
{ {
// check if a vote is already running // check if a vote is already running
if(m_VoteCloseTime) if(m_VoteCloseTime)
@ -296,6 +296,7 @@ void CGameContext::StartVote(const char *pDesc, const char *pCommand)
m_VoteCloseTime = time_get() + time_freq()*25; m_VoteCloseTime = time_get() + time_freq()*25;
str_copy(m_aVoteDescription, pDesc, sizeof(m_aVoteDescription)); str_copy(m_aVoteDescription, pDesc, sizeof(m_aVoteDescription));
str_copy(m_aVoteCommand, pCommand, sizeof(m_aVoteCommand)); str_copy(m_aVoteCommand, pCommand, sizeof(m_aVoteCommand));
str_copy(m_aVoteReason, pReason, sizeof(m_aVoteReason));
SendVoteSet(-1); SendVoteSet(-1);
m_VoteUpdate = true; m_VoteUpdate = true;
} }
@ -314,11 +315,13 @@ void CGameContext::SendVoteSet(int ClientID)
{ {
Msg.m_Timeout = (m_VoteCloseTime-time_get())/time_freq(); Msg.m_Timeout = (m_VoteCloseTime-time_get())/time_freq();
Msg.m_pDescription = m_aVoteDescription; Msg.m_pDescription = m_aVoteDescription;
Msg.m_pReason = m_aVoteReason;
} }
else else
{ {
Msg.m_Timeout = 0; Msg.m_Timeout = 0;
Msg.m_pDescription = ""; Msg.m_pDescription = "";
Msg.m_pReason = "";
} }
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID); Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
} }
@ -625,9 +628,11 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
} }
char aChatmsg[512] = {0}; char aChatmsg[512] = {0};
char aDesc[512] = {0}; char aDesc[64] = {0};
char aCmd[512] = {0}; char aCmd[512] = {0};
CNetMsg_Cl_CallVote *pMsg = (CNetMsg_Cl_CallVote *)pRawMsg; CNetMsg_Cl_CallVote *pMsg = (CNetMsg_Cl_CallVote *)pRawMsg;
const char *pReason = pMsg->m_Reason[0] ? pMsg->m_Reason : "No reason given";
if(str_comp_nocase(pMsg->m_Type, "option") == 0) if(str_comp_nocase(pMsg->m_Type, "option") == 0)
{ {
CVoteOption *pOption = m_pVoteOptionFirst; CVoteOption *pOption = m_pVoteOptionFirst;
@ -635,8 +640,9 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
{ {
if(str_comp_nocase(pMsg->m_Value, pOption->m_aDescription) == 0) if(str_comp_nocase(pMsg->m_Value, pOption->m_aDescription) == 0)
{ {
str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s'", Server()->ClientName(ClientID), pOption->m_aDescription); str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s' (%s)", Server()->ClientName(ClientID),
str_format(aDesc, sizeof(aDesc), "%s", pOption->m_aCommand); pOption->m_aDescription, pReason);
str_format(aDesc, sizeof(aDesc), "%s", pOption->m_aDescription);
str_format(aCmd, sizeof(aCmd), "%s", pOption->m_aCommand); str_format(aCmd, sizeof(aCmd), "%s", pOption->m_aCommand);
break; break;
} }
@ -694,16 +700,6 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
return; return;
} }
const char *pReason = "No reason given";
for(const char *pStr = pMsg->m_Value; *pStr; ++pStr)
{
if(*pStr == ' ')
{
pReason = pStr+1;
break;
}
}
str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to kick '%s' (%s)", Server()->ClientName(ClientID), Server()->ClientName(KickID), pReason); str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to kick '%s' (%s)", Server()->ClientName(ClientID), Server()->ClientName(KickID), pReason);
str_format(aDesc, sizeof(aDesc), "Kick '%s'", Server()->ClientName(KickID)); str_format(aDesc, sizeof(aDesc), "Kick '%s'", Server()->ClientName(KickID));
if (!g_Config.m_SvVoteKickBantime) if (!g_Config.m_SvVoteKickBantime)
@ -719,7 +715,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
if(aCmd[0]) if(aCmd[0])
{ {
SendChat(-1, CGameContext::CHAT_ALL, aChatmsg); SendChat(-1, CGameContext::CHAT_ALL, aChatmsg);
StartVote(aDesc, aCmd); StartVote(aDesc, aCmd, pReason);
pPlayer->m_Vote = 1; pPlayer->m_Vote = 1;
pPlayer->m_VotePos = m_VotePos = 1; pPlayer->m_VotePos = m_VotePos = 1;
m_VoteCreator = ClientID; m_VoteCreator = ClientID;

3
src/game/server/gamecontext.h
View file

@ -83,7 +83,7 @@ public:
class CCharacter *GetPlayerChar(int ClientID); class CCharacter *GetPlayerChar(int ClientID);
// voting // voting
void StartVote(const char *pDesc, const char *pCommand); void StartVote(const char *pDesc, const char *pCommand, const char *pReason);
void EndVote(); void EndVote();
void SendVoteSet(int ClientID); void SendVoteSet(int ClientID);
void SendVoteStatus(int ClientID, int Total, int Yes, int No); void SendVoteStatus(int ClientID, int Total, int Yes, int No);
@ -95,6 +95,7 @@ public:
int m_VotePos; int m_VotePos;
char m_aVoteDescription[64]; char m_aVoteDescription[64];
char m_aVoteCommand[512]; char m_aVoteCommand[512];
char m_aVoteReason[16];
int m_VoteEnforce; int m_VoteEnforce;
enum enum
{ {